You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2014/11/13 17:15:55 UTC
ambari git commit: AMBARI-8310. Ambari Web: convert non-async AJAX
calls to async (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 05a62644c -> f0a7a1be3
AMBARI-8310. Ambari Web: convert non-async AJAX calls to async (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f0a7a1be
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f0a7a1be
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f0a7a1be
Branch: refs/heads/trunk
Commit: f0a7a1be327a4b41a0d723bf68b45811116cd6fd
Parents: 05a6264
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu Nov 13 18:09:59 2014 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Nov 13 18:09:59 2014 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/wizard.js | 3 +--
ambari-web/app/router.js | 2 +-
ambari-web/app/utils/ajax/ajax.js | 9 ---------
ambari-web/app/utils/polling.js | 1 -
4 files changed, 2 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0a7a1be/ambari-web/app/controllers/wizard.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard.js b/ambari-web/app/controllers/wizard.js
index 59d1833..d35d357 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -526,8 +526,7 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, {
sender: this,
data: {
stackUrl: App.get('stackVersionURL'),
- stackVersion: App.get('currentStackVersionNumber'),
- async: false
+ stackVersion: App.get('currentStackVersionNumber')
},
success: 'loadServiceComponentsSuccessCallback',
error: 'loadServiceComponentsErrorCallback'
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0a7a1be/ambari-web/app/router.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/router.js b/ambari-web/app/router.js
index f567fef..6781451 100644
--- a/ambari-web/app/router.js
+++ b/ambari-web/app/router.js
@@ -109,7 +109,7 @@ App.Router = Em.Router.extend({
var authResp = (auth && auth === true);
if (authResp) {
App.ajax.send({
- name: 'router.authentication',
+ name: 'router.login.clusters',
sender: this,
success: 'onAuthenticationSuccess',
error: 'onAuthenticationError'
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0a7a1be/ambari-web/app/utils/ajax/ajax.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js
index dfdeb00..a61b531 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -1475,15 +1475,6 @@ var urls = {
'real': '/logout',
'mock': ''
},
- 'router.authentication': {
- 'real': '/clusters?fields=Clusters/provisioning_state',
- 'mock': '/data/clusters/info.json',
- 'format': function() {
- return {
- async: false
- };
- }
- },
'ambari.service.load_jdk_name': {
'real': '/services/AMBARI/components/AMBARI_SERVER?fields=RootServiceComponents/properties/jdk.name,RootServiceComponents/properties/java.home,RootServiceComponents/properties/jdk_location',
'mock': '/data/requests/host_check/jdk_name.json'
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0a7a1be/ambari-web/app/utils/polling.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/polling.js b/ambari-web/app/utils/polling.js
index b6d6bfd..aeff492 100644
--- a/ambari-web/app/utils/polling.js
+++ b/ambari-web/app/utils/polling.js
@@ -73,7 +73,6 @@ App.Poll = Em.Object.extend({
$.ajax({
type: method,
url: url,
- async: false,
data: data,
dataType: 'text',
timeout: App.timeout,