reverting changes in favor of a better approach

Author: stguitar

angular-confirm.js

@@ -34,16 +34,14 @@ angular.module('angular-confirm', ['ui.bootstrap.modal'])
     template: '<div class="modal-header"><h3 class="modal-title">{{data.title}}</h3></div>' +
     '<div class="modal-body">{{data.text}}</div>' +
     '<div class="modal-footer">' +
-    '<button class="btn btn-{{data.okClass}}" ng-click="ok()">{{data.ok}}</button>' +
-    '<button class="btn btn-{{data.cancelClass}}" ng-click="cancel()">{{data.cancel}}</button>' +
+    '<button class="btn btn-primary" ng-click="ok()">{{data.ok}}</button>' +
+    '<button class="btn btn-default" ng-click="cancel()">{{data.cancel}}</button>' +
     '</div>',
     controller: 'ConfirmModalController',
     defaultLabels: {
       title: 'Confirm',
       ok: 'OK',
-      cancel: 'Cancel',
-      okClass: 'primary',
-      cancelClass: 'default'
+      cancel: 'Cancel'
     }
   })
   .factory('$confirm', ["$uibModal", "$confirmModalDefaults", function ($uibModal, $confirmModalDefaults) {
@@ -77,9 +75,7 @@ angular.module('angular-confirm', ['ui.bootstrap.modal'])
         confirmSettings: "=",
         confirmTitle: '@',
         confirmOk: '@',
-        confirmCancel: '@',
-        confirmOkClass: '@',
-        confirmCancelClass: '@'
+        confirmCancel: '@'
       },
       link: function (scope, element, attrs) {
 
@@ -114,12 +110,6 @@ angular.module('angular-confirm', ['ui.bootstrap.modal'])
               if (scope.confirmCancel) {
                 data.cancel = scope.confirmCancel;
               }
-              if (scope.confirmOkClass) {
-                data.okClass = scope.confirmOkClass;
-              }
-              if (scope.confirmCancelClass) {
-                data.cancelClass = scope.confirmCancelClass;
-              }
               $confirm(data, scope.confirmSettings || {}).then(onSuccess);
             } else {
               scope.$apply(onSuccess);

test/unit/confirmSpec.js

@@ -96,22 +96,6 @@ describe('angular-confirm', function() {
             expect(settings.template).not.toBeDefined();
         });
 
-        it("should provide default button class names", function(){
-            expect($confirmModalDefaults.defaultLabels.okClass).toEqual('primary');
-            expect($confirmModalDefaults.defaultLabels.cancelClass).toEqual('default');
-            var settings = $confirm({});
-            var data = settings.resolve.data();
-            expect(data.okClass).toEqual('primary');
-            expect(data.cancelClass).toEqual('default');
-        });
-
-        it("should override default class names", function(){
-            var settings = $confirm({okClass: "danger", cancelClass: "warning"});
-            var data = settings.resolve.data();
-            expect(data.okClass).toEqual('danger');
-            expect(data.cancelClass).toEqual('warning');
-        });
-
     });
 
     describe('confirm directive', function() {
@@ -221,25 +205,6 @@ describe('angular-confirm', function() {
             });
         });
 
-        describe('with confirmOk and confirmOkClass option', function() {
-            beforeEach(angular.mock.inject(function($compile) {
-                $scope.name = 'Joe';
-                element = angular.element('<button type="button" ng-click="click()" confirm="Are you sure?" confirm-ok="Okie Dokie, {{name}}!" confirm-ok-class="danger">Delete</button>');
-                $compile(element)($scope);
-                $scope.$digest();
-            }));
-
-            it("should resolve the confirmTitle to the title property", function() {
-                element.triggerHandler('click');
-                $timeout.flush();
-                expect(data.ok).toEqual('Okie Dokie, Joe!');
-            });
-
-            it("should use confirmOkClass to the provided value", function(){
-                expect(data.okClass).toEqual('danger');
-            });
-        });
-
         describe('with confirmCancel option', function() {
             beforeEach(angular.mock.inject(function($compile) {
                 $scope.name = 'Joe';
@@ -255,25 +220,6 @@ describe('angular-confirm', function() {
             });
         });
 
-        describe('with confirmCancel and cancelClass option', function() {
-            beforeEach(angular.mock.inject(function($compile) {
-                $scope.name = 'Joe';
-                element = angular.element('<button type="button" ng-click="click()" confirm="Are you sure?" confirm-cancel="No Way, {{name}}!" confirm-cancel-class="warning">Delete</button>');
-                $compile(element)($scope);
-                $scope.$digest();
-            }));
-
-            it("should resolve the confirmTitle to the title property", function() {
-                element.triggerHandler('click');
-                $timeout.flush();
-                expect(data.cancel).toEqual('No Way, Joe!');
-            });
-
-            it("should use confirmCancelClass to the provided value", function(){
-                expect(data.cancelClass).toEqual('warning');
-            });
-        });
-
         describe('with confirmSettings option', function() {
             beforeEach(angular.mock.inject(function($compile) {
                 $scope.settings = {name: 'Joe'};