Changeset 2064

Timestamp:

11/27/07 21:10:31 (9 months ago)

Author:

cho45

Message:

lang/javascript/userscripts/jautopagerize.user.js:

toSource よりみじかくかけたので uneval に

Files:

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

lang/javascript/userscripts/jautopagerize.user.js

@@ -9 +9 @@
 //
 // $Date$
-//
+(function (AutoPagerize) {
 // Latest::  http://svn.coderepos.org/share/lang/javascript/userscripts/jautopagerize.user.js
 // License:: CCPL ( http://creativecommons.org/licenses/by/3.0/ )
-(function (AutoPagerize) {
 
 AutoPagerize = {};
@@ -134 +133 @@
 
 function HTMLResource (uri) {
-        function createDocumentFromString (s) {
+        return Resource(uri, HTMLResource.createDocumentFromString);
+}
+HTMLResource.createDocumentFromString = function (s) {
                 s = String(s);
                 s = s.replace(/<script[^>]+>([^\s]|\s)*?<\/script>/g, "");
@@ -153 +154 @@
                 }
         }
-        return Resource(uri, createDocumentFromString);
-}
 
 function CachedResource (uri, convertfun, expire) {
         var a   = new Async();
         var key = uri;
-        var v   = eval(GM_getValue(key)) || ({});
+        var v   = ({});
+        try { v = eval(GM_getValue(key)) || ({}) } catch (e) { log("parse error: may be uneval bug") }
         a.clear = function () {
                 GM_setValue(key, "");
@@ -174 +174 @@
                         onload  : function (req) { try {
                                 var res = convertfun(req.responseText);
-                                GM_setValue(key, {time:(new Date).getTime(), body:res}.toSource());
+                                GM_setValue(key, uneval({time:(new Date).getTime(), body:res}));
+                                log(key, uneval({time:(new Date).getTime(), body:res}));
                                 log("Cached: " + key);
                                 a.ready(res);
@@ -223 +224 @@
                         pib.insertBefore(h("<hr /><p>AutoPagerized: <a href='%s'>%s</a></p>".replace(/%s/g, AutoPagerize._nextURI)), ib);
                         $X(AutoPagerize._pageinfo.pageElement, r).forEach(function (i) {
-                                log(String(i));
                                 i = document.importNode(i, true);
                                 pib.insertBefore(i, ib);
@@ -286 +286 @@
 
                 function parseSiteInfo (html) {
-                        var d = h(html);
+                        var d = HTMLResource.createDocumentFromString(html);
 
                         var siteinfo = [];
@@ -321 +321 @@
 };
 
-AutoPagerize.errorHandler = function (e) {
+AutoPagerize.errorHandler = function (e, f) {
         AutoPagerize._error = String(e);
         AutoPagerize.updateStatus();
-        alert(e.toSource());
+        alert(String(e) + "///" + String(f));
 };
 
@@ -331 +331 @@
         if (AutoPagerize.hasOwnProperty(i) &&
                 typeof AutoPagerize[i] == "function") {
-                AutoPagerize[i] = (function (f) {
+                AutoPagerize[i] = (function (f, i) {
                         return function () { try {
                                 return f.apply(AutoPagerize, arguments);
-                        } catch (e) { AutoPagerize.errorHandler(e) } };
-                })(AutoPagerize[i]);
+                        } catch (e) { AutoPagerize.errorHandler(e, i) } };
+                })(AutoPagerize[i], i);
         }
 }
@@ -454 +454 @@
 
         // Memo::
-        // Safari 3 has JS 1.6 functions but 1.8 and toSource.
+        // Safari 3 has JS 1.6 functions but 1.8 and uneval/toSource.
 
         if (!Array.prototype.reduce) {
@@ -487 +487 @@
         }
 
-        if (!Object.prototype.toSource) {
-                Object.prototype.toSource = function () {
-                        var props = [];
-                        for (var key in this) {
-                                if (this.hasOwnProperty(key)) {
-                                        var v;
-                                        switch (typeof this[key]) {
-                                                case "undefined": v = "undefined"; break;
-                                                case "null"     : v = "null"; break;
-                                                default         : v = this[key].toSource();
+        if (typeof uneval != "function") {
+                uneval = function  (o) {
+                        switch (typeof o) {
+                                case "undefined" : return "(void 0)";
+                                case "boolean"   : return String(o);
+                                case "number"    : return String(o);
+                                case "string"    : return '"' + o.replace(/"/g, '\\"') + '"';
+                                case "function"  : return "(" + o.toString() + ")";
+                                case "object"    :
+                                        if (o == null) return "null";
+                                        var type = Object.prototype.toString.call(o).match(/\[object (.+)\]/);
+                                        if (!type) throw TypeError("unknown type:"+o);
+                                        switch (type[1]) {
+                                                case "Array":
+                                                        var ret = [];
+                                                        for (var i = 0; i < o.length; i++) ret.push(arguments.callee(o[i]));
+                                                        return "[" + ret.join(", ") + "]";
+                                                case "Object":
+                                                        var ret = [];
+                                                        for (var i in o) {
+                                                                if (!o.hasOwnProperty(i)) continue;
+                                                                ret.push(arguments.callee(i) + ":" + arguments.callee(o[i]));
+                                                        }
+                                                        return "({" + ret.join(", ") + "})";
+                                                case "Number":
+                                                        return "(new Number(" + o + "))";
+                                                case "String":
+                                                        return "(new String(" + arguments.callee(o) + "))";
+                                                case "Date":
+                                                        return "(new Date(" + o.getTime() + "))";
+                                                default:
+                                                        if (o.toSource) return o.toSource();
+                                                        throw TypeError("unknown type:"+o);
                                         }
-                                        props.push(key.toSource() + ":" + v);
-                                }
-                        }
-                        return "({" + props.join(",") + "})";;
-                };
-
-                String.prototype.toSource = function () {
-                        return '"' + this.replace(/"/g, '\\"') + '"';
-                };
-
-                Array.prototype.toSource = function () {
-                        return "[" + this.map(function (i) { return i.toSource() }).join(",") + "]";
-                };
-
-                Date.prototype.toSource = function () {
-                        return "(new Date(%d))".replace(/%d/, this.getTime());
-                };
-
-                Number.prototype.toSource = function () {
-                        return String(this);
-                };
-
-                RegExp.prototype.toSource = function () {
-                        return String(this);
-                };
-
-                Boolean.prototype.toSource = function () {
-                        return String(this);
-                };
-        }
-
-//              [
-//                      {},
-//                      {date:new Date,body:[{a:1,b:2}]}
-//              ].forEach(function (i) {
-//                      alert(i.toSource());
-//              });
-//
-//              throw "";
-}
+                        }
+                }
+        }
+}
+
 
 /*
@@ -591 +579 @@
                 GM_log(o);
         } else {
-                location.href = "javascript:(function () { if (window.console) console.log.apply(console.log, "+o.toSource()+") })();";
+                location.href = "javascript:(function () { if (window.console) console.log.apply(console.log, "+uneval(o)+") })();";
         }
 }