Changeset 16968 for lang/javascript/userscripts

Timestamp:

08/02/08 11:21:43 (4 months ago)

Author:

cho45

Message:

• JSDeferred を最新に
  
• Deferred 返す関数は動詞じゃないとおかしいので修正
  
• pdc つかうように
  

Files:

• lang/javascript/userscripts/jautopagerize.user.js (modified) (24 diffs)

lang/javascript/userscripts/jautopagerize.user.js

@@ -108 +108 @@
 BeCompatible();
 
-function Resource (uri, convertfun) {
+function getResource (uri, convertfun) {
         var d = Deferred();
         if (!convertfun) convertfun = function (i) { return i };
-        if (uri.indexOf("http://") != 0) {
-                // resolve relative path; for Safari
-                var i = new Image();
-                i.src = uri;
-                uri = i.src;
-                i.src = "#";
-        }
         log("Getting Resource: "+uri);
         GM_xmlhttpRequest({
                 method  : "GET",
-                url     : uri,
+                url     : absoluteURI(uri),
                 overrideMimeType: 'text/html; charset=' + document.characterSet,
                 headers: {
@@ -137 +130 @@
 }
 
-function HTMLResource (uri) {
-        return Resource(uri, HTMLResource.createDocumentFromString);
-}
-HTMLResource.createDocumentFromString = function (s) {
+function getHTMLResource (uri) {
+        return getResource(uri, getHTMLResource.createDocumentFromString);
+}
+getHTMLResource.createDocumentFromString = function (s) {
         s = String(s).replace(/<script[ \t\r\n<>][\S\s]*?<\/script(?:[ \t\r\n]*>|[ \t\r\n]+)|<(?:i?frame|html|object|script)(?:[ \t\r\n][^<>]*(?:>|(?=<))|[ \t\r\n]*>)|<\/(?:i?frame|html|object|script)(?:[ \t\r\n]*>|[ \t\r\n]+)/gi, "");
         var d = createHTMLDocument();
@@ -158 +151 @@
 };
 
-function CachedResource (uri, convertfun, expire) {
+function getCachedResource (uri, convertfun, expire) {
         var d   = Deferred();
         var key = uri;
@@ -221 +214 @@
 
         AutoPagerize._loading = true;
-        HTMLResource(AutoPagerize._nextURI).next(function (r) {
+        getHTMLResource(AutoPagerize._nextURI).next(function (r) {
                 var ib  = AutoPagerize._insertBefore;
                 var pib = ib.parentNode;
-                pib.insertBefore(h("<hr/><p>AutoPagerized: <a href='%s'>%s</a></p>".replace(/%s/g, AutoPagerize._nextURI)), ib);
+                pib.insertBefore(
+                        dom("<div class='_autopagerize'><hr /><p>AutoPagerized: <a href='#{next}'>#{next}</a></p></div>", null, {
+                                next : AutoPagerize._nextURI
+                        }).root,
+                        ib
+                );
                 var pages = $X(AutoPagerize._pageinfo.pageElement, r).map(function (i) {
                         i = document.importNode(i, true);
@@ -272 +270 @@
 AutoPagerize.clearCache = function () {
         AutoPagerize.Config.site_info_urls.forEach(function (url_info) {
-                CachedResource(url_info.url).clear().cancel();
+                getCachedResource(url_info.url).clear().cancel();
         });
         AutoPagerize.icon.innerHTML = 'cleared cache';
@@ -295 +293 @@
         // get siteinfo
         parallel(AutoPagerize.Config.site_info_urls.map(function (url_info) {
-                var cr = CachedResource(url_info.url, parseSiteInfo, AutoPagerize.Config.cache_expire);
+                var cr = getCachedResource(url_info.url, parseSiteInfo, AutoPagerize.Config.cache_expire);
                 if (location.href == url_info.url) cr.clear();
                 return cr;
@@ -307 +305 @@
                                 case 'HTML':
                                 default:
-                                        var d = HTMLResource.createDocumentFromString(data);
+                                        var d = getHTMLResource.createDocumentFromString(data);
                                         $X(".//*[@class='autopagerize_data']", d).forEach(function (e) {
                                                 // using replace as scan and folding key/value to i
@@ -493 +491 @@
 // register menu for clearing cache
 GM_registerMenuCommand('jAutoPagerize - clear cache', AutoPagerize.clearCache);
-// for bookmarklet
-unsafeWindow.XPathGenerator = XPathGenerator;
 
 } // end with
@@ -620 +616 @@
 }
 
+function absoluteURI (uri) {
+        if (uri.indexOf("http://") != 0) {
+                // resolve relative path; for Safari
+                var i = new Image();
+                i.src = uri;
+                uri = i.src;
+                i.src = "#";
+        }
+        return uri;
+}
+
+
+function dom (str, cur, txt) {
+        var t, ret = {}, stack = [cur = cur || document.createElement("div")];
+        while (str.length) {
+                if (str.indexOf("<") == 0) {
+                        if (t = str.match(/^\s*<(\/?[^\s>\/]+)([^>]+?)?(\/)?>/)) {
+                                var tag = t[1], attrs = t[2], isempty = !!t[3];
+                                if (tag.indexOf("/") == -1) {
+                                        child = document.createElement(tag);
+                                        if (attrs) attrs.replace(/([a-z]+)=(?:'([^']+)'|"([^"]+)")/gi,
+                                                function (m, name, v1, v2) {
+                                                        var v = text(v1 || v2);
+                                                        if (name == "class") ret[v] = child;
+                                                        child.setAttribute(name, v);
+                                                }
+                                        );
+                                        cur.appendChild(ret.root ? child : (ret.root = child));
+                                        if (!isempty) {
+                                                stack.push(cur);
+                                                cur = child;
+                                        }
+                                } else cur = stack.pop();
+                        } else throw("Parse Error: " + str);
+                } else {
+                        if (t = str.match(/^([^<]+)/)) cur.appendChild(document.createTextNode(text(t[0])));
+                }
+                str = str.substring(t[0].length);
+        }
+        return ret;
+
+        function text (str) {
+                return str
+                        .replace(/&(#(x)?)?([^;]+);/g, function (_, isNumRef, isHex, ref) {
+                                return isNumRef ? String.fromCharCode(parseInt(ref, isHex ? 16 : 10)):
+                                                  {"lt":"<","gt":"<","amp":"&"}[ref];
+                        })
+                        .replace(/#\{([^}]+)\}/, function (_, name) {
+                                return txt[name];
+                        });
+        }
+}
+
 
 function log (m) {
@@ -663 +712 @@
 
         switch (type) {
-                case String:
-                        return exp.evaluate(
-                                context,
-                                XPathResult.STRING_TYPE,
-                                null
-                        ).stringValue;
-                case Number:
-                        return exp.evaluate(
-                                context,
-                                XPathResult.NUMBER_TYPE,
-                                null
-                        ).numberValue;
-                case Boolean:
-                        return exp.evaluate(
-                                context,
-                                XPathResult.BOOLEAN_TYPE,
-                                null
-                        ).booleanValue;
+                case String: return exp.evaluate(context, XPathResult.STRING_TYPE, null).stringValue;
+                case Number: return exp.evaluate(context, XPathResult.NUMBER_TYPE, null).numberValue;
+                case Boolean: return exp.evaluate(context, XPathResult.BOOLEAN_TYPE, null).booleanValue;
                 case Array:
-                        var result = exp.evaluate(
-                                context,
-                                XPathResult.ORDERED_NODE_SNAPSHOT_TYPE,
-                                null
-                        );
-                        var ret = [];
-                        for (var i = 0, len = result.snapshotLength; i < len; ret.push(result.snapshotItem(i++)));
+                        var result = exp.evaluate(context, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+                        for (var ret = [], i = 0, len = result.snapshotLength; i < len; i++) {
+                                ret.push(result.snapshotItem(i));
+                        }
                         return ret;
                 case undefined:
@@ -696 +727 @@
                                 case XPathResult.NUMBER_TYPE : return result.numberValue;
                                 case XPathResult.BOOLEAN_TYPE: return result.booleanValue;
-                                case XPathResult.UNORDERED_NODE_ITERATOR_TYPE: {
+                                case XPathResult.UNORDERED_NODE_ITERATOR_TYPE:
                                         // not ensure the order.
-                                        var ret = [];
-                                        var i = null;
-                                        while (i = result.iterateNext()) {
-                                                ret.push(i);
-                                        }
+                                        var ret = [], i = null;
+                                        while (i = result.iterateNext()) ret.push(i);
                                         return ret;
-                                }
                         }
                         return null;
-                default:
-                        throw(TypeError("$X: specified type is not valid type."));
-        }
-}
-
+                default: throw(TypeError("$X: specified type is not valid type."));
+        }
+}
 
 // Usage:: with (D()) { your code }
-// JSDefeered (c) Copyright (c) 2007 cho45 ( www.lowreal.net )
+// JSDeferred 0.2.1 (c) Copyright (c) 2007 cho45 ( www.lowreal.net )
 // See http://coderepos.org/share/wiki/JSDeferred
 function D () {
@@ -741 +766 @@
 
         _post : function (okng, fun) {
-                this._next = new Deferred();
+                this._next =  new Deferred();
                 this._next.callback[okng] = fun;
                 return this._next;
@@ -780 +805 @@
                         });
                         num++;
-                })(dl[i], i)
-        }
+                })(dl[i], i);
+        }
+        if (!num) Deferred.next(function () { ret.call() });
+        ret.canceller = function () {
+                for (var i in dl) if (dl.hasOwnProperty(i)) {
+                        dl[i].cancel();
+                }
+        };
         return ret;
 };
@@ -791 +822 @@
                 d.call((new Date).getTime() - t.getTime());
         }, n * 1000);
-        d.canceller   = function () { try { clearTimeout(id) } catch (e) {} };
+        d.canceller = function () { try { clearTimeout(id) } catch (e) {} };
         return d;
 };
@@ -798 +829 @@
         var d = new Deferred();
         var id = setTimeout(function () { clearTimeout(id); d.call() }, 0);
-        d.callback.ok = fun;
-        d.canceller   = function () { try { clearTimeout(id) } catch (e) {} };
+        if (fun) d.callback.ok = fun;
+        d.canceller = function () { try { clearTimeout(id) } catch (e) {} };
         return d;
 };
@@ -806 +837 @@
         args = Array.prototype.slice.call(arguments);
         f    = args.shift();
-        return next(function () {
+        return Deferred.next(function () {
                 return f.apply(this, args);
         });
@@ -814 +845 @@
         var o = {
                 begin : n.begin || 0,
-                end   : n.end   || (n - 1),
+                end   : (typeof n.end == "number") ? n.end : n - 1,
                 step  : n.step  || 1,
                 last  : false,
@@ -820 +851 @@
         };
         var ret, step = o.step;
-        return next(function () {
+        return Deferred.next(function () {
                 function _loop (i) {
                         if (i <= o.end) {
@@ -832 +863 @@
                                         return ret.next(function (r) {
                                                 ret = r;
-                                                return call(_loop, i + step);
+                                                return Deferred.call(_loop, i + step);
                                         });
                                 } else {
-                                        return call(_loop, i + step);
+                                        return Deferred.call(_loop, i + step);
                                 }
                         } else {
@@ -841 +872 @@
                         }
                 }
-                return call(_loop, o.begin);
+                return (o.begin < o.end) ? Deferred.call(_loop, o.begin) : null;
         });
 };
@@ -866 +897 @@
         if (!list) list = ["parallel", "wait", "next", "call", "loop"];
         if (!obj)  obj  = (function () { return this })();
-        list.forEach(function (n) { obj[n] = Deferred[n] });
+        for (var i = 0; i < list.length; i++) {
+                var n = list[i];
+                obj[n] = Deferred[n];
+        }
         return Deferred;
 };
@@ -882 +916 @@
                 d.fail(res);
         };
-        GM_xmlhttpRequest(opts);
+        setTimeout(function () {
+                GM_xmlhttpRequest(opts);
+        }, 0);
         return d;
 }
-xhttp.get  = function (url)       { return xhttp({method:"get", url:url}) };
-xhttp.post = function (url, data) { return xhttp({method:"post", url:url, data:data}) };
+xhttp.get  = function (url)       { return xhttp({method:"get",  url:url}) };
+xhttp.post = function (url, data) { return xhttp({method:"post", url:url, data:data, headers:{"Content-Type":"application/x-www-form-urlencoded"}}) };
+
 
 function http (opts) {
@@ -892 +929 @@
         var req = new XMLHttpRequest();
         req.open(opts.method, opts.url, true);
+        if (opts.headers) {
+                for (var k in opts.headers) if (opts.headers.hasOwnProperty(k)) {
+                        req.setRequestHeader(k, opts.headers[k]);
+                }
+        }
         req.onreadystatechange = function () {
                 if (req.readyState == 4) d.call(req);
         };
         req.send(opts.data || null);
+        d.xhr = req;
         return d;
 }
-http.get  = function (url)       { return http({method:"get", url:url}) };
-http.post = function (url, data) { return http({method:"post", url:url, data:data}) };
+http.get   = function (url)       { return http({method:"get",  url:url}) };
+http.post  = function (url, data) { return http({method:"post", url:url, data:data, headers:{"Content-Type":"application/x-www-form-urlencoded"}}) };
+http.jsonp = function (url, params) {
+        if (!params) params = {};
+
+        var Global = (function () { return this })();
+        var d = Deferred();
+        var cbname = params["callback"];
+        if (!cbname) do {
+                cbname = "callback" + String(Math.random()).slice(2);
+        } while (typeof(Global[cbname]) != "undefined");
+
+        params["callback"] = cbname;
+
+        url += (url.indexOf("?") == -1) ? "?" : "&";
+
+        for (var name in params) if (params.hasOwnProperty(name)) {
+                url = url + encodeURIComponent(name) + "=" + encodeURIComponent(params[name]) + "&";
+        }
+
+        var script = document.createElement('script');
+        script.type    = "text/javascript";
+        script.charset = "utf-8";
+        script.src     = url;
+        document.body.appendChild(script);
+
+        Global[cbname] = function callback (data) {
+                delete Global[cbname];
+                document.body.removeChild(script);
+                d.call(data);
+        };
+        return d;
+};
 
 Deferred.Deferred = Deferred;
@@ -905 +979 @@
 Deferred.xhttp    = xhttp;
 return Deferred;
-}
+}// End of JSDeferred
 
 })();