fix(errors): reduce console errors

THIN-12080
esarder · Sep 27, 2018 · aa0a6f6 · aa0a6f6
1 parent ba46947
commit aa0a6f6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/src/os/ui/util/autovheight.js b/src/os/ui/util/autovheight.js
@@ -51,10 +51,11 @@ os.ui.Module.directive('autovheight', [os.ui.util.autoVHeightDirective]);
  * @param {!angular.Scope} $scope
  * @param {!angular.JQLite} $element
  * @param {!angular.$injector} $injector
+ * @param {!angular.$timeout} $timeout
  * @constructor
  * @ngInject
  */
-os.ui.util.AutoVHeightCtrl = function($scope, $element, $injector) {
+os.ui.util.AutoVHeightCtrl = function($scope, $element, $injector, $timeout) {
   /**
    * @type {?angular.Scope}
    * @private
@@ -80,10 +81,7 @@ os.ui.util.AutoVHeightCtrl = function($scope, $element, $injector) {
   var parent = $element.parent();
   parent.resize(this.resizeFn_);
 
-  var siblings = /** @type {string} */ ($scope['siblings']);
-  if (siblings) {
-    $(siblings).resize(this.resizeFn_);
-  }
+  $timeout(this.resizeSiblings_.bind(this));
 
   // add resize to common elements
   goog.object.getValues(os.ui.windowCommonElements).forEach(function(sibling) {
@@ -151,3 +149,15 @@ os.ui.util.AutoVHeightCtrl.prototype.onResize_ = function() {
     this.element_.css('height', vhHeight);
   }
 };
+
+
+/**
+ * Add resize handlers to siblings
+ * @private
+ */
+os.ui.util.AutoVHeightCtrl.prototype.resizeSiblings_ = function() {
+  var siblings = /** @type {string} */ (this.scope_['siblings']);
+  if (siblings) {
+    $(siblings).resize(this.resizeFn_);
+  }
+};
diff --git a/views/layer/layerpicker.html b/views/layer/layerpicker.html
@@ -1,6 +1,6 @@
 <div>
   <select ng-if="!pickerCtrl.multiple()" ng-model="layer" ng-options="l.getId() for l in pickerCtrl.layersList"
     ng-change="pickerCtrl.layerPicked(layer)" class="js-layer-picker w-100" ng-required="isRequired"/>
-  <select ng-if="pickerCtrl.multiple()" ng-model="layers" ng-options="l.getId() for l in pickerCtrl.layersList"
-    ng-change="pickerCtrl.layersChanged(layers)" class="js-layer-picker w-100" multiple/>
+  <select ng-if="pickerCtrl.multiple()" ng-model="pickerCtrl.layers" ng-options="l.getId() for l in pickerCtrl.layersList"
+    ng-change="pickerCtrl.layersChanged(pickerCtrl.layers)" class="js-layer-picker w-100" multiple/>
 </div>