Merge pull request #2 from DevExpress/T576518_T579718

fix T579718 and T579718
DevExpress · Nov 23, 2017 · f421b0d · f421b0d
2 parents 829d6e3 + f138656
commit f421b0d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/dist/dashboard-panel.js b/dist/dashboard-panel.js
@@ -18,6 +18,7 @@ var CustomExtensions;
             this.showPanelAsync = function (options) {
                 var def = $.Deferred();
                 _this.visible(true);
+                _this.updateDashboardsList();
                 setTimeout(function () {
                     options.surfaceLeft = _this.panelWidth;
                     def.resolve(options);
@@ -35,7 +36,6 @@ var CustomExtensions;
             };
             this.switchToViewer = function () {
                 _this._dashboardControl.switchToViewer();
-                _this.updateDashboardsList();
             };
             this.switchToDesigner = function () {
                 _this._dashboardControl.switchToDesigner();
@@ -58,7 +58,7 @@ var CustomExtensions;
             this.selectedItemKeys.subscribe(function (value) {
                 if (value.length) {
                     var newDashboardId = value[0];
-                    if (_this._dashboardControl.dashboardContainer() && _this._dashboardControl.dashboardContainer().id != newDashboardId) {
+                    if (!_this._dashboardControl.dashboardContainer() || _this._dashboardControl.dashboardContainer().id !== newDashboardId) {
                         _this._dashboardControl.loadDashboard(newDashboardId);
                     }
                 }

diff --git a/dist/dashboard-panel.min.js b/dist/dashboard-panel.min.js
diff --git a/src/dashboard-panel.ts b/src/dashboard-panel.ts
@@ -45,7 +45,7 @@ module CustomExtensions {
             this.selectedItemKeys.subscribe(value => {
                 if(value.length) {
                     var newDashboardId = value[0];
-                    if(this._dashboardControl.dashboardContainer()&&this._dashboardControl.dashboardContainer().id!=newDashboardId) {
+                    if(!this._dashboardControl.dashboardContainer() || this._dashboardControl.dashboardContainer().id !== newDashboardId) {
                         this._dashboardControl.loadDashboard(newDashboardId);
                     }
                 }
@@ -102,6 +102,7 @@ module CustomExtensions {
         showPanelAsync = (options: DevExpress.Dashboard.IWorkingModeSwitchingOptions) => {
             var def = $.Deferred();
             this.visible(true);
+            this.updateDashboardsList();
             setTimeout(() => {
                 options.surfaceLeft = this.panelWidth;
                 def.resolve(options);
@@ -119,7 +120,6 @@ module CustomExtensions {
         }
         switchToViewer = (): void => {
             this._dashboardControl.switchToViewer();
-            this.updateDashboardsList();
         }
         switchToDesigner = (): void => {
             this._dashboardControl.switchToDesigner();