Fixed wrong JSONP responses. Fixes #13

arduino · Sep 2, 2014 · 5fd9888 · 5fd9888
1 parent 0efbd30
commit 5fd9888
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/package.bash b/package.bash
@@ -11,7 +11,7 @@ PREFIX=`basename $SOURCE_FOLDER`
 
 cd ..
 
-VERSION=1.4.2
+VERSION=1.4.3
 
 tar --transform "s|$PREFIX/|luci-app-arduino-webpanel-$VERSION/|g" -cjv -f luci-app-arduino-webpanel-$VERSION.tar.bz2 \
   $PREFIX/www/index.html \

diff --git a/usr/lib/lua/luci/controller/arduino/index.lua b/usr/lib/lua/luci/controller/arduino/index.lua
@@ -748,7 +748,7 @@ function storage_send_request()
         luci.http.prepare_content("application/javascript")
         luci.http.write(jsonp_callback)
         luci.http.write("(")
-        luci.http.write_json(json.encode(json_response))
+        luci.http.write_json(json_response)
         luci.http.write(");")
       else
         luci.http.prepare_content("application/json")
@@ -806,7 +806,7 @@ function board_plain_socket()
       luci.http.prepare_content("application/javascript")
       luci.http.write(jsonp_callback)
       luci.http.write("(")
-      luci.http.write_json(json.encode(json.decode(response_body)))
+      luci.http.write_json(json.decode(response_body))
       luci.http.write(");")
     else
       luci.http.prepare_content(content_type)