diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js index aeb751ac41..ba75368cc1 100644 --- a/dist/js/ionic-angular.js +++ b/dist/js/ionic-angular.js @@ -1623,8 +1623,6 @@ angular.module('ionic.ui.scroll', []) sv = new ionic.views.Scroll({ el: $element[0], - scrollingX: hasScrollingX, - scrollingY: hasScrollingY }); // Activate pull-to-refresh diff --git a/dist/js/ionic.js b/dist/js/ionic.js index a12cf482e4..5847106a78 100644 --- a/dist/js/ionic.js +++ b/dist/js/ionic.js @@ -2126,7 +2126,7 @@ window.ionic = { if (isNative) { return function(callback, root) { - requestFrame(callback, root); + requestFrame(callback, root) }; } @@ -2186,7 +2186,7 @@ window.ionic = { * @return {Boolean} Whether the animation was stopped (aka, was running before) */ stop: function(id) { - var cleared = running[id] !== null; + var cleared = running[id] != null; if (cleared) { running[id] = null; } @@ -2202,7 +2202,7 @@ window.ionic = { * @return {Boolean} Whether the animation is still running */ isRunning: function(id) { - return running[id] !== null; + return running[id] != null; }, @@ -2285,7 +2285,7 @@ window.ionic = { var value = easingMethod ? easingMethod(percent) : percent; if ((stepCallback(value, now, render) === false || percent === 1) && render) { running[id] = null; - completedCallback && completedCallback(desiredFrames - (dropCounter / ((now - start) / millisecondsPerSecond)), id, percent === 1 || duration === null); + completedCallback && completedCallback(desiredFrames - (dropCounter / ((now - start) / millisecondsPerSecond)), id, percent === 1 || duration == null); } else if (render) { lastFrame = now; core.effect.Animate.requestAnimationFrame(step, root); @@ -2673,10 +2673,10 @@ ionic.views.Scroll = ionic.views.View.inherit({ // Update Scroller dimensions for changed content // Add padding to bottom of content this.setDimensions( - Math.min(this.__container.clientWidth, this.__container.parentElement.clientWidth), - Math.min(this.__container.clientHeight, this.__container.parentElement.clientHeight), - this.__content.offsetWidth, - this.__content.offsetHeight+20); + Math.min(this.__container.clientWidth, this.__container.parentElement.clientWidth), + Math.min(this.__container.clientHeight, this.__container.parentElement.clientHeight), + this.__content.offsetWidth, + this.__content.offsetHeight+20); }, /* --------------------------------------------------------------------------- @@ -2689,7 +2689,7 @@ ionic.views.Scroll = ionic.views.View.inherit({ var content = this.__content; - var docStyle = document.documentElement.style; + var docStyle = document.documentElement.style; var engine; if ('MozAppearance' in docStyle) { @@ -2926,11 +2926,11 @@ ionic.views.Scroll = ionic.views.View.inherit({ var oldLevel = self.__zoomLevel; // Normalize input origin to center of viewport if not defined - if (originLeft === null) { + if (originLeft == null) { originLeft = self.__clientWidth / 2; } - if (originTop === null) { + if (originTop == null) { originTop = self.__clientHeight / 2; } @@ -3000,7 +3000,7 @@ ionic.views.Scroll = ionic.views.View.inherit({ } // Correct coordinates based on new zoom level - if (zoom !== null && zoom !== self.__zoomLevel) { + if (zoom != null && zoom !== self.__zoomLevel) { if (!self.options.zooming) { throw new Error("Zooming is not enabled!"); @@ -3108,7 +3108,7 @@ ionic.views.Scroll = ionic.views.View.inherit({ doTouchStart: function(touches, timeStamp) { // Array-like check is enough here - if (touches.length === null) { + if (touches.length == null) { throw new Error("Invalid touch list: " + touches); } @@ -3194,7 +3194,7 @@ ionic.views.Scroll = ionic.views.View.inherit({ doTouchMove: function(touches, timeStamp, scale) { // Array-like check is enough here - if (touches.length === null) { + if (touches.length == null) { throw new Error("Invalid touch list: " + touches); } @@ -3239,7 +3239,7 @@ ionic.views.Scroll = ionic.views.View.inherit({ var level = self.__zoomLevel; // Work with scaling - if (scale !== null && self.options.zooming) { + if (scale != null && self.options.zooming) { var oldLevel = level; @@ -3304,7 +3304,7 @@ ionic.views.Scroll = ionic.views.View.inherit({ scrollTop += (moveY / 2 * this.options.speedMultiplier); // Support pull-to-refresh (only when only y is scrollable) - if (!self.__enableScrollX && self.__refreshHeight !== null) { + if (!self.__enableScrollX && self.__refreshHeight != null) { if (!self.__refreshActive && scrollTop <= -self.__refreshHeight) { @@ -3596,7 +3596,7 @@ ionic.views.Scroll = ionic.views.View.inherit({ var self = this; - if (zoomLevel === null) { + if (zoomLevel == null) { zoomLevel = self.__zoomLevel; } diff --git a/js/ext/angular/src/directive/ionicScroll.js b/js/ext/angular/src/directive/ionicScroll.js index a2e967fcb6..f9c31c9aac 100644 --- a/js/ext/angular/src/directive/ionicScroll.js +++ b/js/ext/angular/src/directive/ionicScroll.js @@ -54,8 +54,6 @@ angular.module('ionic.ui.scroll', []) sv = new ionic.views.Scroll({ el: $element[0], - scrollingX: hasScrollingX, - scrollingY: hasScrollingY }); // Activate pull-to-refresh diff --git a/js/views/scrollView.js b/js/views/scrollView.js index 1347bfe81a..af85b4aa39 100644 --- a/js/views/scrollView.js +++ b/js/views/scrollView.js @@ -59,7 +59,7 @@ if (isNative) { return function(callback, root) { - requestFrame(callback, root); + requestFrame(callback, root) }; } @@ -119,7 +119,7 @@ * @return {Boolean} Whether the animation was stopped (aka, was running before) */ stop: function(id) { - var cleared = running[id] !== null; + var cleared = running[id] != null; if (cleared) { running[id] = null; } @@ -135,7 +135,7 @@ * @return {Boolean} Whether the animation is still running */ isRunning: function(id) { - return running[id] !== null; + return running[id] != null; }, @@ -218,7 +218,7 @@ var value = easingMethod ? easingMethod(percent) : percent; if ((stepCallback(value, now, render) === false || percent === 1) && render) { running[id] = null; - completedCallback && completedCallback(desiredFrames - (dropCounter / ((now - start) / millisecondsPerSecond)), id, percent === 1 || duration === null); + completedCallback && completedCallback(desiredFrames - (dropCounter / ((now - start) / millisecondsPerSecond)), id, percent === 1 || duration == null); } else if (render) { lastFrame = now; core.effect.Animate.requestAnimationFrame(step, root); @@ -606,10 +606,10 @@ ionic.views.Scroll = ionic.views.View.inherit({ // Update Scroller dimensions for changed content // Add padding to bottom of content this.setDimensions( - Math.min(this.__container.clientWidth, this.__container.parentElement.clientWidth), - Math.min(this.__container.clientHeight, this.__container.parentElement.clientHeight), - this.__content.offsetWidth, - this.__content.offsetHeight+20); + Math.min(this.__container.clientWidth, this.__container.parentElement.clientWidth), + Math.min(this.__container.clientHeight, this.__container.parentElement.clientHeight), + this.__content.offsetWidth, + this.__content.offsetHeight+20); }, /* --------------------------------------------------------------------------- @@ -622,7 +622,7 @@ ionic.views.Scroll = ionic.views.View.inherit({ var content = this.__content; - var docStyle = document.documentElement.style; + var docStyle = document.documentElement.style; var engine; if ('MozAppearance' in docStyle) { @@ -859,11 +859,11 @@ ionic.views.Scroll = ionic.views.View.inherit({ var oldLevel = self.__zoomLevel; // Normalize input origin to center of viewport if not defined - if (originLeft === null) { + if (originLeft == null) { originLeft = self.__clientWidth / 2; } - if (originTop === null) { + if (originTop == null) { originTop = self.__clientHeight / 2; } @@ -933,7 +933,7 @@ ionic.views.Scroll = ionic.views.View.inherit({ } // Correct coordinates based on new zoom level - if (zoom !== null && zoom !== self.__zoomLevel) { + if (zoom != null && zoom !== self.__zoomLevel) { if (!self.options.zooming) { throw new Error("Zooming is not enabled!"); @@ -1041,7 +1041,7 @@ ionic.views.Scroll = ionic.views.View.inherit({ doTouchStart: function(touches, timeStamp) { // Array-like check is enough here - if (touches.length === null) { + if (touches.length == null) { throw new Error("Invalid touch list: " + touches); } @@ -1127,7 +1127,7 @@ ionic.views.Scroll = ionic.views.View.inherit({ doTouchMove: function(touches, timeStamp, scale) { // Array-like check is enough here - if (touches.length === null) { + if (touches.length == null) { throw new Error("Invalid touch list: " + touches); } @@ -1172,7 +1172,7 @@ ionic.views.Scroll = ionic.views.View.inherit({ var level = self.__zoomLevel; // Work with scaling - if (scale !== null && self.options.zooming) { + if (scale != null && self.options.zooming) { var oldLevel = level; @@ -1237,7 +1237,7 @@ ionic.views.Scroll = ionic.views.View.inherit({ scrollTop += (moveY / 2 * this.options.speedMultiplier); // Support pull-to-refresh (only when only y is scrollable) - if (!self.__enableScrollX && self.__refreshHeight !== null) { + if (!self.__enableScrollX && self.__refreshHeight != null) { if (!self.__refreshActive && scrollTop <= -self.__refreshHeight) { @@ -1529,7 +1529,7 @@ ionic.views.Scroll = ionic.views.View.inherit({ var self = this; - if (zoomLevel === null) { + if (zoomLevel == null) { zoomLevel = self.__zoomLevel; }