You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2015/09/17 18:37:04 UTC
ambari git commit: AMBARI-13132. No page refresh after closing Add
Service Wizard in Chrome (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 9b8473c5a -> ad810ae46
AMBARI-13132. No page refresh after closing Add Service Wizard in Chrome (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ad810ae4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ad810ae4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ad810ae4
Branch: refs/heads/trunk
Commit: ad810ae466248db87a50aaaf5d90d76ab1bbceb8
Parents: 9b8473c
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Thu Sep 17 19:34:37 2015 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Thu Sep 17 19:34:37 2015 +0300
----------------------------------------------------------------------
.../highAvailability/progress_controller.js | 10 ++++-
.../app/routes/add_alert_definition_routes.js | 4 +-
ambari-web/app/routes/add_host_routes.js | 4 +-
ambari-web/app/routes/add_kerberos_routes.js | 12 ++++--
ambari-web/app/routes/add_service_routes.js | 4 +-
.../app/routes/high_availability_routes.js | 14 ++++++-
ambari-web/app/routes/main.js | 4 +-
.../app/routes/ra_high_availability_routes.js | 12 ++++--
ambari-web/app/routes/reassign_master_routes.js | 40 +++++++++++++-------
.../app/routes/rm_high_availability_routes.js | 22 +++++++----
ambari-web/app/routes/rollbackHA_routes.js | 4 +-
11 files changed, 96 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ad810ae4/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js
index 6a31695..52d7ca5 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js
@@ -42,7 +42,15 @@ App.HighAvailabilityProgressPageController = App.HighAvailabilityWizardControlle
clusterName: App.router.get('content.cluster.name'),
clusterState: 'DEFAULT',
localdb: App.db.data
- },{alwaysCallback: function() {self.hide();App.router.transitionTo('main.index');location.reload();}});
+ }, {
+ alwaysCallback: function () {
+ self.hide();
+ App.router.transitionTo('main.index');
+ Em.run.next(function () {
+ location.reload();
+ });
+ }
+ });
},
secondary: Em.I18n.t('no'),
onSecondary: function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ad810ae4/ambari-web/app/routes/add_alert_definition_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/add_alert_definition_routes.js b/ambari-web/app/routes/add_alert_definition_routes.js
index c941798..c1b7686 100644
--- a/ambari-web/app/routes/add_alert_definition_routes.js
+++ b/ambari-web/app/routes/add_alert_definition_routes.js
@@ -135,7 +135,9 @@ module.exports = App.WizardRoute.extend({
alwaysCallback: function () {
controller.get('popup').hide();
router.transitionTo('main.alerts');
- location.reload();
+ Em.run.next(function() {
+ location.reload();
+ });
}
});
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/ad810ae4/ambari-web/app/routes/add_host_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/add_host_routes.js b/ambari-web/app/routes/add_host_routes.js
index 50db9cc..65cebac 100644
--- a/ambari-web/app/routes/add_host_routes.js
+++ b/ambari-web/app/routes/add_host_routes.js
@@ -34,7 +34,9 @@ module.exports = App.WizardRoute.extend({
alwaysCallback: function () {
context.hide();
App.router.transitionTo('hosts.index');
- location.reload();
+ Em.run.next(function() {
+ location.reload();
+ });
}
});
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/ad810ae4/ambari-web/app/routes/add_kerberos_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/add_kerberos_routes.js b/ambari-web/app/routes/add_kerberos_routes.js
index 5ac287b..d60ba79 100644
--- a/ambari-web/app/routes/add_kerberos_routes.js
+++ b/ambari-web/app/routes/add_kerberos_routes.js
@@ -76,7 +76,9 @@ module.exports = App.WizardRoute.extend({
App.get('router.updateController').set('isWorking', true);
if (App.get('testMode')) {
App.get('router').transitionTo('adminKerberos.index');
- location.reload();
+ Em.run.next(function() {
+ location.reload();
+ });
}
App.router.get('wizardWatcherController').resetUser();
App.clusterStatus.setClusterStatus({
@@ -87,7 +89,9 @@ module.exports = App.WizardRoute.extend({
alwaysCallback: function () {
self.hide();
App.get('router').transitionTo(exitPath);
- location.reload();
+ Em.run.next(function() {
+ location.reload();
+ });
}
});
}
@@ -383,7 +387,9 @@ module.exports = App.WizardRoute.extend({
alwaysCallback: function () {
controller.get('popup').hide();
App.get('router').transitionTo('adminKerberos.index');
- location.reload();
+ Em.run.next(function() {
+ location.reload();
+ });
}
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/ad810ae4/ambari-web/app/routes/add_service_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/add_service_routes.js b/ambari-web/app/routes/add_service_routes.js
index 030eb90..aa26565 100644
--- a/ambari-web/app/routes/add_service_routes.js
+++ b/ambari-web/app/routes/add_service_routes.js
@@ -63,7 +63,9 @@ module.exports = App.WizardRoute.extend({
alwaysCallback: function () {
self.hide();
App.router.transitionTo(exitPath);
- location.reload();
+ Em.run.next(function() {
+ location.reload();
+ });
}
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/ad810ae4/ambari-web/app/routes/high_availability_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/high_availability_routes.js b/ambari-web/app/routes/high_availability_routes.js
index 3302305..82b42ca 100644
--- a/ambari-web/app/routes/high_availability_routes.js
+++ b/ambari-web/app/routes/high_availability_routes.js
@@ -77,7 +77,9 @@ module.exports = App.WizardRoute.extend({
alwaysCallback: function () {
self.hide();
App.router.transitionTo('main.services.index');
- location.reload();
+ Em.run.next(function() {
+ location.reload();
+ });
}
});
}
@@ -326,7 +328,15 @@ module.exports = App.WizardRoute.extend({
clusterName: controller.get('content.cluster.name'),
clusterState: 'DEFAULT',
localdb: App.db.data
- },{alwaysCallback: function() {controller.get('popup').hide();router.transitionTo('main.services.index');location.reload();}});
+ }, {
+ alwaysCallback: function () {
+ controller.get('popup').hide();
+ router.transitionTo('main.services.index');
+ Em.run.next(function() {
+ location.reload();
+ });
+ }
+ });
}
})
http://git-wip-us.apache.org/repos/asf/ambari/blob/ad810ae4/ambari-web/app/routes/main.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js
index b7807f5..21332bf 100644
--- a/ambari-web/app/routes/main.js
+++ b/ambari-web/app/routes/main.js
@@ -424,7 +424,9 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
alwaysCallback: function () {
self.hide();
router.transitionTo('adminKerberos.index');
- location.reload();
+ Em.run.next(function() {
+ location.reload();
+ });
}
});
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/ad810ae4/ambari-web/app/routes/ra_high_availability_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/ra_high_availability_routes.js b/ambari-web/app/routes/ra_high_availability_routes.js
index 5700b17..5a1052e 100644
--- a/ambari-web/app/routes/ra_high_availability_routes.js
+++ b/ambari-web/app/routes/ra_high_availability_routes.js
@@ -56,7 +56,9 @@ module.exports = App.WizardRoute.extend({
alwaysCallback: function () {
self.hide();
router.transitionTo('main.services.index');
- location.reload();
+ Em.run.next(function() {
+ location.reload();
+ });
}
});
}, Em.I18n.t('admin.ra_highAvailability.closePopup'));
@@ -72,7 +74,9 @@ module.exports = App.WizardRoute.extend({
alwaysCallback: function () {
self.hide();
router.transitionTo('main.services.index');
- location.reload();
+ Em.run.next(function() {
+ location.reload();
+ });
}
});
}
@@ -191,7 +195,9 @@ module.exports = App.WizardRoute.extend({
alwaysCallback: function () {
rAHighAvailabilityWizardController.get('popup').hide();
router.transitionTo('main.services.index');
- location.reload();
+ Em.run.next(function() {
+ location.reload();
+ });
}
});
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ad810ae4/ambari-web/app/routes/reassign_master_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/reassign_master_routes.js b/ambari-web/app/routes/reassign_master_routes.js
index 4b79991..3223af7 100644
--- a/ambari-web/app/routes/reassign_master_routes.js
+++ b/ambari-web/app/routes/reassign_master_routes.js
@@ -33,7 +33,9 @@ module.exports = App.WizardRoute.extend({
}, {alwaysCallback: function () {
context.hide();
router.transitionTo('main.index');
- location.reload();
+ Em.run.next(function() {
+ location.reload();
+ });
}});
},
@@ -246,7 +248,9 @@ module.exports = App.WizardRoute.extend({
}, {alwaysCallback: function () {
controller.get('popup').hide();
router.transitionTo('main.index');
- location.reload();
+ Em.run.next(function() {
+ location.reload();
+ });
}});
}
},
@@ -311,7 +315,9 @@ module.exports = App.WizardRoute.extend({
}, {alwaysCallback: function () {
controller.get('popup').hide();
router.transitionTo('main.index');
- location.reload();
+ Em.run.next(function() {
+ location.reload();
+ });
}});
}
},
@@ -344,11 +350,15 @@ module.exports = App.WizardRoute.extend({
clusterName: router.get('reassignMasterController.content.cluster.name'),
clusterState: 'DEFAULT',
localdb: App.db.data
- }, {alwaysCallback: function () {
- controller.get('popup').hide();
- router.transitionTo('main.index');
- location.reload();
- }});
+ }, {
+ alwaysCallback: function () {
+ controller.get('popup').hide();
+ router.transitionTo('main.index');
+ Em.run.next(function() {
+ location.reload();
+ });
+ }
+ });
}
},
@@ -362,11 +372,15 @@ module.exports = App.WizardRoute.extend({
clusterName: router.get('reassignMasterController.content.cluster.name'),
clusterState: 'DEFAULT',
localdb: App.db.data
- }, {alwaysCallback: function () {
- controller.get('popup').hide();
- router.transitionTo('main.index');
- location.reload();
- }});
+ }, {
+ alwaysCallback: function () {
+ controller.get('popup').hide();
+ router.transitionTo('main.index');
+ Em.run.next(function() {
+ location.reload();
+ });
+ }
+ });
}
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/ad810ae4/ambari-web/app/routes/rm_high_availability_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/rm_high_availability_routes.js b/ambari-web/app/routes/rm_high_availability_routes.js
index 51cb2c7..a3b40bb 100644
--- a/ambari-web/app/routes/rm_high_availability_routes.js
+++ b/ambari-web/app/routes/rm_high_availability_routes.js
@@ -54,7 +54,9 @@ module.exports = App.WizardRoute.extend({
alwaysCallback: function () {
self.hide();
router.transitionTo('main.services.index');
- location.reload();
+ Em.run.next(function() {
+ location.reload();
+ });
}
});
}, Em.I18n.t('admin.rm_highAvailability.closePopup'));
@@ -70,7 +72,9 @@ module.exports = App.WizardRoute.extend({
alwaysCallback: function () {
self.hide();
router.transitionTo('main.services.index');
- location.reload();
+ Em.run.next(function() {
+ location.reload();
+ });
}
});
}
@@ -199,11 +203,15 @@ module.exports = App.WizardRoute.extend({
clusterName: controller.get('content.cluster.name'),
clusterState: 'DEFAULT',
localdb: App.db.data
- }, {alwaysCallback: function () {
- controller.get('popup').hide();
- router.transitionTo('main.services.index');
- location.reload();
- }});
+ }, {
+ alwaysCallback: function () {
+ controller.get('popup').hide();
+ router.transitionTo('main.services.index');
+ Em.run.next(function () {
+ location.reload();
+ });
+ }
+ });
}
})
http://git-wip-us.apache.org/repos/asf/ambari/blob/ad810ae4/ambari-web/app/routes/rollbackHA_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/rollbackHA_routes.js b/ambari-web/app/routes/rollbackHA_routes.js
index f9c9f11..43a4eb8 100644
--- a/ambari-web/app/routes/rollbackHA_routes.js
+++ b/ambari-web/app/routes/rollbackHA_routes.js
@@ -148,7 +148,9 @@ module.exports = App.WizardRoute.extend({
localdb: App.db.data
});
router.transitionTo('main.index');
- location.reload();
+ Em.run.next(function() {
+ location.reload();
+ });
}
})