Add support for multiple dialogs for 0.8.3

hayloft · Mar 6, 2015 · 1650734 · 1650734 · bobmanz · Apr 29, 2015
1 parent c9aae9b
commit 1650734
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/src/components/dialog/dialog.js b/src/components/dialog/dialog.js
@@ -409,7 +409,7 @@ function MdDialogProvider($$interimElementProvider) {
         var computeFrom = (options.parent[0] == $document[0].body && $document[0].documentElement 
                            && $document[0].scrollTop) ? angular.element($document[0].documentElement) : options.parent;
         var parentOffset = computeFrom.prop('scrollTop');
-        options.backdrop = angular.element('<md-backdrop class="md-dialog-backdrop md-opaque">');
+        options.backdrop = angular.element('<md-backdrop class="md-dialog-backdrop md-opaque" style="z-index: ' + options.zIndex + '">');
         $mdTheming.inherit(options.backdrop, options.parent);
         $animate.enter(options.backdrop, options.parent);
         element.css('top', parentOffset +'px');
@@ -429,7 +429,9 @@ function MdDialogProvider($$interimElementProvider) {
         if (options.escapeToClose) {
           options.rootElementKeyupCallback = function(e) {
             if (e.keyCode === $mdConstant.KEY_CODE.ESCAPE) {
-              $timeout($mdDialog.cancel);
+              if (options.stack.indexOf(options.interimElement) == 0) {
+                $timeout($mdDialog.cancel);
+              }
             }
           };
           $rootElement.on('keyup', options.rootElementKeyupCallback);

diff --git a/src/core/services/interimElement/interimElement.js b/src/core/services/interimElement/interimElement.js
@@ -258,17 +258,12 @@ function InterimElementProvider() {
        *
        */
       function show(options) {
-        if (stack.length) {
-          return service.cancel().then(function() {
-            return show(options);
-          });
-        } else {
-          var interimElement = new InterimElement(options);
-          stack.push(interimElement);
-          return interimElement.show().then(function() {
-            return interimElement.deferred.promise;
-          });
-        }
+        options.zIndex = 80 + stack.length;
+        var interimElement = new InterimElement(options);
+        stack.unshift(interimElement);
+        return interimElement.show().then(function() {
+          return interimElement.deferred.promise;
+        });
       }
 
       /*
@@ -336,7 +331,7 @@ function InterimElementProvider() {
           options.template = processTemplate(options.template);
         }
 
-        return self = {
+        self = {
           options: options,
           deferred: $q.defer(),
           show: function() {
@@ -371,6 +366,7 @@ function InterimElementProvider() {
                 if (!options.parent.length) options.parent = $rootElement;
               }
 
+              element.css('z-index', options.zIndex);
               if (options.themable) $mdTheming(element);
               var ret = options.onShow(options.scope, element, options);
               return $q.when(ret)
@@ -404,6 +400,11 @@ function InterimElementProvider() {
             });
           }
         };
+
+        options.interimElement = self;
+        options.stack = stack;
+
+        return self;
       }
     };