fixes issue 1973 and 1911

Remove previous icon class name before adding the new class name

platform/commonUI/general/src/ui/TreeLabelView.js

@@ -40,10 +40,18 @@ define([
         return type.getCssClass();
     }
 
+    function removePreviousIconClass(el) {
+        $(el).removeClass(function (index, className) {
+            return (className.match (/\bicon-\S+/g) || []).join(' ');
+        });
+    }
+
     TreeLabelView.prototype.updateView = function (domainObject) {
         var titleEl = this.el.find('.t-title-label'),
             iconEl = this.el.find('.t-item-icon');
 
+        removePreviousIconClass(iconEl);
+
         titleEl.text(domainObject ? domainObject.getModel().name : "");
         iconEl.addClass(domainObject ? getClass(domainObject) : "");
 

src/plugins/plot/src/telemetry/PlotController.js

@@ -82,6 +82,10 @@ define([
     };
 
     PlotController.prototype.loadSeriesData = function (series) {
+        if (this.$element[0].offsetWidth === 0) {
+            this.scheduleLoad(series);
+            return;
+        }
         this.startLoading();
         var options = {
             size: this.$element[0].offsetWidth,
@@ -92,6 +96,26 @@ define([
             .then(this.stopLoading.bind(this));
     };
 
+    PlotController.prototype.scheduleLoad = function (series) {
+        if (!this.scheduledLoads) {
+            this.startLoading();
+            this.scheduledLoads = [];
+            this.checkForSize = setInterval(function () {
+                if (this.$element[0].offsetWidth === 0) {
+                    return;
+                }
+                this.stopLoading();
+                this.scheduledLoads.forEach(this.loadSeriesData, this);
+                delete this.scheduledLoads;
+                clearInterval(this.checkForSize);
+                delete this.checkForSize;
+            }.bind(this));
+        }
+        if (this.scheduledLoads.indexOf(series) === -1) {
+            this.scheduledLoads.push(series);
+        }
+    };
+
     PlotController.prototype.addSeries = function (series) {
         this.listenTo(series, 'change:yKey', function () {
             this.loadSeriesData(series);
@@ -126,6 +150,10 @@ define([
     PlotController.prototype.destroy = function () {
         configStore.untrack(this.config.id);
         this.stopListening();
+        if (this.checkForSize) {
+            clearInterval(this.checkForSize);
+            delete this.checkForSize;
+        }
     };
 
     PlotController.prototype.loadMoreData = function (range, purge) {