@@ -6,7 +6,3 @@ John Mettraux (main dev) Jamandru Reynolds (icons) Juan-Pedro Paredes - -and also, thanks to -the authors of http://www.JSON.org/json2.js - CREDITS.txt @@ -64,12 +64,3 @@ cp public/css/fluo.css #{RUOTE_WEB}/public/stylesheets/ end -#task :json_minify do -# -# target = File.open "json2.js", "w" -# -# File.open 'sjson2.js', "r" do |sourcefile| -# target.puts(JSMin.minify(sourcefile)) -# end -#end - Rakefile @@ -19,7 +19,6 @@ get "/" do <script src="/js/fluo-can.js?nocache=#{Time.now.to_f}"></script> <script src="/js/fluo-dial.js?nocache=#{Time.now.to_f}"></script> <script src="/js/fluo-tred.js?nocache=#{Time.now.to_f}"></script> - <script src="/js/json2.js"></script> <link href="/css/fluo-bench.css?nocache=#{Time.now.to_f}" rel="Stylesheet" type="text/css" /> <link href="/css/fluo-dial.css?nocache=#{Time.now.to_f}" rel="Stylesheet" type="text/css" /> lib/ruote-fluo.rb @@ -160,7 +160,7 @@ var FluoCan = function() { var max = 0; if (title) max = c.mozMeasureText(title); for (var attname in exp[1]) { - var text = ""+attname+": "+JSON.stringify(exp[1][attname]); + var text = ""+attname+": "+exp[1][attname]; var l = c.mozMeasureText(text); if (l > max) max = l; } @@ -192,7 +192,7 @@ var FluoCan = function() { var attname; var attnames = attributeNames(exp); while (attname = attnames.shift()) { - FluoCanvas.drawText(c, attname+": "+JSON.stringify(exp[1][attname]), width, height); + FluoCanvas.drawText(c, attname+": "+exp[1][attname], width, height); if (c.fluoVertical == false) c.translate(-20, 0); else c.translate(0, 20); } public/js/fluo-can.js @@ -112,7 +112,8 @@ var Tred = function () { var atts = []; for (key in exp[1]) { var skey = key.replace(/-/, '_'); - var sval = JSON.stringify(exp[1][key]); + var sval = exp[1][key]; + if ((typeof sval) == 'string') sval = '"' + sval + '"'; atts.push("" + skey + ': ' + sval); } atts = atts.join(", "); @@ -191,7 +192,7 @@ var Tred = function () { } var atts = m[3]; - atts = atts ? JSON.parse('({' + atts + '})') : {}; + atts = atts ? eval('({' + atts + '})') : {}; return [ expname, atts, children ]; }, @@ -201,7 +202,7 @@ var Tred = function () { var name = node.childNodes[0].firstChild.nodeValue; var text = node.childNodes[1].firstChild.nodeValue; var atts = node.childNodes[2].firstChild.nodeValue; - atts = JSON.parse('({' + atts + '})'); + atts = eval('({' + atts + '})'); var children = []; if (text != '') children.push(text); return [ name, atts, children ]; @@ -214,13 +215,12 @@ var Tred = function () { if ((typeof node) == 'string') node = document.getElementById(node); - return JSON.stringify(toTree(node)); + return toJson(toTree(node)); } // // turns a tree into a JSON string. // - /* function toJson (tree) { if ((typeof tree) == 'string') return '"' + tree + '"'; @@ -241,7 +241,6 @@ var Tred = function () { s += "]]" return s; } - */ function onChange (tree) { @@ -447,6 +446,7 @@ var Tred = function () { // // done + //expatts = eval("({"+expatts+"})"); return exp; } public/js/fluo-tred.js public/js/json2.js 135482c92cc10920b431713cd14d889820423e7b John Mettraux jmettraux@gmail.com http://github.com/jmettraux/ruote-fluo/commit/418cf3397e2490f7ca5e617c65248005b95d03ee 418cf3397e2490f7ca5e617c65248005b95d03ee 2008-07-14T01:29:15-07:00 2008-07-14T01:29:15-07:00 Revert "switched to JSON lib" This reverts commit 135482c92cc10920b431713cd14d889820423e7b. Stringify() would be cool, and I need a custom parse(). Reverting for now. 7f3bd1b3edf8e15f753236a7353bfd226e259163 John Mettraux jmettraux@gmail.com