bastion 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39736e486baa7a52fa022a34eac73d2b89663f37
-  data.tar.gz: 76967c212d01faba0a4a720ea7031b22edb04ff0
+  metadata.gz: cb88de97c9f4c944ef8dc4bdaa2658887a649946
+  data.tar.gz: eb1a8a31b204a4841e605eba9c887882b5436074
 SHA512:
-  metadata.gz: cd66d25b82f12bceb3fd6ccddf92de267399a958a7029f4b0325e24161bbe828a5816af5cd01e3e3d47ce31b9b715c4caa8bf0c719fc9e84d2de2e16832278e3
-  data.tar.gz: c488be0bbd988b1706af2f15b27a2cba0bbe885eb6afe34179b283aebdaf0d49e4ab6f1588023cefebce30b27bef67a18b166254fb79a5af92f464b6aa1b3d15
+  metadata.gz: 060854ddc47304d5814abe27b1c09e8f6fafba5c03833e44084ce94c8d7e4f7aa034c11ea6e55ce6751c6d6ab4b1808c4ac3e668edde9ae176885f55ac630be4
+  data.tar.gz: 27bd7e7c4f50cacb71b4f3ef0a16f49b15cad9ead497aa475736727abc615fc425b50a3859ba6c09c3a3c5071c5c2f5ad32365c8d61b0d17a0a7ca0d1db18ff8

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

@@ -58,8 +58,16 @@ angular.module('Bastion').config(
         });
 
         $urlRouterProvider.otherwise(function ($injector, $location) {
-            var $window = $injector.get('$window');
-            $window.location.href = $location.absUrl().replace(oldBrowserBastionPath, '');
+            var $window = $injector.get('$window'),
+                url = $location.absUrl();
+
+            // ensure we don't double encode +s
+            url = url.replace(/%2B/g, "+");
+
+            // Remove the old browser path if present
+            url = url.replace(oldBrowserBastionPath, '');
+
+            $window.location.href = url;
         });
 
         $locationProvider.html5Mode(true);

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

@@ -2,6 +2,9 @@
  * @ngdoc directive
  * @name Bastion.components.directive:bstAlert
  *
+ * @requires $animate
+ * @requires $timeout
+ *
  * @description
  *   Simple directive for encapsulating an alert display.
  *
@@ -10,7 +13,9 @@
  *     <div bst-alert="success"></div>
  *   </pre>
  */
-angular.module('Bastion.components').directive('bstAlert', function () {
+angular.module('Bastion.components').directive('bstAlert', ['$animate', '$timeout', function ($animate, $timeout) {
+    var SUCCESS_FADEOUT = 3000;
+
     return {
         templateUrl: 'components/views/bst-alert.html',
         transclude: true,
@@ -18,8 +23,15 @@ angular.module('Bastion.components').directive('bstAlert', function () {
             type: '@bstAlert',
             close: '&'
         },
-        controller: ['$scope', '$attrs', function ($scope, $attrs) {
-            $scope.closeable = 'close' in $attrs;
-        }]
+        link: function (scope, element, attrs) {
+            scope.closeable = 'close' in attrs;
+
+            // Fade out success alerts after five seconds
+            if (scope.type === 'success') {
+                $timeout(function () {
+                    $animate.leave(element.find('.alert'), scope.close);
+                }, SUCCESS_FADEOUT);
+            }
+        }
     };
-});
+}]);

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

@@ -24,7 +24,7 @@ angular.module('Bastion.components').directive('bstContainerScroll', ['$window',
             return function (scope, element) {
                 var windowElement = angular.element($window),
                     bottomPadding = parseInt(element.css('padding-bottom').replace('px', ''), 10),
-                    addScroll;
+                    newElementHeight, addScroll;
 
                 addScroll = function () {
                     var windowHeight = windowElement.height(),
@@ -34,8 +34,14 @@ angular.module('Bastion.components').directive('bstContainerScroll', ['$window',
                         offset = offset + bottomPadding;
                     }
 
-                    element.outerHeight(windowHeight - offset);
-                    element.height(windowHeight - offset);
+                    newElementHeight = windowHeight - offset;
+
+                    if (newElementHeight <= 100) {
+                        newElementHeight = 300;
+                    }
+
+                    element.outerHeight(newElementHeight);
+                    element.height(newElementHeight);
                 };
 
                 windowElement.bind('resize', addScroll);

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

@@ -44,7 +44,10 @@ angular.module('Bastion.components')
 
         this.selection = {allSelected: false, selectAllDisabled: false};
 
-        $scope.table.numSelected = 0;
+        if (!$scope.table.numSelected) {
+            $scope.table.numSelected = 0;
+        }
+
         $scope.table.chosenRow = null;
 
         $scope.table.getSelected = function () {

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

@@ -9,6 +9,6 @@
      *   Cross application re-usable components
      */
     angular
-        .module('Bastion.components', []);
+        .module('Bastion.components', ['ngAnimate']);
 
 })();

data/app/assets/javascripts/bastion/components/nutupane.factory.js

@@ -346,9 +346,10 @@ angular.module('Bastion.components').factory('Nutupane',
                 if (!column) {
                     return;
                 }
-
-                params["sort_by"] = column.id;
-                if (column.id === sort.by) {
+                if (column.id) {
+                    params["sort_by"] = column.id;
+                }
+                if (column.id === sort.by || column.id) {
                     params["sort_order"] = (sort.order === 'ASC') ? 'DESC' : 'ASC';
                 } else {
                     params["sort_order"] = 'ASC';

data/app/assets/stylesheets/bastion/animations.scss

@@ -13,3 +13,13 @@
   opacity:0;
   padding:0 10px;
 }
+
+.alert.ng-leave {
+  -webkit-transition: all linear 1s;
+  transition: all linear 1s;
+  opacity: 1;
+}
+
+.alert.ng-leave.ng-leave-active {
+  opacity: 0;
+}

data/app/assets/stylesheets/bastion/nutupane.scss

@@ -64,6 +64,10 @@ td.row-select {
       a {
         color: #FFF;
       }
+
+      .bst-edit:hover {
+        color: #000;
+      }
     }
 
     th.sortable {

data/app/assets/stylesheets/bastion/overrides.scss

@@ -55,3 +55,7 @@ ul {
     padding-left: 15px;
   }
 }
+
+.row {
+  margin-right: -7px;
+}

data/lib/bastion/version.rb

@@ -1,3 +1,3 @@
 module Bastion
-  VERSION = "3.2.1"
+  VERSION = "3.2.2"
 end

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

@@ -38,6 +38,17 @@ describe('Directive: bstContainerScroll', function() {
         expect(tableElement.height()).toEqual(windowElement.height() - tableElement.offset().top);
     });
 
+    it("should ensure that the element is at least 200px", function () {
+        windowElement.height('200px');
+        tableElement.css('padding-bottom', '200px');
+
+        compile(tableElement)(scope);
+        scope.$digest();
+
+        windowElement.trigger('resize');
+        expect(tableElement.height()).toEqual(300);
+    });
+
     it("should add the nutupane details padding if it exists", function () {
         tableElement.css('padding-bottom', '10px');
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bastion
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Eric D Helms
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: angular-rails-templates