mask colour applied using ng-style instead of jquery

nozzle · Dec 16, 2015 · 6d5820c · 6d5820c
1 parent 73332fa
commit 6d5820c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 27 deletions.
diff --git a/dist/nz-tour.js b/dist/nz-tour.js
@@ -278,16 +278,16 @@
                 '           <div id="nzTour-inner-content"></div>',
                 '        </div>',
                 '        <div id="nzTour-actions">',
-                '            <button id="nzTour-previous" ng-show="view.step > 0" ng-click="previous()" class="ng-hide">{{view.previousText}}</button>',
-                '            <button id="nzTour-next" ng-show="view.step >= 0" ng-click="next()" class="success" class="ng-hide">{{view.nextText}}</button>',
+                '            <button id="nzTour-previous" ng-show="view.step > 0" ng-click="previous()">{{view.previousText}}</button>',
+                '            <button id="nzTour-next" ng-show="view.step >= 0" ng-click="next()" class="success">{{view.nextText}}</button>',
                 '        </div>',
                 '    </div>',
                 '</div>',
                 '<div class="nzTour-masks" ng-show="current.tour.config.mask.visible" ng-click="tryStop()">',
-                '    <div class="mask top"></div>',
-                '    <div class="mask right"></div>',
-                '    <div class="mask bottom"></div>',
-                '    <div class="mask left"></div>',
+                '    <div class="mask top" ng-style="{\'background-color\': current.tour.config.mask.color}"></div>',
+                '    <div class="mask right" ng-style="{\'background-color\': current.tour.config.mask.color}"></div>',
+                '    <div class="mask bottom" ng-style="{\'background-color\': current.tour.config.mask.color}"></div>',
+                '    <div class="mask left" ng-style="{\'background-color\': current.tour.config.mask.color}"></div>',
                 '</div>'
             ].join(' '),
             link: function($scope, el) {
@@ -343,13 +343,6 @@
                     margin = 7;
                 }
 
-                // Mask Background Color
-                els.masks_top.add(els.masks_right).add(els.masks_bottom).add(els.masks_left).css({
-                    'background-color': config.mask.color
-                });
-
-
-
                 // Step Update Listener
                 var stepUpdater = $scope.$on('step', updateStep);
                 // Thottle for 60fps