bastion 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c36c849cc73e8e3c99e0736660a4cc34a955d120
-  data.tar.gz: 6a71404931456f024ca9f15c704a14abab744171
+  metadata.gz: 52f906d47279b4f0208c48741f7b64b1fb137ffe
+  data.tar.gz: 0167998c6b06bbaf2feccccf30c0fdc771e87044
 SHA512:
-  metadata.gz: 204ddad00ba3dfb01cf32dbee9856f4f7d8be98f18ee3b2dea58241aa9805e9e92e96976ab461c88d9b24c0440b6dc10dbfcad386f9e2eba2c25dd364d438474
-  data.tar.gz: 31d4871ea9d01b82cfe2fec4d4650316ac9ce15def904090cc865ac7ef69a0be59f5a692f8c7e0f3fa89222f86328fba21e610871efd4b379872d3a596056898
+  metadata.gz: 6a5593efe6d9ae4e664e8bbc8e93c0b8b2be96fdc914d4eb0d06a621b4b8a66d0c4ee192cbe46d93b461843a8e017bf5e78cba08fb78e228d2f3d8c99567db30
+  data.tar.gz: 7f56299785fee09f780cdf78d72cf341868857fdac3a320a0d94252d3eaa44f0cbcec34ca75a799eb02e146e72e9ff7edb12df4a88a0b0bf85cb0dc61d609150

data/app/assets/javascripts/bastion/bastion-bootstrap.js

@@ -6,6 +6,7 @@ BASTION_MODULES = [
     'angular-blocks',
     'ngAnimate',
     'ngSanitize',
+    'infinite-scroll',
     'templates',
     'ui.bootstrap',
     'ui.bootstrap.tpls',

data/app/assets/javascripts/bastion/bastion.js

@@ -6,6 +6,7 @@
 //= require "bastion/angular-ui-router/angular-ui-router"
 //= require "bastion/angular-uuid4/angular-uuid4.js"
 //= require "bastion/ngUpload/ng-upload"
+//= require "bastion/ngInfiniteScroll/ng-infinite-scroll.js"
 //= require "bastion/angular-gettext/angular-gettext"
 //= require "bastion/angular-blocks/angular-blocks"
 //= require_tree "../../../../vendor/assets/javascripts/bastion/angular-bootstrap"

data/app/assets/javascripts/bastion/layouts/details-nutupane.html

@@ -50,14 +50,13 @@
     </div>
   </div>
 
-  <div class="nutupane" bst-table="detailsTable" nutupane-table>
+  <div class="nutupane nutupane-details-table" bst-table="detailsTable" nutupane-table>
     <div class="loading-mask loading-mask-collapsed" ng-show="detailsTable.refreshing">
       <i class="fa fa-spinner fa-spin"></i>
       <span ng-hide="$root.$state.current.collapsed">{{ "Loading..." | translate }}</span>
     </div>
 
-    <div bst-container-scroll bst-infinite-scroll="detailsTable.nextPage()"
-         data="detailsTable.rows" skip-initial-load="!detailsTable.initialLoad">
+    <div bst-container-scroll data="detailsTable.rows">
 
       <div class="nutupane-select-all" ng-show="detailsTable.selectAllResultsEnabled && detailsTable.allSelected() && !detailsTable.allResultsSelected">
         <span translate>All {{ detailsTable.rows.length }} items on this page are selected.</span>
@@ -73,7 +72,9 @@
         <span data-block="no-rows-message"></span>
       </p>
 
-      <div ng-show="detailsTable.rows.length > 0" data-block="table"></div>
+      <div infinite-scroll="detailsTable.nextPage()" infinite-scroll-container="'.nutupane-details-table .container-scroll-wrapper'">
+        <div ng-show="detailsTable.rows.length > 0" data-block="table"></div>
+      </div>
     </div>
   </div>
 

data/app/assets/javascripts/bastion/layouts/nutupane.html

@@ -61,8 +61,8 @@
       <span data-block="no-rows-message"></span>
     </p>
 
-    <div ng-show="table.rows.length > 0" bst-container-scroll bst-infinite-scroll="table.nextPage()" data="table.rows">
-      <div ui-view="table"></div>
+    <div ng-show="table.rows.length > 0" bst-container-scroll data="table.rows">
+      <div infinite-scroll="table.nextPage()" infinite-scroll-container="'.container-scroll-wrapper'" ui-view="table"></div>
     </div>
   </div>
 

data/bower.json

@@ -16,6 +16,7 @@
     "angular-blocks": "~>0.1.8",
     "angular-i18n": "1.3.13",
     "underscore": "=1.5.2",
+    "ngInfiniteScroll": "1.2.0",
     "ngUpload": "~0.5.5",
     "bootstrap": "~3.1.1",
     "font-awesome": "4.2.0",
@@ -81,6 +82,9 @@
     "ngUpload": {
       "javascripts/bastion/ngUpload": "ng-upload.js"
     },
+    "ngInfiniteScroll": {
+      "javascripts/bastion/ngInfiniteScroll": "build/ng-infinite-scroll.js"
+    },
     "bootstrap": {
       "stylesheets/bastion/bootstrap/less": "less/*.less",
       "fonts/bastion/bootstrap": "dist/fonts/*"

data/grunt/karma.js

@@ -28,6 +28,7 @@ module.exports = {
             basePath + 'vendor/assets/javascripts/bastion/angular-ui-router/angular-ui-router.js',
             basePath + 'vendor/assets/javascripts/bastion/angular-gettext/angular-gettext.js',
             basePath + 'vendor/assets/javascripts/bastion/ngUpload/ng-upload.js',
+            basePath + 'vendor/assets/javascripts/bastion/ngInfiniteScroll/ng-infinite-scroll.js',
             basePath + '.tmp/bower_components/angular-mocks/angular-mocks.js',
 
             basePath + 'app/assets/javascripts/bastion/bastion-bootstrap.js',

data/lib/bastion/version.rb

@@ -1,3 +1,3 @@
 module Bastion
-  VERSION = "1.0.2"
+  VERSION = "2.0.0"
 end

data/vendor/assets/javascripts/bastion/ngInfiniteScroll/ng-infinite-scroll.js

@@ -0,0 +1,177 @@
+/* ng-infinite-scroll - v1.2.0 - 2014-12-02 */
+var mod;
+
+mod = angular.module('infinite-scroll', []);
+
+mod.value('THROTTLE_MILLISECONDS', null);
+
+mod.directive('infiniteScroll', [
+  '$rootScope', '$window', '$interval', 'THROTTLE_MILLISECONDS', function($rootScope, $window, $interval, THROTTLE_MILLISECONDS) {
+    return {
+      scope: {
+        infiniteScroll: '&',
+        infiniteScrollContainer: '=',
+        infiniteScrollDistance: '=',
+        infiniteScrollDisabled: '=',
+        infiniteScrollUseDocumentBottom: '='
+      },
+      link: function(scope, elem, attrs) {
+        var changeContainer, checkWhenEnabled, container, handleInfiniteScrollContainer, handleInfiniteScrollDisabled, handleInfiniteScrollDistance, handleInfiniteScrollUseDocumentBottom, handler, height, immediateCheck, offsetTop, pageYOffset, scrollDistance, scrollEnabled, throttle, useDocumentBottom, windowElement;
+        windowElement = angular.element($window);
+        scrollDistance = null;
+        scrollEnabled = null;
+        checkWhenEnabled = null;
+        container = null;
+        immediateCheck = true;
+        useDocumentBottom = false;
+        height = function(elem) {
+          elem = elem[0] || elem;
+          if (isNaN(elem.offsetHeight)) {
+            return elem.document.documentElement.clientHeight;
+          } else {
+            return elem.offsetHeight;
+          }
+        };
+        offsetTop = function(elem) {
+          if (!elem[0].getBoundingClientRect || elem.css('none')) {
+            return;
+          }
+          return elem[0].getBoundingClientRect().top + pageYOffset(elem);
+        };
+        pageYOffset = function(elem) {
+          elem = elem[0] || elem;
+          if (isNaN(window.pageYOffset)) {
+            return elem.document.documentElement.scrollTop;
+          } else {
+            return elem.ownerDocument.defaultView.pageYOffset;
+          }
+        };
+        handler = function() {
+          var containerBottom, containerTopOffset, elementBottom, remaining, shouldScroll;
+          if (container === windowElement) {
+            containerBottom = height(container) + pageYOffset(container[0].document.documentElement);
+            elementBottom = offsetTop(elem) + height(elem);
+          } else {
+            containerBottom = height(container);
+            containerTopOffset = 0;
+            if (offsetTop(container) !== void 0) {
+              containerTopOffset = offsetTop(container);
+            }
+            elementBottom = offsetTop(elem) - containerTopOffset + height(elem);
+          }
+          if (useDocumentBottom) {
+            elementBottom = height((elem[0].ownerDocument || elem[0].document).documentElement);
+          }
+          remaining = elementBottom - containerBottom;
+          shouldScroll = remaining <= height(container) * scrollDistance + 1;
+          if (shouldScroll) {
+            checkWhenEnabled = true;
+            if (scrollEnabled) {
+              if (scope.$$phase || $rootScope.$$phase) {
+                return scope.infiniteScroll();
+              } else {
+                return scope.$apply(scope.infiniteScroll);
+              }
+            }
+          } else {
+            return checkWhenEnabled = false;
+          }
+        };
+        throttle = function(func, wait) {
+          var later, previous, timeout;
+          timeout = null;
+          previous = 0;
+          later = function() {
+            var context;
+            previous = new Date().getTime();
+            $interval.cancel(timeout);
+            timeout = null;
+            func.call();
+            return context = null;
+          };
+          return function() {
+            var now, remaining;
+            now = new Date().getTime();
+            remaining = wait - (now - previous);
+            if (remaining <= 0) {
+              clearTimeout(timeout);
+              $interval.cancel(timeout);
+              timeout = null;
+              previous = now;
+              return func.call();
+            } else {
+              if (!timeout) {
+                return timeout = $interval(later, remaining, 1);
+              }
+            }
+          };
+        };
+        if (THROTTLE_MILLISECONDS != null) {
+          handler = throttle(handler, THROTTLE_MILLISECONDS);
+        }
+        scope.$on('$destroy', function() {
+          return container.unbind('scroll', handler);
+        });
+        handleInfiniteScrollDistance = function(v) {
+          return scrollDistance = parseFloat(v) || 0;
+        };
+        scope.$watch('infiniteScrollDistance', handleInfiniteScrollDistance);
+        handleInfiniteScrollDistance(scope.infiniteScrollDistance);
+        handleInfiniteScrollDisabled = function(v) {
+          scrollEnabled = !v;
+          if (scrollEnabled && checkWhenEnabled) {
+            checkWhenEnabled = false;
+            return handler();
+          }
+        };
+        scope.$watch('infiniteScrollDisabled', handleInfiniteScrollDisabled);
+        handleInfiniteScrollDisabled(scope.infiniteScrollDisabled);
+        handleInfiniteScrollUseDocumentBottom = function(v) {
+          return useDocumentBottom = v;
+        };
+        scope.$watch('infiniteScrollUseDocumentBottom', handleInfiniteScrollUseDocumentBottom);
+        handleInfiniteScrollUseDocumentBottom(scope.infiniteScrollUseDocumentBottom);
+        changeContainer = function(newContainer) {
+          if (container != null) {
+            container.unbind('scroll', handler);
+          }
+          container = newContainer;
+          if (newContainer != null) {
+            return container.bind('scroll', handler);
+          }
+        };
+        changeContainer(windowElement);
+        handleInfiniteScrollContainer = function(newContainer) {
+          if ((newContainer == null) || newContainer.length === 0) {
+            return;
+          }
+          if (newContainer instanceof HTMLElement) {
+            newContainer = angular.element(newContainer);
+          } else if (typeof newContainer.append === 'function') {
+            newContainer = angular.element(newContainer[newContainer.length - 1]);
+          } else if (typeof newContainer === 'string') {
+            newContainer = angular.element(document.querySelector(newContainer));
+          }
+          if (newContainer != null) {
+            return changeContainer(newContainer);
+          } else {
+            throw new Exception("invalid infinite-scroll-container attribute.");
+          }
+        };
+        scope.$watch('infiniteScrollContainer', handleInfiniteScrollContainer);
+        handleInfiniteScrollContainer(scope.infiniteScrollContainer || []);
+        if (attrs.infiniteScrollParent != null) {
+          changeContainer(angular.element(elem.parent()));
+        }
+        if (attrs.infiniteScrollImmediateCheck != null) {
+          immediateCheck = scope.$eval(attrs.infiniteScrollImmediateCheck);
+        }
+        return $interval((function() {
+          if (immediateCheck) {
+            return handler();
+          }
+        }), 0, 1);
+      }
+    };
+  }
+]);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bastion
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Eric D Helms
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: angular-rails-templates
@@ -81,7 +81,6 @@ files:
 - app/assets/javascripts/bastion/components/bst-flyout.directive.js
 - app/assets/javascripts/bastion/components/bst-form-buttons.directive.js
 - app/assets/javascripts/bastion/components/bst-form-group.directive.js
-- app/assets/javascripts/bastion/components/bst-infinite-scroll.directive.js
 - app/assets/javascripts/bastion/components/bst-menu.directive.js
 - app/assets/javascripts/bastion/components/bst-modal.directive.js
 - app/assets/javascripts/bastion/components/bst-on-enter.directive.js
@@ -183,7 +182,6 @@ files:
 - test/components/bst-flyout.directive.test.js
 - test/components/bst-form-buttons.directive.test.js
 - test/components/bst-form-group.directive.test.js
-- test/components/bst-infinite-scroll.directive.test.js
 - test/components/bst-menu.directive.test.js
 - test/components/bst-modal.directive.test.js
 - test/components/bst-nutupane-table.directive.test.js
@@ -1020,6 +1018,7 @@ files:
 - vendor/assets/javascripts/bastion/angular/angular.js
 - vendor/assets/javascripts/bastion/es5-shim/es5-shim.js
 - vendor/assets/javascripts/bastion/json3/json3.js
+- vendor/assets/javascripts/bastion/ngInfiniteScroll/ng-infinite-scroll.js
 - vendor/assets/javascripts/bastion/ngUpload/ng-upload.js
 - vendor/assets/javascripts/bastion/underscore/underscore.js
 - vendor/assets/stylesheets/bastion/bootstrap/alerts.less
@@ -1156,7 +1155,6 @@ test_files:
 - test/menu/menu-expander.service.test.js
 - test/components/page-title.directive.test.js
 - test/components/bst-table.directive.test.js
-- test/components/bst-infinite-scroll.directive.test.js
 - test/components/bst-container-scroll.directive.test.js
 - test/components/bst-modal.directive.test.js
 - test/components/bst-alert.directive.test.js

data/app/assets/javascripts/bastion/components/bst-infinite-scroll.directive.js

@@ -1,76 +0,0 @@
-/**
- * @ngdoc directive
- * @name Bastion.components.directive:bstInfiniteScroll
- *
- * @description
- *   The infinite scroll directive should be applied to a wrapping div around another element
- *   and provides automatic loading when a user scrolls to the bottom of the element.
- *
- *   Note that the element using the bst-infinite-scroll directive should have it's overflow
- *   set properly.
- *
- * @requires $window
- *
- * @example
- *   <pre>
- *     <div bst-infinite-scroll="loadMore()" style="height: 100px; overflow-y: auto;">
- *       <p style="height: 1000px;">Hello</p>
- *     </div>
- *   </pre>
- */
-angular.module('Bastion.components').directive('bstInfiniteScroll', ['$window', function ($window) {
-    return {
-        scope: {
-            data: '=',
-            loadMoreFunction: '&bstInfiniteScroll',
-            skipInitialLoad: '='
-        },
-        controller: function ($scope, $element) {
-            var result, getScrollHeight, isPromise, loadUntilScroll,
-                raw = $element[0];
-
-            $element.bind('scroll', function () {
-                var sliderPosition = raw.scrollTop + raw.offsetHeight;
-                if (sliderPosition > 0 && sliderPosition >= raw.scrollHeight - 1) {
-                    $scope.loadMoreFunction();
-                }
-            });
-
-            getScrollHeight = function () {
-                var scrollHeight = 0;
-                $element.children().each(function () {
-                    scrollHeight = scrollHeight + angular.element(this).get(0).scrollHeight;
-                });
-                return scrollHeight;
-            };
-
-            isPromise = function (promise) {
-                return promise && promise.hasOwnProperty('then');
-            };
-
-            loadUntilScroll = function () {
-                var loadResult;
-
-                if (getScrollHeight() < $element.height()) {
-                    loadResult = $scope.loadMoreFunction();
-                    if (isPromise(loadResult)) {
-                        loadResult.then(function () {
-                            if (getScrollHeight() < $element.height()) {
-                                loadUntilScroll();
-                            }
-                        });
-                    }
-                }
-            };
-
-            angular.element($window).bind('resize', loadUntilScroll);
-
-            if (!$scope.skipInitialLoad && (angular.isUndefined($scope.data) || $scope.data.length === 0)) {
-                result = $scope.loadMoreFunction();
-                if (isPromise(result)) {
-                    result.then(loadUntilScroll);
-                }
-            }
-        }
-    };
-}]);

data/test/components/bst-infinite-scroll.directive.test.js

@@ -1,127 +0,0 @@
-describe('Directive: bstInfiniteScroll', function () {
-    var $scope, $compile, $q, element;
-
-    beforeEach(module('Bastion.components'));
-
-    beforeEach(inject(function ($rootScope, _$compile_, _$q_){
-        $scope = $rootScope;
-        $compile = _$compile_;
-        $q = _$q_;
-
-        $scope.scrollHandler = {
-            doIt: function() {
-                var deferred = $q.defer();
-                element.append('<p style="height: 10px;"></p>');
-                deferred.resolve({});
-                return deferred.promise;
-            }
-        };
-        $scope.data = [];
-        element = angular.element('<div data="data" bst-infinite-scroll="scrollHandler.doIt()" style="height: 100px; position: absolute; overflow-y: auto;"></div>');
-        $('body').append(element);
-    }));
-
-    describe("loads more results if scrolling near the bottom", function() {
-        beforeEach(function() {
-            $compile(element)($scope);
-            $scope.$digest();
-        });
-
-        it("calls the provided scroll function when scrolling near the bottom.", function() {
-            spyOn($scope.scrollHandler, "doIt");
-
-            // 95% of the height of the scroll area
-            element.scrollTop(element[0].scrollHeight *.95);
-            element.trigger('scroll');
-
-            expect($scope.scrollHandler.doIt).toHaveBeenCalled();
-        });
-
-        it("does not calls the provided scroll function when not scrolling near the bottom.", function() {
-            spyOn($scope.scrollHandler, "doIt");
-
-            // 10% of the height of the scroll area
-            element.scrollTop(element[0].scrollHeight *.10);
-            element.trigger('scroll');
-
-            expect($scope.scrollHandler.doIt).not.toHaveBeenCalled();
-        });
-    });
-
-    describe("loads more results if there is not a scrollbar", function() {
-        it("on initial load.", function() {
-            spyOn($scope.scrollHandler, "doIt").andCallThrough();
-            $compile(element)($scope);
-            $scope.$digest();
-            expect($scope.scrollHandler.doIt.callCount).toBe(10);
-        });
-    });
-
-    describe("does not load more results if there is already a scrollbar", function() {
-        beforeEach(function() {
-            $compile(element)($scope);
-            $scope.$digest();
-        });
-
-        it("on initial load.", function() {
-            spyOn($scope.scrollHandler, "doIt").andCallThrough();
-            $scope.$digest();
-            expect($scope.scrollHandler.doIt.callCount).toBe(0);
-        });
-    });
-
-    describe("loads more results based on the height of the elements", function() {
-        beforeEach(function() {
-            element.empty();
-            element.append('<p style="height: 10px;"></p>');
-        });
-
-        it("loads more results if the scroll height is less than element height.", function() {
-            spyOn($scope.scrollHandler, "doIt").andCallThrough();
-            element.height("11px");
-
-            $compile(element)($scope);
-            $scope.$digest();
-            $scope.$digest();
-
-
-            expect($scope.scrollHandler.doIt.callCount).toBe(1);
-        });
-
-        it("does not load more results if the scroll height is equal to the element height.", function() {
-            element.height("10px");
-
-            $compile(element)($scope);
-
-            spyOn($scope.scrollHandler, "doIt");
-            $scope.$digest();
-
-            expect($scope.scrollHandler.doIt.callCount).toBe(0);
-        });
-
-        it("does not load more results if the scroll height is greater than the element height.", function() {
-            element.height("9px");
-            element.append('<p style="height: 10px;"></p>');
-            $compile(element)($scope);
-
-            spyOn($scope.scrollHandler, "doIt");
-            $scope.$digest();
-
-            expect($scope.scrollHandler.doIt.callCount).toBe(0);
-        });
-
-        it("on resize", function() {
-            element.height("11px");
-            $compile(element)($scope);
-            $scope.$digest();
-            spyOn($scope.scrollHandler, "doIt").andCallThrough();
-
-            element.height("21px");
-            $(window).trigger('resize');
-            $scope.$digest();
-
-
-            expect($scope.scrollHandler.doIt.callCount).toBe(1);
-        });
-    });
-});