Tetsuharu OHZEKI
null+****@clear*****
Tue May 20 18:24:32 JST 2014
Tetsuharu OHZEKI 2014-05-20 18:24:32 +0900 (Tue, 20 May 2014) New Revision: 23c1354bbfa8f06ddfca52128cc630cb5323aed9 https://github.com/groonga/groonga/commit/23c1354bbfa8f06ddfca52128cc630cb5323aed9 Merged c7d552f: Merge pull request #168 from saneyuki/json Message: Remove the dependency on jQuery JSON. Removed files: data/html/admin/js/jquery.json-2.2.min.js Modified files: data/html/admin/index.html data/html/admin/js/groonga-admin.js data/html/files.am Modified: data/html/admin/index.html (+0 -1) =================================================================== --- data/html/admin/index.html 2014-05-19 13:04:14 +0900 (208040a) +++ data/html/admin/index.html 2014-05-20 18:24:32 +0900 (c49de2b) @@ -13,7 +13,6 @@ <link rel="stylesheet" type="text/css" href="css/redmond/jquery-ui-1.8.18.custom.css"> <script type="text/javascript" src="js/jquery-1.7.2.min.js"></script> <script type="text/javascript" src="js/jquery-ui-1.8.18.custom.min.js"></script> -<script type="text/javascript" src="js/jquery.json-2.2.min.js"></script> <script type="text/javascript" src="js/jquery.flot-0.7.min.js"></script> <script type="text/javascript" src="js/groonga-admin.js"></script> </head> Modified: data/html/admin/js/groonga-admin.js (+2 -2) =================================================================== --- data/html/admin/js/groonga-admin.js 2014-05-19 13:04:14 +0900 (bf27db7) +++ data/html/admin/js/groonga-admin.js 2014-05-20 18:24:32 +0900 (adf1edd) @@ -1127,7 +1127,7 @@ jQuery.extend(GroongaAdmin.prototype, { "table" : this.current_table, "input_type" : "json", "output_type" : "json", - "values" : $.toJSON([d]) + "values" : JSON.stringify([d]) }, dataType: 'json', success: function(d) { @@ -1320,7 +1320,7 @@ jQuery.extend(GroongaAdmin.prototype, { var that = this; var json = null; if (ajax) { - json = jQuery.parseJSON(ajax.responseText); + json = JSON.parse(ajax.responseText); } this.hideloading(); for ( i = 0; i < this.semaphore.length; i++) { Deleted: data/html/admin/js/jquery.json-2.2.min.js (+0 -31) 100644 =================================================================== --- data/html/admin/js/jquery.json-2.2.min.js 2014-05-19 13:04:14 +0900 (bad4a0a) +++ /dev/null @@ -1,31 +0,0 @@ - -(function($){$.toJSON=function(o) -{if(typeof(JSON)=='object'&&JSON.stringify) -return JSON.stringify(o);var type=typeof(o);if(o===null) -return"null";if(type=="undefined") -return undefined;if(type=="number"||type=="boolean") -return o+"";if(type=="string") -return $.quoteString(o);if(type=='object') -{if(typeof o.toJSON=="function") -return $.toJSON(o.toJSON());if(o.constructor===Date) -{var month=o.getUTCMonth()+1;if(month<10)month='0'+month;var day=o.getUTCDate();if(day<10)day='0'+day;var year=o.getUTCFullYear();var hours=o.getUTCHours();if(hours<10)hours='0'+hours;var minutes=o.getUTCMinutes();if(minutes<10)minutes='0'+minutes;var seconds=o.getUTCSeconds();if(seconds<10)seconds='0'+seconds;var milli=o.getUTCMilliseconds();if(milli<100)milli='0'+milli;if(milli<10)milli='0'+milli;return'"'+year+'-'+month+'-'+day+'T'+ -hours+':'+minutes+':'+seconds+'.'+milli+'Z"';} -if(o.constructor===Array) -{var ret=[];for(var i=0;i<o.length;i++) -ret.push($.toJSON(o[i])||"null");return"["+ret.join(",")+"]";} -var pairs=[];for(var k in o){var name;var type=typeof k;if(type=="number") -name='"'+k+'"';else if(type=="string") -name=$.quoteString(k);else -continue;if(typeof o[k]=="function") -continue;var val=$.toJSON(o[k]);pairs.push(name+":"+val);} -return"{"+pairs.join(", ")+"}";}};$.evalJSON=function(src) -{if(typeof(JSON)=='object'&&JSON.parse) -return JSON.parse(src);return eval("("+src+")");};$.secureEvalJSON=function(src) -{if(typeof(JSON)=='object'&&JSON.parse) -return JSON.parse(src);var filtered=src;filtered=filtered.replace(/\\["\\\/bfnrtu]/g,'@');filtered=filtered.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']');filtered=filtered.replace(/(?:^|:|,)(?:\s*\[)+/g,'');if(/^[\],:{}\s]*$/.test(filtered)) -return eval("("+src+")");else -throw new SyntaxError("Error parsing JSON, source is not valid.");};$.quoteString=function(string) -{if(string.match(_escapeable)) -{return'"'+string.replace(_escapeable,function(a) -{var c=_meta[a];if(typeof c==='string')return c;c=a.charCodeAt();return'\\u00'+Math.floor(c/16).toString(16)+(c%16).toString(16);})+'"';} -return'"'+string+'"';};var _escapeable=/["\\\x00-\x1f\x7f-\x9f]/g;var _meta={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'};})(jQuery); \ No newline at end of file Modified: data/html/files.am (+0 -1) =================================================================== --- data/html/files.am 2014-05-19 13:04:14 +0900 (a34342a) +++ data/html/files.am 2014-05-20 18:24:32 +0900 (588ef82) @@ -27,7 +27,6 @@ nobase_dist_html_DATA = \ admin/js/jquery-1.7.2.min.js \ admin/js/jquery.flot-0.7.min.js \ admin/js/jquery.flot.license.txt \ - admin/js/jquery.json-2.2.min.js \ admin/js/jquery-ui-1.8.18.custom.min.js \ $(NULL) -------------- next part -------------- HTML����������������������������...Download