fix(VIewService): Always set layer styles in _updateViewport

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

Hide file tree

Showing 4 changed files with 40 additions and 40 deletions.
diff --git a/dist/argon.core.js b/dist/argon.core.js
@@ -18321,6 +18321,19 @@ $__System.register('1', ['2', '3', '3d', '4', '9', '10', 'a', '1d', '35', '2d',
  ViewService.prototype._updateViewport = function (viewport) {
  var _this = this;
  var viewportJSON = JSON.stringify(viewport);
+ if (this.layers && this.autoStyleLayerElements) {
+ requestAnimationFrame(function () {
+ for (var _i = 0, _a = _this._layers; _i < _a.length; _i++) {
+ var layer = _a[_i];
+ var 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';
+ }
+ });
+ }
  if (!this._currentViewportJSON || this._currentViewportJSON !== viewportJSON) {
  this._currentViewportJSON = viewportJSON;
  this._viewport = Viewport.clone(viewport, this._viewport);
@@ -18343,19 +18356,6 @@ $__System.register('1', ['2', '3', '3d', '4', '9', '10', 'a', '1d', '35', '2d',
  }
  });
  }
- if (this.layers && this.autoStyleLayerElements) {
- requestAnimationFrame(function () {
- for (var _i = 0, _a = _this._layers; _i < _a.length; _i++) {
- var layer = _a[_i];
- var 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';
- }
- });
- }
  this.viewportChangeEvent.raiseEvent(viewport);
  }
  };

diff --git a/dist/argon.js b/dist/argon.js
@@ -23901,6 +23901,19 @@ $__System.register('1', ['2', '3', '3d', '4', '9', '10', 'a', '1d', '35', '2d',
  ViewService.prototype._updateViewport = function (viewport) {
  var _this = this;
  var viewportJSON = JSON.stringify(viewport);
+ if (this.layers && this.autoStyleLayerElements) {
+ requestAnimationFrame(function () {
+ for (var _i = 0, _a = _this._layers; _i < _a.length; _i++) {
+ var layer = _a[_i];
+ var 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';
+ }
+ });
+ }
  if (!this._currentViewportJSON || this._currentViewportJSON !== viewportJSON) {
  this._currentViewportJSON = viewportJSON;
  this._viewport = Viewport.clone(viewport, this._viewport);
@@ -23923,19 +23936,6 @@ $__System.register('1', ['2', '3', '3d', '4', '9', '10', 'a', '1d', '35', '2d',
  }
  });
  }
- if (this.layers && this.autoStyleLayerElements) {
- requestAnimationFrame(function () {
- for (var _i = 0, _a = _this._layers; _i < _a.length; _i++) {
- var layer = _a[_i];
- var 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';
- }
- });
- }
  this.viewportChangeEvent.raiseEvent(viewport);
  }
  };

diff --git a/dist/argon.min.js b/dist/argon.min.js
diff --git a/src/view.ts b/src/view.ts
@@ -341,6 +341,19 @@ export class ViewService {
  private _updateViewport(viewport:CanvasViewport) {
  const viewportJSON = JSON.stringify(viewport);
 
+ if (this.layers && this.autoStyleLayerElements) {
+ requestAnimationFrame(() => {
+ 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';
+ }
+ })
+ }
+
  if (!this._currentViewportJSON || this._currentViewportJSON !== viewportJSON) {
  this._currentViewportJSON = viewportJSON;
 
@@ -368,19 +381,6 @@ export class ViewService {
  })
  }
 
- if (this.layers && this.autoStyleLayerElements) {
- requestAnimationFrame(() => {
- 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';
- }
- })
- }
-
  this.viewportChangeEvent.raiseEvent(viewport);
  }
  }