Version 0.6.41, fix for Opera8 & NN7.2+.

[pettanr/clientJs.git] / 0.6.x / js / core / 00_builtin.js

diff --git a/0.6.x/js/core/00_builtin.js b/0.6.x/js/core/00_builtin.js
index 989bf76..6d4b1a1 100644 (file)
--- a/0.6.x/js/core/00_builtin.js
+++ b/0.6.x/js/core/00_builtin.js
@@ -12,7 +12,10 @@ Function.prototype.apply || (Function.prototype.apply = function (x, y) {
        if( x === window ){\r
                x.__apply = void 0;\r
        } else {\r
-               delete x.__apply ? x.__apply : x.constructor.prototype.__apply ;\r
+               if( x.constructor && x.constructor.prototype.__apply ){\r
+                       delete x.constructor.prototype.__apply;\r
+               } else\r
+               if( x.__apply ) delete x.__apply;\r
        };\r
        \r
        x.__apply = this;\r
@@ -33,15 +36,19 @@ Function.prototype.apply || (Function.prototype.apply = function (x, y) {
                        a = [];\r
                        for (i = 0; i < j; ++i)\r
                                a[i] = 'y[' + i + ']';\r
-                       r = eval('x.__apply(' + a.join(',') + ')');\r
+                       //r = eval('x.__apply(' + a.join(',') + ')');\r
+                       // closuer compiler 対策\r
+                       r = (new Function( 'x,y', 'return x.__apply(' + a.join(',') + ')' ))( x, y );\r
                        break;\r
        };\r
-       // delete x.__apply ? x.__apply : x.constructor.prototype.__apply ;\r
        // ie5\r
        if( x === window ){\r
                x.__apply = void 0;\r
        } else {\r
-               delete x.__apply ? x.__apply : x.constructor.prototype.__apply ;\r
+               if( x.constructor && x.constructor.prototype.__apply ){\r
+                       delete x.constructor.prototype.__apply;\r
+               } else\r
+               if( x.__apply ) delete x.__apply;\r
        };\r
        return r;\r
 });\r
@@ -95,8 +102,8 @@ Array.prototype.splice || (Array.prototype.splice = function (x, y) {
 });\r
 \r
 /*\r
- * JavaScript 1.6, Array.indexOfを下位互換実装する\r
  * original\r
+ * JavaScript 1.6, Array.indexOfを下位互換実装する\r
  * http://www.inazumatv.com/contents/archives/7965\r
  */\r
 \r
@@ -117,3 +124,95 @@ Array.prototype.indexOf || (Array.prototype.indexOf = function( searchElement, f
         return -1;\r
        });\r
 \r
+\r
+/*\r
+ * Window\r
+ * by http://nurucom-archives.hp.infoseek.co.jp/digital/trans-uri.html\r
+ */\r
+\r
+/* 正規表現が使われているため、まだ投入しない itozyun\r
+window.encodeURI || (window.encodeURI = function (x) {\r
+       return ("" + x).replace(/[^!#$&-;=?-Z_a-z~]/g, function (s) {\r
+               var c = s.charCodeAt(0), p = "%";\r
+               return (\r
+                       c < 16 ? "%0" + c.toString(16) :\r
+                       c < 128 ? p + c.toString(16) :\r
+                       c < 2048 ? p + (c >> 6 | 192).toString(16) + p + (c & 63 | 128).toString(16) :\r
+                       p + (c >> 12 | 224).toString(16) + p + (c >> 6 & 63 | 128).toString(16) + p + (c & 63 | 128).toString(16)\r
+               ).toUpperCase();\r
+       });\r
+});\r
+\r
+window.encodeURIComponent || (window.encodeURIComponent = function (x) {\r
+       return ("" + x).replace(/[^!'-*.0-9A-Z_a-z~-]/g, function (s) {\r
+               var c = s.charCodeAt(0), p = "%";\r
+               return (\r
+                       c < 16 ? "%0" + c.toString(16) :\r
+                       c < 128 ? p + c.toString(16) :\r
+                       c < 2048 ? p + (c >> 6 | 192).toString(16) + p + (c & 63 | 128).toString(16) :\r
+                       p + (c >> 12 | 224).toString(16) + p + (c >> 6 & 63 | 128).toString(16) + p + (c & 63 | 128).toString(16)\r
+               ).toUpperCase();\r
+       });\r
+});\r
+\r
+// 手抜き\r
+window.decodeURI || (window.decodeURI = function (x) {\r
+       return ("" + x).replace(/%(E(0%[AB]|[1-CEF]%[89AB]|D%[89])[0-9A-F]|C[2-9A-F]|D[0-9A-F])%[89AB][0-9A-F]|%[0-7][0-9A-F]/ig, function (s) {\r
+               var c = parseInt(s.substring(1), 16);\r
+               return String.fromCharCode(\r
+                       c < 128 ? c :\r
+                       c < 224 ? (c & 31) << 6 | parseInt(s.substring(4), 16) & 63 :\r
+                       ((c & 15) << 6 | parseInt(s.substring(4), 16) & 63) << 6 | parseInt(s.substring(7), 16) & 63\r
+               );\r
+       });\r
+});\r
+*/\r
+\r
+\r
+//window.decodeURIComponent || (window.decodeURIComponent = window.decodeURI);\r
+\r
+\r
+/*\r
+ * String\r
+ */\r
+\r
+// replace(RegExp, Function)対応\r
+/*\r
+if (window.ActiveXObject ? !Number.prototype.toFixed : (!navigator.taintEnabled && !document.createElement("input").setSelectionRange))\r
+       (function () {\r
+               var g = String.prototype.replace;\r
+               String.prototype.replace = function (x, y) {\r
+                       var s = this, z = y;\r
+                       // 第二引数が関数\r
+                       if (y instanceof Function) {\r
+                               // 第一引数が正規表現\r
+                               if (x instanceof RegExp) {\r
+                                       // その上、グローバルマッチ\r
+                                       if (x.global || /^\/.*g$/.test(x)) {\r
+                                               var r = [], m;\r
+                                               while ((m = x.exec(s)) != null) {\r
+                                                       var i = m.index;\r
+                                                       r[r.length] = s.slice(0, i);\r
+                                                       s = s.slice(i + m[0].length);\r
+                                                       r[r.length] = y.apply(null, m.concat(i, this));\r
+                                               }\r
+                                               r[r.length] = s;\r
+                                               return r.join("");\r
+                                       }\r
+                                       var m = x.exec(s);\r
+                                       if (!m)\r
+                                               return s;\r
+                                       z = y.apply(null, m.concat(m.index, s));\r
+                               }\r
+                               else {\r
+                                       var i = s.indexOf(x);\r
+                                       if (i < 0)\r
+                                               return s;\r
+                                       z = y(x, i, s);\r
+                               }\r
+                       }\r
+                       return g.call(s, x, z);\r
+               };\r
+       })(); */\r
+       \r
+\r