angular-ui-bootstrap - npm Package Compare versions

Comparing version 2.1.1 to 2.1.2

package.json

 {
   "author": "https://github.com/angular-ui/bootstrap/graphs/contributors",
   "name": "angular-ui-bootstrap",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "homepage": "http://angular-ui.github.io/bootstrap/",
@@ -6,0 +6,0 @@ "dependencies": {},

src/collapse/collapse.js

@@ -41,5 +41,5 @@ angular.module('ui.bootstrap.collapse', [])
           if (horizontal) {
-            return {width: ''};
+            return {width: element.scrollWidth + 'px'};
           }
-          return {height: ''};
+          return {height: element.scrollHeight + 'px'};
         }
@@ -46,0 +46,0 @@

src/datepicker/datepicker.js

@@ -129,3 +129,3 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootstrap.isClass'])
           $scope.$watch(function() { return $scope.datepickerOptions[key]; }, function(value) {
-            self[key] = $scope[key] = angular.isDefined(value) ? value : datepickerOptions[key];
+            self[key] = $scope[key] = angular.isDefined(value) ? value : $scope.datepickerOptions[key];
             if (key === 'minMode' && self.modes.indexOf($scope.datepickerOptions.datepickerMode) < self.modes.indexOf(self[key]) ||
@@ -132,0 +132,0 @@ key === 'maxMode' && self.modes.indexOf($scope.datepickerOptions.datepickerMode) > self.modes.indexOf(self[key])) {

src/modal/docs/demo.js

@@ -1,11 +0,10 @@
-angular.module('ui.bootstrap.demo').controller('ModalDemoCtrl', function ($scope, $uibModal, $log) {
+angular.module('ui.bootstrap.demo').controller('ModalDemoCtrl', function ($uibModal, $log) {
+  var $ctrl = this;
+  $ctrl.items = ['item1', 'item2', 'item3'];
 
-  $scope.items = ['item1', 'item2', 'item3'];
+  $ctrl.animationsEnabled = true;
 
-  $scope.animationsEnabled = true;
-
-  $scope.open = function (size) {
-
+  $ctrl.open = function (size) {
     var modalInstance = $uibModal.open({
-      animation: $scope.animationsEnabled,
+      animation: $ctrl.animationsEnabled,
       ariaLabelledBy: 'modal-title',
@@ -15,6 +14,7 @@ ariaDescribedBy: 'modal-body',
       controller: 'ModalInstanceCtrl',
+      controllerAs: '$ctrl',
       size: size,
       resolve: {
         items: function () {
-          return $scope.items;
+          return $ctrl.items;
         }
@@ -25,3 +25,3 @@ }
     modalInstance.result.then(function (selectedItem) {
-      $scope.selected = selectedItem;
+      $ctrl.selected = selectedItem;
     }, function () {
@@ -32,6 +32,23 @@ $log.info('Modal dismissed at: ' + new Date());
 
-  $scope.toggleAnimation = function () {
-    $scope.animationsEnabled = !$scope.animationsEnabled;
+  $ctrl.openComponentModal = function () {
+    var modalInstance = $uibModal.open({
+      animation: $ctrl.animationsEnabled,
+      component: 'modalComponent',
+      resolve: {
+        items: function () {
+          return $ctrl.items;
+        }
+      }
+    });
+
+    modalInstance.result.then(function (selectedItem) {
+      $ctrl.selected = selectedItem;
+    }, function () {
+      $log.info('modal-component dismissed at: ' + new Date());
+    });
   };
 
+  $ctrl.toggleAnimation = function () {
+    $ctrl.animationsEnabled = !$ctrl.animationsEnabled;
+  };
 });
@@ -42,16 +59,45 @@
 
-angular.module('ui.bootstrap.demo').controller('ModalInstanceCtrl', function ($scope, $uibModalInstance, items) {
-
-  $scope.items = items;
-  $scope.selected = {
-    item: $scope.items[0]
+angular.module('ui.bootstrap.demo').controller('ModalInstanceCtrl', function ($uibModalInstance, items) {
+  var $ctrl = this;
+  $ctrl.items = items;
+  $ctrl.selected = {
+    item: $ctrl.items[0]
   };
 
-  $scope.ok = function () {
-    $uibModalInstance.close($scope.selected.item);
+  $ctrl.ok = function () {
+    $uibModalInstance.close($ctrl.selected.item);
   };
 
-  $scope.cancel = function () {
+  $ctrl.cancel = function () {
     $uibModalInstance.dismiss('cancel');
   };
 });
+
+// Please note that the close and dismiss bindings are from $uibModalInstance.
+
+angular.module('ui.bootstrap.demo').component('modalComponent', {
+  templateUrl: 'myModalContent.html',
+  bindings: {
+    resolve: '<',
+    close: '&',
+    dismiss: '&'
+  },
+  controller: function () {
+    var $ctrl = this;
+
+    $ctrl.$onInit = function () {
+      $ctrl.items = $ctrl.resolve.items;
+      $ctrl.selected = {
+        item: $ctrl.items[0]
+      };
+    };
+
+    $ctrl.ok = function () {
+      $ctrl.close({$value: $ctrl.selected.item});
+    };
+
+    $ctrl.cancel = function () {
+      $ctrl.dismiss({$value: 'cancel'});
+    };
+  }
+});

src/modal/modal.js

@@ -515,4 +515,4 @@ angular.module('ui.bootstrap.modal', ['ui.bootstrap.stackedMap', 'ui.bootstrap.position'])
             'modal-instance': '$uibModalInstance',
-            close: 'close($value)',
-            dismiss: 'dismiss($value)'
+            close: '$close($value)',
+            dismiss: '$dismiss($value)'
           });
@@ -519,0 +519,0 @@ content = $compile(content)(modal.scope);

src/tooltip/docs/readme.md

@@ -121,1 +121,3 @@ A lightweight, extensible directive for fancy tooltip creation. The tooltip
 ```
+
+For Safari (potentially all versions up to 9), there is an issue with the hover CSS selector when using multiple elements grouped close to each other that are using the tooltip - it is possible for multiple elements to gain the hover state when mousing between the elements quickly and exiting the container at the right time. See [issue #5445](https://github.com/angular-ui/bootstrap/issues/5445) for more details.

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1817933

increased by0.59%

Number of package files

227

increased by0.44%

Lines of code

36249

increased by0.16%

Number of lines in readme file

188

increased by189.23%

No dependency changes