You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2013/07/10 00:35:35 UTC
git commit: updated refs/heads/4.2 to c9b1783
Updated Branches:
refs/heads/4.2 35e6f0354 -> c9b178323
CLOUDSTACK UI - remove obsolete code (window.name is no longer used).
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c9b17832
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c9b17832
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c9b17832
Branch: refs/heads/4.2
Commit: c9b17832359ae0b7eb216943ef853247649ee43d
Parents: 35e6f03
Author: Jessica Wang <je...@apache.org>
Authored: Tue Jul 9 15:25:40 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Tue Jul 9 15:35:25 2013 -0700
----------------------------------------------------------------------
ui/scripts/cloud.core.callbacks.js | 20 +-------------------
ui/scripts/cloudStack.js | 6 ++----
ui/scripts/ui-custom/regions.js | 3 +--
3 files changed, 4 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c9b17832/ui/scripts/cloud.core.callbacks.js
----------------------------------------------------------------------
diff --git a/ui/scripts/cloud.core.callbacks.js b/ui/scripts/cloud.core.callbacks.js
index 7fd1b4d..6eb7644 100644
--- a/ui/scripts/cloud.core.callbacks.js
+++ b/ui/scripts/cloud.core.callbacks.js
@@ -72,25 +72,7 @@ $(document).ready(function() {
return true;
}
});
- }
- else if(window.name != null && window.name.indexOf("&domain=") != -1) { //from region switching
- g_loginCmdText = window.name;
- $.ajax({
- url: clientApiUrl + "?command=login" + window.name + "&response=json",
- dataType: "json",
- async: false,
- success: function(json) {
- g_loginResponse = json.loginresponse;
- },
- error: function() {
- onLogoutCallback();
- // This means the login failed. You should redirect to your login page.
- },
- beforeSend: function(XMLHttpRequest) {
- return true;
- }
- });
- }
+ }
});
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c9b17832/ui/scripts/cloudStack.js
----------------------------------------------------------------------
diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index 739ac7e..12d2c0c 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -399,8 +399,7 @@
g_timezone = null;
g_supportELB = null;
g_loginCmdText = null;
- window.name = '';
-
+
$.cookie('JSESSIONID', null);
$.cookie('sessionKey', null);
$.cookie('username', null);
@@ -476,8 +475,7 @@
}
};
- if ($.urlParam('loginUrl') != 0
- ||(window.name != null && window.name.indexOf("&domain=") != -1)) {
+ if ($.urlParam('loginUrl') != 0) {
// SSO
loginArgs.hideLoginScreen = true;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c9b17832/ui/scripts/ui-custom/regions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/regions.js b/ui/scripts/ui-custom/regions.js
index 0469638..9fc36f3 100644
--- a/ui/scripts/ui-custom/regions.js
+++ b/ui/scripts/ui-custom/regions.js
@@ -88,8 +88,7 @@
var switchRegion = function(url) {
closeRegionSelector({
complete: function() {
- $('#container').prepend($('<div>').addClass('loading-overlay'));
- //window.name = g_loginCmdText;
+ $('#container').prepend($('<div>').addClass('loading-overlay'));
document.location.href = url;
}
});