チェンジセット 330

更新日時:

2009/11/19 00:27:00 (9 か月 前)

更新者:

ngs

ログメッセージ:

 

ファイル:

• trunk/jspreadsheet/jspreadsheet.js (変更) (5 diff)

trunk/jspreadsheet/jspreadsheet.js

@@ -4 +4 @@
  * @copyright Copyright © 2009 Atsushi Nagase
  * @license   Licensed under the MIT License: http://www.opensource.org/licenses/mit-license.php
- * @
 */
 ;(function($){
 
-        var RANDOM_BASE = "abcdefghijklmnopqrstuvwxyz0123456789";
-        var CALLBACK_PREFIX = "sscallback";
-        var DEFAULT_PARAM = {
-                version : "0.6"
-        };
-        var reqId = 0;
-        var cache = {};
+        var
+                PLUGIN_NAMESPACE = "ss",
+                CALLBACK_PREFIX = "sscallback_",
+                DEFAULT_PARAM = { version : "0.6" };
+
+        var reqId = 0, cache = {};
         
         function getRandom(length) {
                 length = length || 10;
-                var r = "";
+                var r = "",A=65,Z=90,c,i;
+                var fc = function(a,b) {
+                        var c = String.fromCharCode(a);
+                        return b ? c.toUpperCase():c.toLowerCase();
+                }
                 while(r.length<length) {
-                        r += RANDOM_BASE.charAt(Math.floor(RANDOM_BASE.length*Math.random()))||"";
+                        i = A+Math.floor((Z-A)*Math.random())+(i>Z?0:10);
+                        c = i>Z?String(i-Z-1):fc(i,Math.random()<0.5);
+                        if(c&&r[r.length-1]!=c) r+=c;
                 }
                 return r;
@@ -36 +40 @@
         function ss(url,param) {
                 param = $.extend(DEFAULT_PARAM,param);
-                var _query;
-                var _field;
+                var _query,_field;
 
                 function setQuery(query) {
                         _query = query;
-                        return rtn;
+                        return self;
                 }
                 
                 function setField(field) {
                         _field = field;
-                        return rtn;
+                        return self;
                 }
                 
                 function complete(res,callback) {
                         if(/^(ok|warning)$/.test(res.status)) {
-                                var tbl = res.table;
-                                var rows = [];
-                                var fld = _field || [];
+                                var tbl = res.table, rows = [], fld = _field||[];
                                 if(typeof fld == "string") fld = fld.split(",")
                                 $.each(tbl.rows,function(){
-                                        var obj = {};
-                                        var row = this;
-                                        var cols = row.c;
+                                        var obj = {}, row = this, cols = row.c;
                                         $.each(cols,function(i){
                                                 obj[fld[i]||i] = (this||{}).v;
@@ -74 +73 @@
                 
                 function send(callback,nocache) {
-                        var cacheKey1 = encodeURIComponent(url);
-                        var cacheKey2 = encodeURIComponent(_query||"__NO_QUERY__");
+                        var
+                                cacheKey1 = encodeURIComponent(url),
+                                cacheKey2 = encodeURIComponent(_query||"__NO_QUERY__");
+
                         cache[cacheKey1] = cache[cacheKey1]||{};
-                        var tqx = "";
-                        var rid = reqId++;
-                        do {
-                                var handlerName = CALLBACK_PREFIX+getRandom(20);
-                        } while(window[handlerName]);
-                        function cb(res){
-                                if(res.reqId==rid.toString()) {
-                                        if(res.table) {
-                                                cache[cacheKey1][cacheKey2] = res;
-                                        }
-                                        complete(res,callback);
-                                }
-                                setTimeout(function(){
-                                        try {
-                                                delete window[handlerName];
-                                        } catch(e) {};
-                                },1);
-                        };
                         if(!nocache&&cache[cacheKey1][cacheKey2]) {
                                 complete(cache[cacheKey1][cacheKey2],callback);
                                 return;
                         }
+                        var rid = reqId++;
+                        do { var handlerName = CALLBACK_PREFIX+getRandom(20); } while(window[handlerName]);
+                        function cb(res){
+                                if(res.reqId==rid.toString()) {
+                                        if(res.table) cache[cacheKey1][cacheKey2] = res;
+                                        complete(res,callback);
+                                }
+                                setTimeout(function(){
+                                        try { delete window[handlerName]; } catch(e) {};
+                                },1);
+                        };
                         window[handlerName] = cb;
                         param.responseHandler = handlerName;
@@ -105 +99 @@
                 }
                 
-                var rtn = {
+                var self = {
                         setQuery : setQuery,
                         setField : setField,
@@ -111 +105 @@
                 }
         
-                return rtn;
+                return self;
         }
-        
-        $.extend({"ss":ss});
+
+        $[PLUGIN_NAMESPACE] = ss;
         
 })(jQuery);