Version 0.6.60, fix X.Timer for iOS.

diff --git a/0.6.x/js/core/00_builtin.js b/0.6.x/js/core/00_builtin.js
index 496c533..b9adfeb 100644 (file)
--- a/0.6.x/js/core/00_builtin.js
+++ b/0.6.x/js/core/00_builtin.js
@@ -53,8 +53,8 @@ Function.prototype.apply || (Function.prototype.apply = function (x, y) {
        return r;\r
 });\r
 Function.prototype.call || (Function.prototype.call = function () {\r
-       var a = arguments, x = a[0], y = [], i = 1, j;\r
-       for (j = a.length; i < j; ++i)\r
+       var a = arguments, x = a[0], y = [], i = 1, j = a.length;\r
+       for (; i < j; ++i)\r
                y[i - 1] = a[i];\r
        return this.apply(x, y);\r
 });\r
@@ -78,25 +78,25 @@ Array.prototype.shift || (Array.prototype.shift = function () {
        return r;\r
 });\r
 Array.prototype.unshift || (Array.prototype.unshift = function () {\r
-       var a = arguments, l = a.length, j = this.length += l - 1;\r
-       for (var i = j; i >= l; --i)\r
+       var a = arguments, l = a.length, j = this.length += l - 1, i = j;\r
+       for (; i >= l; --i)\r
                this[i] = this[i - l];\r
-       for (var i = 0; i < l; ++i)\r
+       for (i = 0; i < l; ++i)\r
                this[i] = a[i];\r
        return j;\r
 });\r
 Array.prototype.splice || (Array.prototype.splice = function (x, y) {\r
-       var a = arguments, s = a.length - 2 - y, r = this.slice(x, x + y);\r
+       var a = arguments, s = a.length - 2 - y, r = this.slice(x, x + y),i,j;\r
        if (s > 0) {\r
-               for (var i = this.length - 1, j = x + y; i >= j; --i)\r
+               for (i = this.length - 1, j = x + y; i >= j; --i)\r
                        this[i + s] = this[i];\r
        }\r
        else if (s < 0) {\r
-               for (var i = x + y, j = this.length; i < j; ++i)\r
+               for (i = x + y, j = this.length; i < j; ++i)\r
                        this[i + s] = this[i];\r
                this.length += s;\r
        }\r
-       for (var i = 2, j = a.length; i < j; ++i)\r
+       for (i = 2, j = a.length; i < j; ++i)\r
                this[i - 2 + x] = a[i];\r
        return r;\r
 });\r
@@ -108,13 +108,13 @@ Array.prototype.splice || (Array.prototype.splice = function (x, y) {
  */\r
 \r
 Array.prototype.indexOf || (Array.prototype.indexOf = function( searchElement, fromIndex ){\r
-        var l = this.length >>> 0,\r
-               i = 0;\r
+        var l = this.length >>> 0, i;\r
+        \r
         if( l === 0 ) return -1;\r
         \r
         if( fromIndex ){\r
             i = fromIndex || 0;\r
-            i = i === -Infinity ? 0 : Math.floor( i < 0 ? -i : i );\r
+            i = i === -Infinity ? 0 : ( i < 0 ? -i : i ) | 0; // Math.floor\r
             if( l <= i ) return -1;\r
         };\r
 \r

diff --git a/0.6.x/js/core/05_XTimer.js b/0.6.x/js/core/05_XTimer.js
index 66f8eef..d207ed0 100644 (file)
--- a/0.6.x/js/core/05_XTimer.js
+++ b/0.6.x/js/core/05_XTimer.js
@@ -196,7 +196,7 @@ X.Timer = {
 if( X.UA.iOS ){\r
         window.addEventListener( 'scroll', function(){\r
                if( X.Timer.timerId ){\r
-                       X.Timer.clearTimeout( X.Timer.timerId );\r
+                       window.clearTimeout( X.Timer.timerId );\r
                        X.Timer.timerId = window.setTimeout( X.Timer._loop, Math.max( 0, X.Timer.endTime - X.getTime() ) );\r
                };\r
         } );\r

diff --git a/0.6.x/js/dom/12_XDomEvent.js b/0.6.x/js/dom/12_XDomEvent.js
index a3679a2..bddd800 100644 (file)
--- a/0.6.x/js/dom/12_XDomEvent.js
+++ b/0.6.x/js/dom/12_XDomEvent.js
@@ -109,7 +109,7 @@ if( X.Dom.EVENT_W3C ){
                \r
 \r
                \r
-               if( X.UA.IE && 5 <= X.UA.IE ){\r
+               if( 5 <= X.UA.IE ){\r
                        this.offsetX       = e.offsetX; // イベントターゲット左上からの座標\r
                        this.offsetY       = e.offsetY;                 \r
                }// else\r