summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/Makefile2
-rw-r--r--app/template-json.lsp (renamed from app/template-ajax.lsp)1
-rwxr-xr-xlua/mvc.lua2
3 files changed, 2 insertions, 3 deletions
diff --git a/app/Makefile b/app/Makefile
index a3da5bc..b8862c7 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -25,7 +25,7 @@ APP_DIST= \
acf_www-controller.lua\
acf_cli-controller.lua\
menuhints.menu\
- template-ajax.lsp\
+ template-json.lsp\
template-html.lsp\
template-stream.lsp\
dispatcherror-html.lsp\
diff --git a/app/template-ajax.lsp b/app/template-json.lsp
index bb7fc9f..03dd5bf 100644
--- a/app/template-ajax.lsp
+++ b/app/template-json.lsp
@@ -1,5 +1,4 @@
<% local view, viewlibrary, page_info, session = ... %>
-<% require("json") %>
Status: 200 OK
Content-Type: "application/json"
<% io.write("\n") %>
diff --git a/lua/mvc.lua b/lua/mvc.lua
index 3c7ec54..5524c5b 100755
--- a/lua/mvc.lua
+++ b/lua/mvc.lua
@@ -345,7 +345,7 @@ auto_view = function(viewtable, viewlibrary, pageinfo, session)
if pageinfo.viewtype == "html" then
require("htmlviewfunctions")
htmlviewfunctions.displayitem(viewtable, 1, pageinfo)
- elseif pageinfo.viewtype == "ajax" then
+ elseif pageinfo.viewtype == "json" then
require("json")
print(json.encode(viewtable))
elseif pageinfo.viewtype == "stream" then