cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/master to 40678a2
Date Tue, 09 Jul 2013 22:26:45 GMT
Updated Branches:
  refs/heads/master e30ce5c9e -> 40678a27d


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/40678a27
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/40678a27
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/40678a27

Branch: refs/heads/master
Commit: 40678a27da56cd7f396f9fd594fb319e48184946
Parents: e30ce5c
Author: Jessica Wang <jessicawang@apache.org>
Authored: Tue Jul 9 15:25:40 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Tue Jul 9 15:25:40 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/40678a27/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/40678a27/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/40678a27/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;
         }
       });


Mime
View raw message