refactor(modal): add class to element instead of template expression

angular-ui · Apr 19, 2014 · 00829b6 · 00829b6 · codeberg30 · Jan 5, 2015
1 parent ded352c
commit 00829b6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/modal/modal.js b/src/modal/modal.js
@@ -85,7 +85,7 @@ angular.module('ui.bootstrap.modal', ['ui.bootstrap.transition'])
       transclude: true,
       templateUrl: 'template/modal/window.html',
       link: function (scope, element, attrs) {
-        scope.windowClass = attrs.windowClass || '';
+        element.addClass(attrs.windowClass || '');
 
         $timeout(function () {
           // trigger CSS transitions

diff --git a/src/modal/test/modalWindow.spec.js b/src/modal/test/modalWindow.spec.js
@@ -10,9 +10,10 @@ describe('modal window', function () {
   }));
 
   it('should support custom CSS classes as string', function () {
-    var windowEl = $compile('<div modal-window window-class="test">content</div>')($rootScope);
+    var windowEl = $compile('<div modal-window window-class="test foo">content</div>')($rootScope);
     $rootScope.$digest();
 
     expect(windowEl).toHaveClass('test');
+    expect(windowEl).toHaveClass('foo');
   });
 });
diff --git a/template/modal/window.html b/template/modal/window.html
@@ -1,3 +1,3 @@
-<div tabindex="-1" class="modal fade {{ windowClass }}" ng-class="{in: animate}" ng-style="{'z-index': 1050 + index*10, display: 'block'}" ng-click="close($event)">
+<div tabindex="-1" class="modal fade" ng-class="{in: animate}" ng-style="{'z-index': 1050 + index*10, display: 'block'}" ng-click="close($event)">
     <div class="modal-dialog"><div class="modal-content" ng-transclude></div></div>
 </div>