Skip to content

Commit

Permalink
Close #1546. Close #1547.
Browse files Browse the repository at this point in the history
  • Loading branch information
flekschas committed Dec 4, 2016
1 parent 6487021 commit 33fdfd6
Showing 1 changed file with 16 additions and 4 deletions.
20 changes: 16 additions & 4 deletions refinery/ui/source/js/dashboard/controllers/dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -366,8 +366,18 @@ function DashboardCtrl (
if (this.repoMode) {
this.expandDataSetPanel = true;
this.expandedDataSetPanelBorder = true;
this.dashboardWidthFixerService.fixWidth();
this.dashboardExpandablePanelService.trigger('lockFullWith');
this.dashboardWidthFixerService
.fixWidth()
.then(function () {
this.dashboardExpandablePanelService.trigger('lockFullWith');
}.bind(this))
.catch(function () {
// This is weird. We should never run into here unless the whole app
// initialization failed even after 75ms.
// See `services/width-fixer.js` for details.
this.$log.error('Dashboard expand dataset exploration error,' +
' possibly due to the Refinery App failing to initialized.');
});
}
}.bind(this), 0);

Expand Down Expand Up @@ -998,7 +1008,8 @@ DashboardCtrl.prototype.expandDatasetExploration = function (fromStateEvent) {
this.dataSetExploration = true;

if (!this.expandDataSetPanel) {
this.dashboardWidthFixerService.fixWidth()
this.dashboardWidthFixerService
.fixWidth()
.then(function () {
self.expandDataSetPanel = true;
self.expandedDataSetPanelBorder = true;
Expand Down Expand Up @@ -1052,7 +1063,8 @@ DashboardCtrl.prototype.expandDataSetPreview = function (

function startExpansion () {
if (!this.expandDataSetPanel) {
this.dashboardWidthFixerService.fixWidth()
this.dashboardWidthFixerService
.fixWidth()
.then(function () {
self.expandDataSetPanel = true;
self.expandedDataSetPanelBorder = true;
Expand Down

0 comments on commit 33fdfd6

Please sign in to comment.