Fixed callback from being executed when disabled was defined and is true, and promise is null.

Author: srph

README.md

@@ -306,6 +306,8 @@ This was copy-pasted from [```ReactJS```'s contribution style guide](https://git
 
 ## Changelogs
 
+- Fixed callback from being executed when ```disabled``` was defined and is true, and promise is null.
+
 #### v0.1.4
 
 - Fixed conditions on cancelling the callback from being called (technically fixes horizontal scrolling from triggering the callback).

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-srph-infinite-scroll",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "homepage": "https://github.com/srph/angular-infinite-scroll",
   "authors": [
     "srph <seraphipod@gmail.com>"

dist/angular-srph-infinite-scroll.js

@@ -62,7 +62,8 @@
         // Halt the execution if the disabled flag is set and true
         // or if the execution is still running
         var disabled = scope.disabled;
-        if ( ( promise !== null && (!angular.isUndefined(disabled) && !!disabled) )
+        if ( (!angular.isUndefined(disabled) && !!disabled)
+          || promise !== null
           || _last_scroll == scroll) {
           return;
         }

dist/angular-srph-infinite-scroll.min.js

@@ -62,7 +62,8 @@
         // Halt the execution if the disabled flag is set and true
         // or if the execution is still running
         var disabled = scope.disabled;
-        if ( ( promise !== null && (!angular.isUndefined(disabled) && !!disabled) )
+        if ( (!angular.isUndefined(disabled) && !!disabled)
+          || promise !== null
           || _last_scroll == scroll) {
           return;
         }