Merge pull request #68 from ClearPoint-Strategy/master

Add support for custom bootstrap button classes

Author: jameskleeh

angular-confirm.js

@@ -42,7 +42,8 @@ angular.module('angular-confirm', ['ui.bootstrap.modal'])
       title: 'Confirm',
       ok: 'OK',
       cancel: 'Cancel'
-    }
+    },
+    additionalTemplates: {}
   })
   .factory('$confirm', ["$uibModal", "$confirmModalDefaults", function ($uibModal, $confirmModalDefaults) {
     return function (data, settings) {
@@ -51,6 +52,14 @@ angular.module('angular-confirm', ['ui.bootstrap.modal'])
 
       data = angular.extend({}, settings.defaultLabels, data || {});
 
+      if(data.templateName){
+        var customTemplateDefinition = settings.additionalTemplates[data.templateName];
+        if(customTemplateDefinition != undefined) {
+          settings.template = customTemplateDefinition.template;
+          settings.templateUrl = customTemplateDefinition.templateUrl;
+        }
+      }
+
       if ('templateUrl' in settings && 'template' in settings) {
         delete settings.template;
       }
@@ -73,6 +82,7 @@ angular.module('angular-confirm', ['ui.bootstrap.modal'])
         ngClick: '&',
         confirm: '@',
         confirmSettings: "=",
+        confirmTemplateName: "@",
         confirmTitle: '@',
         confirmOk: '@',
         confirmCancel: '@'
@@ -110,6 +120,9 @@ angular.module('angular-confirm', ['ui.bootstrap.modal'])
               if (scope.confirmCancel) {
                 data.cancel = scope.confirmCancel;
               }
+              if (scope.confirmTemplateName){
+                data.templateName = scope.confirmTemplateName;
+              }
               $confirm(data, scope.confirmSettings || {}).then(onSuccess);
             } else {
               scope.$apply(onSuccess);

angular-confirm.min.js

@@ -96,6 +96,31 @@ describe('angular-confirm', function() {
             expect(settings.template).not.toBeDefined();
         });
 
+        it("should use default template", function(){
+            var settings = $confirm({}, {});
+            expect(settings.templateUrl).toEqual($confirmModalDefaults.templateUrl)
+        });
+
+        it("should use override template", function(){
+            var settings = $confirm({}, {templateUrl: 'something'});
+            expect(settings.templateUrl).not.toEqual($confirmModalDefaults.templateUrl)
+            expect(settings.templateUrl).toEqual('something');
+        });
+
+        it("should use custom template if found", function(){
+            $confirmModalDefaults.additionalTemplates.danger = {templateUrl: "something"}
+            var settings = $confirm({templateName: 'random'}, {});
+            expect(settings.templateUrl).toEqual($confirmModalDefaults.templateUrl);
+
+            settings = $confirm({templateName: 'danger'}, {});
+            expect(settings.templateUrl).not.toEqual($confirmModalDefaults.templateUrl);
+            expect(settings.templateUrl).toEqual('something');
+
+            settings = $confirm({templateName: 'danger'}, {templateUrl: 'thiswillbeignored'});
+            expect(settings.templateUrl).not.toEqual($confirmModalDefaults.templateUrl);
+            expect(settings.templateUrl).toEqual('something');
+        })
+
     });
 
     describe('confirm directive', function() {
@@ -249,6 +274,20 @@ describe('angular-confirm', function() {
             });
         });
 
+        describe('with confirmTemplateName option', function() {
+            beforeEach(angular.mock.inject(function($compile) {
+                element = angular.element('<button type="button" ng-click="click()" confirm="Are you sure?" confirm-template-name="danger">Delete</button>');
+                $compile(element)($scope);
+                $scope.$digest();
+            }));
+
+            it("should use custom template", function() {
+                element.triggerHandler('click');
+                $timeout.flush();
+                expect($confirm).toHaveBeenCalledWith({text: "Are you sure?", templateName: "danger"}, {})
+            });
+        });
+
 
         describe('with checkbox', function() {