diff --git a/js/angular/controller/navBarController.js b/js/angular/controller/navBarController.js index 50b052dc74..d025962dc1 100644 --- a/js/angular/controller/navBarController.js +++ b/js/angular/controller/navBarController.js @@ -125,5 +125,5 @@ function($scope, $element, $attrs, $ionicViewService, $animate, $compile, $ionic }); }); }; -}]) +}]); diff --git a/js/angular/directive/infiniteScroll.js b/js/angular/directive/infiniteScroll.js index 711a4d7b40..05c0ff5c65 100644 --- a/js/angular/directive/infiniteScroll.js +++ b/js/angular/directive/infiniteScroll.js @@ -101,7 +101,7 @@ IonicModule $element[0].classList.add('active'); infiniteScrollCtrl.isLoading = true; $scope.$parent && $scope.$parent.$apply($attrs.onInfinite || ''); - } + }; var finishInfiniteScroll = function() { $element[0].classList.remove('active'); diff --git a/js/angular/service/animation.js b/js/angular/service/animation.js index 483f7ee0e3..f8f0c558c9 100644 --- a/js/angular/service/animation.js +++ b/js/angular/service/animation.js @@ -15,22 +15,22 @@ * var anim = $ionicAnimate({ * // A unique, reusable name * name: 'popIn', - * + * * // The duration of an auto playthrough * duration: 0.5, - * + * * // How long to wait before running the animation * delay: 0, - * + * * // Whether to reverse after doing one run through * autoReverse: false, - * + * * // How many times to repeat? -1 or null for infinite * repeat: -1, - * + * * // Timing curve to use (same as CSS timing functions), or a function of time "t" to handle it yourself * curve: 'ease-in-out' - * + * * onStart: function() { * // Callback on start * }, @@ -38,7 +38,7 @@ * // Callback on end * }, * step: function(amt) { - * + * * } * }) * }); @@ -56,6 +56,6 @@ IonicModule return function(opts) { opts.useSlowAnimations = useSlowAnimations; return ionic.Animation.create(opts); - } - }] + }; + }]; }); diff --git a/js/angular/service/modal.js b/js/angular/service/modal.js index ec9c61efbc..499c769cff 100644 --- a/js/angular/service/modal.js +++ b/js/angular/service/modal.js @@ -96,7 +96,7 @@ function($rootScope, $document, $compile, $timeout, $ionicPlatform, $ionicTempla self.el.classList.remove('hide'); $timeout(function(){ $document[0].body.classList.add('modal-open'); - }, 400) + }, 400); if(!self.el.parentElement) { diff --git a/js/angular/service/tabsDelegate.js b/js/angular/service/tabsDelegate.js index 0d740539e8..e505d404a4 100644 --- a/js/angular/service/tabsDelegate.js +++ b/js/angular/service/tabsDelegate.js @@ -64,5 +64,5 @@ IonicModule * * Example: `$ionicTabsDelegate.$getByHandle('my-handle').select(0);` */ -])) +])); diff --git a/js/animation/animation.js b/js/animation/animation.js index fc2dac8130..714c76ca54 100644 --- a/js/animation/animation.js +++ b/js/animation/animation.js @@ -136,7 +136,7 @@ percent: percent, iteration: iteration, reverse: reverse - } + }; }, restart: function() { }, @@ -151,7 +151,7 @@ // Grab the timing function if(typeof this.curve === 'string') { - tf = ionic.Animation.TimingFn[this.curve] || ionic.Animation.TimingFn['linear']; + tf = ionic.Animation.TimingFn[this.curve] || ionic.Animation.TimingFn.linear; } else { tf = this.curve; } @@ -169,7 +169,7 @@ reverse: this.reverse, repeat: this.repeat, autoReverse: this.autoReverse - } + }; if(this._pauseState) { @@ -240,7 +240,7 @@ // Start fresh either way start = time(); ionic.requestAnimationFrame(step); - } + }; // This is the internal step method which is called every few milliseconds @@ -306,7 +306,7 @@ } else if(repeat === 0 && autoReverse) { perhapsAutoreverse(); } else { - completedCallback && completedCallback(desiredFrames - (dropCounter / ((now - start) / millisecondsPerSecond)), self._animationId, percent === endPercent || duration == null); + completedCallback && completedCallback(desiredFrames - (dropCounter / ((now - start) / millisecondsPerSecond)), self._animationId, percent === endPercent || duration === null); } } else if (render) { lastFrame = now; diff --git a/js/animation/bezier.js b/js/animation/bezier.js index 0ed64a807d..4f95fbaeca 100644 --- a/js/animation/bezier.js +++ b/js/animation/bezier.js @@ -20,7 +20,7 @@ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ (function(ionic) { @@ -35,23 +35,23 @@ function B3(t) { return 3*t*(1-t)*(1-t); } function B4(t) { return (1-t)*(1-t)*(1-t); } - ionic.Animation = ionic.Animation || {} + ionic.Animation = ionic.Animation || {}; + - /** * JavaScript port of Webkit implementation of CSS cubic-bezier(p1x.p1y,p2x,p2y) by http://mck.me * http://svn.webkit.org/repository/webkit/trunk/Source/WebCore/platform/graphics/UnitBezier.h */ ionic.Animation.Bezier = (function(){ 'use strict'; - + /** * Duration value to use when one is not specified (400ms is a common value). * @const * @type {number} */ var DEFAULT_DURATION = 400;//ms - + /** * The epsilon value we pass to UnitBezier::solve given that the animation is going to run over |dur| seconds. * The longer the animation, the more precision we need in the timing function result to avoid ugly discontinuities. @@ -60,7 +60,7 @@ var solveEpsilon = function(duration) { return 1.0 / (200.0 * duration); }; - + /** * Defines a cubic-bezier curve given the middle two control points. * NOTE: first and last control points are implicitly (0,0) and (1,1). @@ -70,53 +70,53 @@ * @param p2y {number} Y component of control point 2 */ var unitBezier = function(p1x, p1y, p2x, p2y) { - + // private members -------------------------------------------- - + // Calculate the polynomial coefficients, implicit first and last control points are (0,0) and (1,1). - + /** * X component of Bezier coefficient C * @const * @type {number} */ var cx = 3.0 * p1x; - + /** * X component of Bezier coefficient B * @const * @type {number} */ var bx = 3.0 * (p2x - p1x) - cx; - + /** * X component of Bezier coefficient A * @const * @type {number} */ var ax = 1.0 - cx -bx; - + /** * Y component of Bezier coefficient C * @const * @type {number} */ var cy = 3.0 * p1y; - + /** * Y component of Bezier coefficient B * @const * @type {number} */ var by = 3.0 * (p2y - p1y) - cy; - + /** * Y component of Bezier coefficient A * @const * @type {number} */ var ay = 1.0 - cy - by; - + /** * @param t {number} parametric timing value * @return {number} @@ -125,7 +125,7 @@ // `ax t^3 + bx t^2 + cx t' expanded using Horner's rule. return ((ax * t + bx) * t + cx) * t; }; - + /** * @param t {number} parametric timing value * @return {number} @@ -133,7 +133,7 @@ var sampleCurveY = function(t) { return ((ay * t + by) * t + cy) * t; }; - + /** * @param t {number} parametric timing value * @return {number} @@ -141,7 +141,7 @@ var sampleCurveDerivativeX = function(t) { return (3.0 * ax * t + 2.0 * bx) * t + cx; }; - + /** * Given an x value, find a parametric value it came from. * @param x {number} value of x along the bezier curve, 0.0 <= x <= 1.0 @@ -155,7 +155,7 @@ var x2; var d2; var i; - + // First try a few iterations of Newton's method -- normally very fast. for (t2 = x, i = 0; i < 8; i++) { x2 = sampleCurveX(t2) - x; @@ -168,19 +168,19 @@ } t2 = t2 - x2 / d2; } - + // Fall back to the bisection method for reliability. t0 = 0.0; t1 = 1.0; t2 = x; - + if (t2 < t0) { return t0; } if (t2 > t1) { return t1; } - + while (t0 < t1) { x2 = sampleCurveX(t2); if (Math.abs(x2 - x) < epsilon) { @@ -193,11 +193,11 @@ } t2 = (t1 - t0) * 0.5 + t0; } - + // Failure. return t2; }; - + /** * @param x {number} the value of x along the bezier curve, 0.0 <= x <= 1.0 * @param epsilon {number} the accuracy of t for the given x @@ -206,9 +206,9 @@ var solve = function(x, epsilon) { return sampleCurveY(solveCurveX(x, epsilon)); }; - + // public interface -------------------------------------------- - + /** * Find the y of the cubic-bezier for a given x with accuracy determined by the animation duration. * @param x {number} the value of x along the bezier curve, 0.0 <= x <= 1.0 @@ -219,7 +219,7 @@ return solve(x, solveEpsilon(+duration || DEFAULT_DURATION)); }; }; - + // http://www.w3.org/TR/css3-transitions/#transition-timing-function return { /** @@ -228,35 +228,35 @@ * @return {number} the y value along the bezier curve */ linear: unitBezier(0.0, 0.0, 1.0, 1.0), - + /** * @param x {number} the value of x along the bezier curve, 0.0 <= x <= 1.0 * @param duration {number} the duration of the animation in milliseconds * @return {number} the y value along the bezier curve */ ease: unitBezier(0.25, 0.1, 0.25, 1.0), - + /** * @param x {number} the value of x along the bezier curve, 0.0 <= x <= 1.0 * @param duration {number} the duration of the animation in milliseconds * @return {number} the y value along the bezier curve */ easeIn: unitBezier(0.42, 0, 1.0, 1.0), - + /** * @param x {number} the value of x along the bezier curve, 0.0 <= x <= 1.0 * @param duration {number} the duration of the animation in milliseconds * @return {number} the y value along the bezier curve */ easeOut: unitBezier(0, 0, 0.58, 1.0), - + /** * @param x {number} the value of x along the bezier curve, 0.0 <= x <= 1.0 * @param duration {number} the duration of the animation in milliseconds * @return {number} the y value along the bezier curve */ easeInOut: unitBezier(0.42, 0, 0.58, 1.0), - + /** * @param p1x {number} X component of control point 1 * @param p1y {number} Y component of control point 1 @@ -278,14 +278,14 @@ */ var Easing = (function(){ 'use strict'; - + /** * @const */ var EASE_IN_OUT_CONST = 0.5 * Math.pow(0.5, 1.925); - + return { - + /** * @param x {number} the value of x along the curve, 0.0 <= x <= 1.0 * @return {number} the y value along the curve @@ -293,7 +293,7 @@ var Easing = (function(){ linear: function(x) { return x; }, - + // /** // * @param x {number} the value of x along the curve, 0.0 <= x <= 1.0 // * @return {number} the y value along the curve @@ -302,7 +302,7 @@ var Easing = (function(){ // // TODO: find fast approximations // return x; // }, - + /** * @param x {number} the value of x along the curve, 0.0 <= x <= 1.0 * @return {number} the y value along the curve @@ -311,7 +311,7 @@ var Easing = (function(){ // very close approximation to cubic-bezier(0.42, 0, 1.0, 1.0) return Math.pow(x, 1.685); }, - + /** * @param x {number} the value of x along the curve, 0.0 <= x <= 1.0 * @return {number} the y value along the curve @@ -319,7 +319,7 @@ var Easing = (function(){ easeInQuadratic: function(x) { return (x * x); }, - + /** * @param x {number} the value of x along the curve, 0.0 <= x <= 1.0 * @return {number} the y value along the curve @@ -327,7 +327,7 @@ var Easing = (function(){ easeInCubic: function(x) { return (x * x * x); }, - + /** * @param x {number} the value of x along the curve, 0.0 <= x <= 1.0 * @return {number} the y value along the curve @@ -336,7 +336,7 @@ var Easing = (function(){ // very close approximation to cubic-bezier(0, 0, 0.58, 1.0) return 1 - Math.pow(1-x, 1.685); }, - + /** * @param x {number} the value of x along the curve, 0.0 <= x <= 1.0 * @return {number} the y value along the curve @@ -345,7 +345,7 @@ var Easing = (function(){ x -= 1; return 1 - (x * x); }, - + /** * @param x {number} the value of x along the curve, 0.0 <= x <= 1.0 * @return {number} the y value along the curve @@ -354,7 +354,7 @@ var Easing = (function(){ x -= 1; return 1 + (x * x * x); }, - + /** * @param x {number} the value of x along the curve, 0.0 <= x <= 1.0 * @return {number} the y value along the curve @@ -363,12 +363,12 @@ var Easing = (function(){ // very close approximation to cubic-bezier(0.42, 0, 0.58, 1.0) if (x < 0.5) { return EASE_IN_OUT_CONST * Math.pow(x, 1.925); - + } else { return 1 - EASE_IN_OUT_CONST * Math.pow(1-x, 1.925); } }, - + /** * @param x {number} the value of x along the curve, 0.0 <= x <= 1.0 * @return {number} the y value along the curve @@ -376,13 +376,13 @@ var Easing = (function(){ easeInOutQuadratic: function(x) { if (x < 0.5) { return (2 * x * x); - + } else { x -= 1; return 1 - (2 * x * x); } }, - + /** * @param x {number} the value of x along the curve, 0.0 <= x <= 1.0 * @return {number} the y value along the curve @@ -390,13 +390,13 @@ var Easing = (function(){ easeInOutCubic: function(x) { if (x < 0.5) { return (4 * x * x * x); - + } else { x -= 1; return 1 + (4 * x * x * x); } }, - + /** * @param x {number} the value of x along the curve, 0.0 <= x <= 1.0 * @return {number} the y value along the curve @@ -404,13 +404,13 @@ var Easing = (function(){ easeInOutQuartic: function(x) { if (x < 0.5) { return (8 * x * x * x * x); - + } else { x -= 1; return 1 + (8 * x * x * x * x); } }, - + /** * @param x {number} the value of x along the curve, 0.0 <= x <= 1.0 * @return {number} the y value along the curve @@ -418,7 +418,7 @@ var Easing = (function(){ easeInOutQuintic: function(x) { if (x < 0.5) { return (16 * x * x * x * x * x); - + } else { x -= 1; return 1 + (16 * x * x * x * x * x); diff --git a/js/animation/gl-matrix.js b/js/animation/gl-matrix.js index 3965a55df3..75e7d0df82 100644 --- a/js/animation/gl-matrix.js +++ b/js/animation/gl-matrix.js @@ -57,12 +57,12 @@ are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation + this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; @@ -97,7 +97,7 @@ var glMatrix = {}; */ glMatrix.setMatrixArrayType = function(type) { GLMAT_ARRAY_TYPE = type; -} +}; if(typeof(exports) !== 'undefined') { exports.glMatrix = glMatrix; @@ -122,12 +122,12 @@ are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation + this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; @@ -566,7 +566,7 @@ vec2.transformMat3 = function(out, a, m) { * @returns {vec2} out */ vec2.transformMat4 = function(out, a, m) { - var x = a[0], + var x = a[0], y = a[1]; out[0] = m[0] * x + m[4] * y + m[12]; out[1] = m[1] * x + m[5] * y + m[13]; @@ -597,7 +597,7 @@ vec2.forEach = (function() { if(!offset) { offset = 0; } - + if(count) { l = Math.min((count * stride) + offset, a.length); } else { @@ -609,7 +609,7 @@ vec2.forEach = (function() { fn(vec, vec, arg); a[i] = vec[0]; a[i+1] = vec[1]; } - + return a; }; })(); @@ -636,12 +636,12 @@ are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation + this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; @@ -1153,17 +1153,17 @@ vec3.rotateY = function(out, a, b, c){ p[0] = a[0] - b[0]; p[1] = a[1] - b[1]; p[2] = a[2] - b[2]; - + //perform rotation r[0] = p[2]*Math.sin(c) + p[0]*Math.cos(c); r[1] = p[1]; r[2] = p[2]*Math.cos(c) - p[0]*Math.sin(c); - + //translate to correct position out[0] = r[0] + b[0]; out[1] = r[1] + b[1]; out[2] = r[2] + b[2]; - + return out; }; @@ -1181,17 +1181,17 @@ vec3.rotateZ = function(out, a, b, c){ p[0] = a[0] - b[0]; p[1] = a[1] - b[1]; p[2] = a[2] - b[2]; - + //perform rotation r[0] = p[0]*Math.cos(c) - p[1]*Math.sin(c); r[1] = p[0]*Math.sin(c) + p[1]*Math.cos(c); r[2] = p[2]; - + //translate to correct position out[0] = r[0] + b[0]; out[1] = r[1] + b[1]; out[2] = r[2] + b[2]; - + return out; }; @@ -1219,7 +1219,7 @@ vec3.forEach = (function() { if(!offset) { offset = 0; } - + if(count) { l = Math.min((count * stride) + offset, a.length); } else { @@ -1231,7 +1231,7 @@ vec3.forEach = (function() { fn(vec, vec, arg); a[i] = vec[0]; a[i+1] = vec[1]; a[i+2] = vec[2]; } - + return a; }; })(); @@ -1258,12 +1258,12 @@ are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation + this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; @@ -1744,7 +1744,7 @@ vec4.forEach = (function() { if(!offset) { offset = 0; } - + if(count) { l = Math.min((count * stride) + offset, a.length); } else { @@ -1756,7 +1756,7 @@ vec4.forEach = (function() { fn(vec, vec, arg); a[i] = vec[0]; a[i+1] = vec[1]; a[i+2] = vec[2]; a[i+3] = vec[3]; } - + return a; }; })(); @@ -1783,12 +1783,12 @@ are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation + this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; @@ -1881,7 +1881,7 @@ mat2.transpose = function(out, a) { out[2] = a[1]; out[3] = a[3]; } - + return out; }; @@ -1902,7 +1902,7 @@ mat2.invert = function(out, a) { return null; } det = 1.0 / det; - + out[0] = a3 * det; out[1] = -a1 * det; out[2] = -a2 * det; @@ -2022,19 +2022,19 @@ mat2.frob = function (a) { /** * Returns L, D and U matrices (Lower triangular, Diagonal and Upper triangular) by factorizing the input matrix - * @param {mat2} L the lower triangular matrix - * @param {mat2} D the diagonal matrix - * @param {mat2} U the upper triangular matrix + * @param {mat2} L the lower triangular matrix + * @param {mat2} D the diagonal matrix + * @param {mat2} U the upper triangular matrix * @param {mat2} a the input matrix to factorize */ -mat2.LDU = function (L, D, U, a) { - L[2] = a[2]/a[0]; - U[0] = a[0]; - U[1] = a[1]; - U[3] = a[3] - L[2] * U[1]; - return [L, D, U]; -}; +mat2.LDU = function (L, D, U, a) { + L[2] = a[2]/a[0]; + U[0] = a[0]; + U[1] = a[1]; + U[3] = a[3] - L[2] * U[1]; + return [L, D, U]; +}; if(typeof(exports) !== 'undefined') { exports.mat2 = mat2; @@ -2048,12 +2048,12 @@ are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation + this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; @@ -2065,8 +2065,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /** * @class 2x3 Matrix * @name mat2d - * - * @description + * + * @description * A mat2d contains six elements defined as: *
  * [a, c, tx,
@@ -2280,7 +2280,7 @@ mat2d.translate = function(out, a, v) {
  * @returns {String} string representation of the matrix
  */
 mat2d.str = function (a) {
-    return 'mat2d(' + a[0] + ', ' + a[1] + ', ' + a[2] + ', ' + 
+    return 'mat2d(' + a[0] + ', ' + a[1] + ', ' + a[2] + ', ' +
                     a[3] + ', ' + a[4] + ', ' + a[5] + ')';
 };
 
@@ -2290,9 +2290,9 @@ mat2d.str = function (a) {
  * @param {mat2d} a the matrix to calculate Frobenius norm of
  * @returns {Number} Frobenius norm
  */
-mat2d.frob = function (a) { 
+mat2d.frob = function (a) {
     return(Math.sqrt(Math.pow(a[0], 2) + Math.pow(a[1], 2) + Math.pow(a[2], 2) + Math.pow(a[3], 2) + Math.pow(a[4], 2) + Math.pow(a[5], 2) + 1))
-}; 
+};
 
 if(typeof(exports) !== 'undefined') {
     exports.mat2d = mat2d;
@@ -2306,12 +2306,12 @@ are permitted provided that the following conditions are met:
   * Redistributions of source code must retain the above copyright notice, this
     list of conditions and the following disclaimer.
   * Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation 
+    this list of conditions and the following disclaimer in the documentation
     and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
 ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -2453,7 +2453,7 @@ mat3.transpose = function(out, a) {
         out[7] = a[5];
         out[8] = a[8];
     }
-    
+
     return out;
 };
 
@@ -2476,8 +2476,8 @@ mat3.invert = function(out, a) {
         // Calculate the determinant
         det = a00 * b01 + a01 * b11 + a02 * b21;
 
-    if (!det) { 
-        return null; 
+    if (!det) {
+        return null;
     }
     det = 1.0 / det;
 
@@ -2742,8 +2742,8 @@ mat3.normalFromMat4 = function (out, a) {
         // Calculate the determinant
         det = b00 * b11 - b01 * b10 + b02 * b09 + b03 * b08 - b04 * b07 + b05 * b06;
 
-    if (!det) { 
-        return null; 
+    if (!det) {
+        return null;
     }
     det = 1.0 / det;
 
@@ -2769,8 +2769,8 @@ mat3.normalFromMat4 = function (out, a) {
  * @returns {String} string representation of the matrix
  */
 mat3.str = function (a) {
-    return 'mat3(' + a[0] + ', ' + a[1] + ', ' + a[2] + ', ' + 
-                    a[3] + ', ' + a[4] + ', ' + a[5] + ', ' + 
+    return 'mat3(' + a[0] + ', ' + a[1] + ', ' + a[2] + ', ' +
+                    a[3] + ', ' + a[4] + ', ' + a[5] + ', ' +
                     a[6] + ', ' + a[7] + ', ' + a[8] + ')';
 };
 
@@ -2797,12 +2797,12 @@ are permitted provided that the following conditions are met:
   * Redistributions of source code must retain the above copyright notice, this
     list of conditions and the following disclaimer.
   * Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation 
+    this list of conditions and the following disclaimer in the documentation
     and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
 ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -2968,7 +2968,7 @@ mat4.transpose = function(out, a) {
         out[14] = a[11];
         out[15] = a[15];
     }
-    
+
     return out;
 };
 
@@ -3001,8 +3001,8 @@ mat4.invert = function(out, a) {
         // Calculate the determinant
         det = b00 * b11 - b01 * b10 + b02 * b09 + b03 * b08 - b04 * b07 + b05 * b06;
 
-    if (!det) { 
-        return null; 
+    if (!det) {
+        return null;
     }
     det = 1.0 / det;
 
@@ -3102,7 +3102,7 @@ mat4.multiply = function (out, a, b) {
         a30 = a[12], a31 = a[13], a32 = a[14], a33 = a[15];
 
     // Cache only the current line of the second matrix
-    var b0  = b[0], b1 = b[1], b2 = b[2], b3 = b[3];  
+    var b0  = b[0], b1 = b[1], b2 = b[2], b3 = b[3];
     out[0] = b0*a00 + b1*a10 + b2*a20 + b3*a30;
     out[1] = b0*a01 + b1*a11 + b2*a21 + b3*a31;
     out[2] = b0*a02 + b1*a12 + b2*a22 + b3*a32;
@@ -3222,7 +3222,7 @@ mat4.rotate = function (out, a, rad, axis) {
         b20, b21, b22;
 
     if (Math.abs(len) < GLMAT_EPSILON) { return null; }
-    
+
     len = 1 / len;
     x *= len;
     y *= len;
@@ -3441,7 +3441,7 @@ mat4.fromRotationTranslation = function (out, q, v) {
     out[13] = v[1];
     out[14] = v[2];
     out[15] = 1;
-    
+
     return out;
 };
 
@@ -3682,7 +3682,7 @@ mat4.lookAt = function (out, eye, center, up) {
 mat4.str = function (a) {
     return 'mat4(' + a[0] + ', ' + a[1] + ', ' + a[2] + ', ' + a[3] + ', ' +
                     a[4] + ', ' + a[5] + ', ' + a[6] + ', ' + a[7] + ', ' +
-                    a[8] + ', ' + a[9] + ', ' + a[10] + ', ' + a[11] + ', ' + 
+                    a[8] + ', ' + a[9] + ', ' + a[10] + ', ' + a[11] + ', ' +
                     a[12] + ', ' + a[13] + ', ' + a[14] + ', ' + a[15] + ')';
 };
 
@@ -3709,12 +3709,12 @@ are permitted provided that the following conditions are met:
   * Redistributions of source code must retain the above copyright notice, this
     list of conditions and the following disclaimer.
   * Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation 
+    this list of conditions and the following disclaimer in the documentation
     and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
 ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -3949,7 +3949,7 @@ quat.scale = vec4.scale;
  * @returns {quat} out
  */
 quat.rotateX = function (out, a, rad) {
-    rad *= 0.5; 
+    rad *= 0.5;
 
     var ax = a[0], ay = a[1], az = a[2], aw = a[3],
         bx = Math.sin(rad), bw = Math.cos(rad);
@@ -3970,7 +3970,7 @@ quat.rotateX = function (out, a, rad) {
  * @returns {quat} out
  */
 quat.rotateY = function (out, a, rad) {
-    rad *= 0.5; 
+    rad *= 0.5;
 
     var ax = a[0], ay = a[1], az = a[2], aw = a[3],
         by = Math.sin(rad), bw = Math.cos(rad);
@@ -3991,7 +3991,7 @@ quat.rotateY = function (out, a, rad) {
  * @returns {quat} out
  */
 quat.rotateZ = function (out, a, rad) {
-    rad *= 0.5; 
+    rad *= 0.5;
 
     var ax = a[0], ay = a[1], az = a[2], aw = a[3],
         bz = Math.sin(rad), bw = Math.cos(rad);
@@ -4079,8 +4079,8 @@ quat.slerp = function (out, a, b, t) {
         sinom  = Math.sin(omega);
         scale0 = Math.sin((1.0 - t) * omega) / sinom;
         scale1 = Math.sin(t * omega) / sinom;
-    } else {        
-        // "from" and "to" quaternions are very close 
+    } else {
+        // "from" and "to" quaternions are very close
         //  ... so we can do a linear interpolation
         scale0 = 1.0 - t;
         scale1 = t;
@@ -4090,7 +4090,7 @@ quat.slerp = function (out, a, b, t) {
     out[1] = scale0 * ay + scale1 * by;
     out[2] = scale0 * az + scale1 * bz;
     out[3] = scale0 * aw + scale1 * bw;
-    
+
     return out;
 };
 
@@ -4105,7 +4105,7 @@ quat.invert = function(out, a) {
     var a0 = a[0], a1 = a[1], a2 = a[2], a3 = a[3],
         dot = a0*a0 + a1*a1 + a2*a2 + a3*a3,
         invDot = dot ? 1.0/dot : 0;
-    
+
     // TODO: Would be faster to return [0,0,0,0] immediately if dot == 0
 
     out[0] = -a0*invDot;
@@ -4205,7 +4205,7 @@ quat.fromMat3 = function(out, m) {
           i = 2;
         var j = (i+1)%3;
         var k = (i+2)%3;
-        
+
         fRoot = Math.sqrt(m[i*3+i]-m[j*3+j]-m[k*3+k] + 1.0);
         out[i] = 0.5 * fRoot;
         fRoot = 0.5 / fRoot;
@@ -4213,7 +4213,7 @@ quat.fromMat3 = function(out, m) {
         out[j] = (m[j*3+i] + m[i*3+j]) * fRoot;
         out[k] = (m[k*3+i] + m[i*3+k]) * fRoot;
     }
-    
+
     return out;
 };
 
diff --git a/js/utils/activator.js b/js/utils/activator.js
index 62ac608106..25fb7c048f 100644
--- a/js/utils/activator.js
+++ b/js/utils/activator.js
@@ -53,7 +53,7 @@
 
     end: function() {
       // clear out any active/queued elements after XX milliseconds
-      clearTimeout(this._activateTimeout)
+      clearTimeout(this._activateTimeout);
       setTimeout(clear, 200);
     }
 
diff --git a/js/utils/events.js b/js/utils/events.js
index 5d71de169a..e7b87b836c 100644
--- a/js/utils/events.js
+++ b/js/utils/events.js
@@ -35,7 +35,7 @@
         evt.initEvent(event, params.bubbles, params.cancelable);
       }
       return evt;
-    }
+    };
     customEvent.prototype = window.Event.prototype;
     return customEvent;
   })();
@@ -147,8 +147,7 @@
       gesture.off(type, callback);
     },
 
-    handlePopState: function(event) {
-    },
+    handlePopState: function(event) {}
   };
 
 
diff --git a/js/views/scrollView.js b/js/views/scrollView.js
index ff17c52295..a67b3bd304 100644
--- a/js/views/scrollView.js
+++ b/js/views/scrollView.js
@@ -52,7 +52,7 @@ var zyngaCore = { effect: {} };
 
       if (isNative) {
         return function(callback, root) {
-          requestFrame(callback, root)
+          requestFrame(callback, root);
         };
       }
 
diff --git a/js/views/sliderView.js b/js/views/sliderView.js
index a491074155..708b20158a 100644
--- a/js/views/sliderView.js
+++ b/js/views/sliderView.js
@@ -15,7 +15,7 @@ ionic.views.Slider = ionic.views.View.inherit({
 
     // utilities
     var noop = function() {}; // simple no operation function
-    var offloadFn = function(fn) { setTimeout(fn || noop, 0) }; // offload a functions execution
+    var offloadFn = function(fn) { setTimeout(fn || noop, 0); }; // offload a functions execution
 
     // check browser capabilities
     var browser = {
@@ -321,7 +321,7 @@ ionic.views.Slider = ionic.views.View.inherit({
         delta = {
           x: touches.pageX - start.x,
           y: touches.pageY - start.y
-        }
+        };
 
         // determine if scrolling test has run - one time test
         if ( typeof isScrolling == 'undefined') {
@@ -444,11 +444,11 @@ ionic.views.Slider = ionic.views.View.inherit({
 
         // kill touchmove and touchend event listeners until touchstart called again
         if(browser.touch) {
-          element.removeEventListener('touchmove', events, false)
-          element.removeEventListener('touchend', events, false)
+          element.removeEventListener('touchmove', events, false);
+          element.removeEventListener('touchend', events, false);
         } else {
-          element.removeEventListener('mousemove', events, false)
-          element.removeEventListener('mouseup', events, false)
+          element.removeEventListener('mousemove', events, false);
+          element.removeEventListener('mouseup', events, false);
           document.removeEventListener('mouseup', events, false);
         }
 
@@ -588,7 +588,7 @@ ionic.views.Slider = ionic.views.View.inherit({
 
       } else {
 
-        window.onresize = function () { setup() }; // to play nice with old IE
+        window.onresize = function () { setup(); }; // to play nice with old IE
 
       }
     }