fix(ViewService): move zIndex layer updates into _updateViewport

argonjs · Apr 27, 2017 · bc842b2 · bc842b2
1 parent af853c0
commit bc842b2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/dist/argon.core.js b/dist/argon.core.js
@@ -18222,12 +18222,9 @@ $__System.register('1', ['2', '3', '3d', '4', '9', '10', 'a', '1d', '35', '2d',
                         }
                     }
                     this._layers = layers;
-                    var zIndex = -layers.length;
                     for (var _b = 0, layers_1 = layers; _b < layers_1.length; _b++) {
                         var l = layers_1[_b];
                         this.element.appendChild(l.source);
-                        l.source.style.zIndex = '' + zIndex;
-                        zIndex++;
                     }
                 };
                 Object.defineProperty(ViewService.prototype, "layers", {
@@ -18323,6 +18320,7 @@ $__System.register('1', ['2', '3', '3d', '4', '9', '10', 'a', '1d', '35', '2d',
                     var viewportJSON = JSON.stringify(viewport);
                     if (this.layers && this.autoStyleLayerElements) {
                         requestAnimationFrame(function () {
+                            var zIndex = -_this._layers.length;
                             for (var _i = 0, _a = _this._layers; _i < _a.length; _i++) {
                                 var layer = _a[_i];
                                 var layerStyle = layer.source.style;
@@ -18331,6 +18329,8 @@ $__System.register('1', ['2', '3', '3d', '4', '9', '10', 'a', '1d', '35', '2d',
                                 layerStyle.bottom = viewport.y + 'px';
                                 layerStyle.width = viewport.width + 'px';
                                 layerStyle.height = viewport.height + 'px';
+                                layerStyle.zIndex = '' + zIndex;
+                                zIndex++;
                             }
                         });
                     }

diff --git a/dist/argon.js b/dist/argon.js
@@ -23802,12 +23802,9 @@ $__System.register('1', ['2', '3', '3d', '4', '9', '10', 'a', '1d', '35', '2d',
                         }
                     }
                     this._layers = layers;
-                    var zIndex = -layers.length;
                     for (var _b = 0, layers_1 = layers; _b < layers_1.length; _b++) {
                         var l = layers_1[_b];
                         this.element.appendChild(l.source);
-                        l.source.style.zIndex = '' + zIndex;
-                        zIndex++;
                     }
                 };
                 Object.defineProperty(ViewService.prototype, "layers", {
@@ -23903,6 +23900,7 @@ $__System.register('1', ['2', '3', '3d', '4', '9', '10', 'a', '1d', '35', '2d',
                     var viewportJSON = JSON.stringify(viewport);
                     if (this.layers && this.autoStyleLayerElements) {
                         requestAnimationFrame(function () {
+                            var zIndex = -_this._layers.length;
                             for (var _i = 0, _a = _this._layers; _i < _a.length; _i++) {
                                 var layer = _a[_i];
                                 var layerStyle = layer.source.style;
@@ -23911,6 +23909,8 @@ $__System.register('1', ['2', '3', '3d', '4', '9', '10', 'a', '1d', '35', '2d',
                                 layerStyle.bottom = viewport.y + 'px';
                                 layerStyle.width = viewport.width + 'px';
                                 layerStyle.height = viewport.height + 'px';
+                                layerStyle.zIndex = '' + zIndex;
+                                zIndex++;
                             }
                         });
                     }

diff --git a/dist/argon.min.js b/dist/argon.min.js
diff --git a/src/view.ts b/src/view.ts
@@ -221,11 +221,8 @@ export class ViewService {
             }
         }
         this._layers = layers;
-        let zIndex = -layers.length;
         for (const l of layers) {
             this.element.appendChild(l.source);
-            l.source.style.zIndex = '' + zIndex;
-            zIndex++;
         }
     }
 
@@ -343,13 +340,16 @@ export class ViewService {
 
         if (this.layers && this.autoStyleLayerElements) {
             requestAnimationFrame(() => {
+                let zIndex = -this._layers.length;
                 for (const layer of this._layers) {
                     const layerStyle = layer.source.style;
                     layerStyle.position = 'absolute';
                     layerStyle.left = viewport.x + 'px';
                     layerStyle.bottom = viewport.y + 'px';
                     layerStyle.width = viewport.width + 'px';
                     layerStyle.height = viewport.height + 'px';
+                    layerStyle.zIndex = '' + zIndex;
+                    zIndex++;
                 }
             })
         }