Make change from $modal/Instance to $uibModal/Instance

Author: jameskleeh

angular-confirm.js

@@ -1,19 +1,19 @@
 /*
  * angular-confirm
  * https://github.com/Schlogen/angular-confirm
- * @version v1.1.2 - 2015-09-26
+ * @version v1.2.0 - 2015-11-18
  * @license Apache
  */
 angular.module('angular-confirm', ['ui.bootstrap.modal'])
-  .controller('ConfirmModalController', function ($scope, $modalInstance, data) {
+  .controller('ConfirmModalController', function ($scope, $uibModalInstance, data) {
     $scope.data = angular.copy(data);
 
     $scope.ok = function () {
-      $modalInstance.close();
+      $uibModalInstance.close();
     };
 
     $scope.cancel = function () {
-      $modalInstance.dismiss('cancel');
+      $uibModalInstance.dismiss('cancel');
     };
 
   })
@@ -31,7 +31,7 @@ angular.module('angular-confirm', ['ui.bootstrap.modal'])
       cancel: 'Cancel'
     }
   })
-  .factory('$confirm', function ($modal, $confirmModalDefaults) {
+  .factory('$confirm', function ($uibModal, $confirmModalDefaults) {
     return function (data, settings) {
       var defaults = angular.copy($confirmModalDefaults);
       settings = angular.extend(defaults, (settings || {}));
@@ -48,7 +48,7 @@ angular.module('angular-confirm', ['ui.bootstrap.modal'])
         }
       };
 
-      return $modal.open(settings).result;
+      return $uibModal.open(settings).result;
     };
   })
   .directive('confirm', function ($confirm) {

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "angular-confirm-modal",
   "main": "angular-confirm.min.js",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "homepage": "https://github.com/Schlogen/angular-confirm",
   "authors": [
     "James Kleeh"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-confirm",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "Angular Confirm Modal",
   "main": "angular-confirm.min.js",
   "scripts": {
@@ -23,9 +23,9 @@
   },
   "homepage": "https://github.com/Schlogen/angular-confirm",
   "devDependencies": {
-    "angular": "1.4.2",
+    "angular": "1.4.7",
     "angular-ui-bootstrap": "0.14.3",
-    "angular-mocks": "^1.4.2",
+    "angular-mocks": "^1.4.7",
     "gulp": "3.9.0",
     "gulp-bump": "^1.0.0",
     "gulp-git": "^1.6.0",

test/unit/confirmSpec.js

@@ -1,16 +1,16 @@
 describe('angular-confirm', function() {
 
-    var $rootScope, $modal;
+    var $rootScope, $uibModal;
 
     beforeEach(angular.mock.module('angular-confirm', function ($provide) {
 
-        $provide.decorator('$modal', function($delegate) {
-            $modal = {
-                open: jasmine.createSpy('$modal.open', function(settings) {
+        $provide.decorator('$uibModal', function($delegate) {
+            $uibModal = {
+                open: jasmine.createSpy('$uibModal.open', function(settings) {
                     return {result: settings};
                 })
             };
-            return $modal;
+            return $uibModal;
         });
 
         $provide.decorator('$confirm', function($delegate) {
@@ -24,18 +24,18 @@ describe('angular-confirm', function() {
     }));
 
     describe('ConfirmModalController', function() {
-        var $scope, controller, data = {testVal: 1}, $modalInstance;
+        var $scope, controller, data = {testVal: 1}, $uibModalInstance;
 
         beforeEach(angular.mock.inject(function($controller) {
             $scope = $rootScope.$new();
-            $modalInstance = {
-                close: jasmine.createSpy('modalInstance.close'),
-                dismiss: jasmine.createSpy('modalInstance.dismiss'),
+            $uibModalInstance = {
+                close: jasmine.createSpy('$uibModalInstance.close'),
+                dismiss: jasmine.createSpy('$uibModalInstance.dismiss'),
                 result: {
-                    then: jasmine.createSpy('modalInstance.result.then')
+                    then: jasmine.createSpy('$uibModalInstance.result.then')
                 }
             };
-            controller = $controller('ConfirmModalController', {"$scope": $scope, "$modalInstance": $modalInstance, "data": data});
+            controller = $controller('ConfirmModalController', {"$scope": $scope, "$uibModalInstance": $uibModalInstance, "data": data});
         }));
 
         it("should copy the data, not use it as a reference", function() {
@@ -45,12 +45,12 @@ describe('angular-confirm', function() {
 
         it("should call close when $scope.ok is invoked", function() {
             $scope.ok();
-            expect($modalInstance.close).toHaveBeenCalled();
+            expect($uibModalInstance.close).toHaveBeenCalled();
         });
 
         it("should call dismiss when $scope.cancel is invoked", function() {
             $scope.cancel();
-            expect($modalInstance.dismiss).toHaveBeenCalledWith('cancel');
+            expect($uibModalInstance.dismiss).toHaveBeenCalledWith('cancel');
         });
 
     });
@@ -63,12 +63,12 @@ describe('angular-confirm', function() {
             $confirm = _$confirm_;
             $confirm.and.callThrough();
             $confirmModalDefaults = _$confirmModalDefaults_;
-            $modal.open.and.callThrough();
+            $uibModal.open.and.callThrough();
         }));
 
-        it("should call $modal.open", function() {
+        it("should call $uibModal.open", function() {
             $confirm();
-            expect($modal.open).toHaveBeenCalled();
+            expect($uibModal.open).toHaveBeenCalled();
         });
 
         it("should override the defaults with settings passed in", function() {