Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C4385F829 for ; Thu, 11 Apr 2013 20:39:22 +0000 (UTC) Received: (qmail 85809 invoked by uid 500); 11 Apr 2013 20:39:22 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 85779 invoked by uid 500); 11 Apr 2013 20:39:22 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 85726 invoked by uid 99); 11 Apr 2013 20:39:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Apr 2013 20:39:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5171F880CF0; Thu, 11 Apr 2013 20:39:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jessicawang@apache.org To: commits@cloudstack.apache.org Date: Thu, 11 Apr 2013 20:39:22 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/master to 5f8a278 CLOUDSTACK-1065: cloudstack UI - AWS Style Regions - make loginCmdText local. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5f8a2781 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5f8a2781 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5f8a2781 Branch: refs/heads/master Commit: 5f8a2781967971e28bc2751d0903d9c99ea4e28e Parents: b1f67a0 Author: Jessica Wang Authored: Thu Apr 11 13:38:25 2013 -0700 Committer: Jessica Wang Committed: Thu Apr 11 13:39:04 2013 -0700 ---------------------------------------------------------------------- ui/scripts/cloudStack.js | 4 ++-- ui/scripts/ui-custom/regions.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5f8a2781/ui/scripts/cloudStack.js ---------------------------------------------------------------------- diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js index 0cf80b0..a8bca91 100644 --- a/ui/scripts/cloudStack.js +++ b/ui/scripts/cloudStack.js @@ -255,11 +255,11 @@ array1.push("&domain=" + encodeURIComponent("/")); } - g_loginCmdText = array1.join(""); + var loginCmdText = array1.join(""); $.ajax({ type: "POST", - data: "command=login" + g_loginCmdText + "&response=json", + data: "command=login" + loginCmdText + "&response=json", dataType: "json", async: false, success: function(json) { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5f8a2781/ui/scripts/ui-custom/regions.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui-custom/regions.js b/ui/scripts/ui-custom/regions.js index 2f61dfd..0469638 100644 --- a/ui/scripts/ui-custom/regions.js +++ b/ui/scripts/ui-custom/regions.js @@ -89,7 +89,7 @@ closeRegionSelector({ complete: function() { $('#container').prepend($('
').addClass('loading-overlay')); - window.name = g_loginCmdText; + //window.name = g_loginCmdText; document.location.href = url; } });