Build and prepare for 3.1.1 release

sanfeijoo · Jan 29, 2015 · 13ae054 · 13ae054
1 parent 78cf295
commit 13ae054
Show file tree

Hide file tree

Showing 17 changed files with 58 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v3.1.1
+
+- Fix bad `isWindow` checks causing errors in IE8-. (Issue #372)
+
 ## v3.1.0
 
 - Add `Waypoint.disableAll` and `Waypoint.enableAll` methods.

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "waypoints",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "main": "lib/noframework.waypoints.min.js",
   "description": "Easily execute a function when you scroll to an element.",
   "ignore": [

diff --git a/lib/jquery.waypoints.js b/lib/jquery.waypoints.js
@@ -1,5 +1,5 @@
 /*!
-Waypoints - 3.1.0
+Waypoints - 3.1.1
 Copyright © 2011-2015 Caleb Troughton
 Licensed under the MIT license.
 https://github.com/imakewebthings/waypoints/blog/master/licenses.txt
@@ -304,9 +304,11 @@ https://github.com/imakewebthings/waypoints/blog/master/licenses.txt
 
   /* Private */
   Context.prototype.innerHeight = function() {
-    if (this.element === this.element.window) {
+    /*eslint-disable eqeqeq */
+    if (this.element == this.element.window) {
       return Waypoint.viewportHeight()
     }
+    /*eslint-enable eqeqeq */
     return this.adapter.innerHeight()
   }
 
@@ -318,9 +320,11 @@ https://github.com/imakewebthings/waypoints/blog/master/licenses.txt
 
   /* Private */
   Context.prototype.innerWidth = function() {
-    if (this.element === this.element.window) {
+    /*eslint-disable eqeqeq */
+    if (this.element == this.element.window) {
       return Waypoint.viewportWidth()
     }
+    /*eslint-enable eqeqeq */
     return this.adapter.innerWidth()
   }
 
@@ -341,7 +345,9 @@ https://github.com/imakewebthings/waypoints/blog/master/licenses.txt
   /* Public */
   /* http://imakewebthings.com/waypoints/api/context-refresh */
   Context.prototype.refresh = function() {
-    var isWindow = this.element === this.element.window
+    /*eslint-disable eqeqeq */
+    var isWindow = this.element == this.element.window
+    /*eslint-enable eqeqeq */
     var contextOffset = this.adapter.offset()
     var triggeredGroups = {}
     var axes

diff --git a/lib/jquery.waypoints.min.js b/lib/jquery.waypoints.min.js
diff --git a/lib/noframework.waypoints.js b/lib/noframework.waypoints.js
@@ -1,5 +1,5 @@
 /*!
-Waypoints - 3.1.0
+Waypoints - 3.1.1
 Copyright © 2011-2015 Caleb Troughton
 Licensed under the MIT license.
 https://github.com/imakewebthings/waypoints/blog/master/licenses.txt
@@ -304,9 +304,11 @@ https://github.com/imakewebthings/waypoints/blog/master/licenses.txt
 
   /* Private */
   Context.prototype.innerHeight = function() {
-    if (this.element === this.element.window) {
+    /*eslint-disable eqeqeq */
+    if (this.element == this.element.window) {
       return Waypoint.viewportHeight()
     }
+    /*eslint-enable eqeqeq */
     return this.adapter.innerHeight()
   }
 
@@ -318,9 +320,11 @@ https://github.com/imakewebthings/waypoints/blog/master/licenses.txt
 
   /* Private */
   Context.prototype.innerWidth = function() {
-    if (this.element === this.element.window) {
+    /*eslint-disable eqeqeq */
+    if (this.element == this.element.window) {
       return Waypoint.viewportWidth()
     }
+    /*eslint-enable eqeqeq */
     return this.adapter.innerWidth()
   }
 
@@ -341,7 +345,9 @@ https://github.com/imakewebthings/waypoints/blog/master/licenses.txt
   /* Public */
   /* http://imakewebthings.com/waypoints/api/context-refresh */
   Context.prototype.refresh = function() {
-    var isWindow = this.element === this.element.window
+    /*eslint-disable eqeqeq */
+    var isWindow = this.element == this.element.window
+    /*eslint-enable eqeqeq */
     var contextOffset = this.adapter.offset()
     var triggeredGroups = {}
     var axes

diff --git a/lib/noframework.waypoints.min.js b/lib/noframework.waypoints.min.js
diff --git a/lib/shortcuts/infinite.js b/lib/shortcuts/infinite.js
@@ -1,5 +1,5 @@
 /*!
-Waypoints Infinite Scroll Shortcut - 3.1.0
+Waypoints Infinite Scroll Shortcut - 3.1.1
 Copyright © 2011-2015 Caleb Troughton
 Licensed under the MIT license.
 https://github.com/imakewebthings/waypoints/blog/master/licenses.txt

diff --git a/lib/shortcuts/infinite.min.js b/lib/shortcuts/infinite.min.js
diff --git a/lib/shortcuts/inview.js b/lib/shortcuts/inview.js
@@ -1,5 +1,5 @@
 /*!
-Waypoints Inview Shortcut - 3.1.0
+Waypoints Inview Shortcut - 3.1.1
 Copyright © 2011-2015 Caleb Troughton
 Licensed under the MIT license.
 https://github.com/imakewebthings/waypoints/blog/master/licenses.txt

diff --git a/lib/shortcuts/inview.min.js b/lib/shortcuts/inview.min.js
diff --git a/lib/shortcuts/sticky.js b/lib/shortcuts/sticky.js
@@ -1,5 +1,5 @@
 /*!
-Waypoints Sticky Element Shortcut - 3.1.0
+Waypoints Sticky Element Shortcut - 3.1.1
 Copyright © 2011-2015 Caleb Troughton
 Licensed under the MIT license.
 https://github.com/imakewebthings/waypoints/blog/master/licenses.txt

diff --git a/lib/shortcuts/sticky.min.js b/lib/shortcuts/sticky.min.js
diff --git a/lib/waypoints.debug.js b/lib/waypoints.debug.js
@@ -1,5 +1,5 @@
 /*!
-Waypoints Debug - 3.1.0
+Waypoints Debug - 3.1.1
 Copyright © 2011-2015 Caleb Troughton
 Licensed under the MIT license.
 https://github.com/imakewebthings/waypoints/blog/master/licenses.txt

diff --git a/lib/zepto.waypoints.js b/lib/zepto.waypoints.js
@@ -1,5 +1,5 @@
 /*!
-Waypoints - 3.1.0
+Waypoints - 3.1.1
 Copyright © 2011-2015 Caleb Troughton
 Licensed under the MIT license.
 https://github.com/imakewebthings/waypoints/blog/master/licenses.txt
@@ -304,9 +304,11 @@ https://github.com/imakewebthings/waypoints/blog/master/licenses.txt
 
   /* Private */
   Context.prototype.innerHeight = function() {
-    if (this.element === this.element.window) {
+    /*eslint-disable eqeqeq */
+    if (this.element == this.element.window) {
       return Waypoint.viewportHeight()
     }
+    /*eslint-enable eqeqeq */
     return this.adapter.innerHeight()
   }
 
@@ -318,9 +320,11 @@ https://github.com/imakewebthings/waypoints/blog/master/licenses.txt
 
   /* Private */
   Context.prototype.innerWidth = function() {
-    if (this.element === this.element.window) {
+    /*eslint-disable eqeqeq */
+    if (this.element == this.element.window) {
       return Waypoint.viewportWidth()
     }
+    /*eslint-enable eqeqeq */
     return this.adapter.innerWidth()
   }
 
@@ -341,7 +345,9 @@ https://github.com/imakewebthings/waypoints/blog/master/licenses.txt
   /* Public */
   /* http://imakewebthings.com/waypoints/api/context-refresh */
   Context.prototype.refresh = function() {
-    var isWindow = this.element === this.element.window
+    /*eslint-disable eqeqeq */
+    var isWindow = this.element == this.element.window
+    /*eslint-enable eqeqeq */
     var contextOffset = this.adapter.offset()
     var triggeredGroups = {}
     var axes

diff --git a/lib/zepto.waypoints.min.js b/lib/zepto.waypoints.min.js
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
-  "name": "jquery-waypoints",
-  "version": "3.1.0",
+  "name": "waypoints",
+  "version": "3.1.1",
   "author": "Caleb Troughton <[email protected]> (http://imakewebthings.com)",
-  "description": "A jQuery plugin that makes it easy to execute a function whenever you scroll to an element.",
+  "description": "Easily execute a function when you scroll to an element",
   "scripts": {
     "build": "gulp build",
     "start": "gulp",
@@ -12,10 +12,9 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/imakewebthings/jquery-waypoints.git"
+    "url": "https://github.com/imakewebthings/waypoints.git"
   },
   "keywords": [
-    "jquery",
     "scroll"
   ],
   "devDependencies": {

diff --git a/src/context.js b/src/context.js
@@ -138,9 +138,11 @@
 
   /* Private */
   Context.prototype.innerHeight = function() {
+    /*eslint-disable eqeqeq */
     if (this.element == this.element.window) {
       return Waypoint.viewportHeight()
     }
+    /*eslint-enable eqeqeq */
     return this.adapter.innerHeight()
   }
 
@@ -152,9 +154,11 @@
 
   /* Private */
   Context.prototype.innerWidth = function() {
+    /*eslint-disable eqeqeq */
     if (this.element == this.element.window) {
       return Waypoint.viewportWidth()
     }
+    /*eslint-enable eqeqeq */
     return this.adapter.innerWidth()
   }
 
@@ -175,7 +179,9 @@
   /* Public */
   /* http://imakewebthings.com/waypoints/api/context-refresh */
   Context.prototype.refresh = function() {
+    /*eslint-disable eqeqeq */
     var isWindow = this.element == this.element.window
+    /*eslint-enable eqeqeq */
     var contextOffset = this.adapter.offset()
     var triggeredGroups = {}
     var axes