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 0047D1736B for ; Mon, 13 Oct 2014 04:41:30 +0000 (UTC) Received: (qmail 20201 invoked by uid 500); 13 Oct 2014 04:41:19 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 20070 invoked by uid 500); 13 Oct 2014 04:41:19 -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 19555 invoked by uid 99); 13 Oct 2014 04:41:19 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Oct 2014 04:41:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DD3BA90453F; Mon, 13 Oct 2014 04:41:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ke4qqq@apache.org To: commits@cloudstack.apache.org Date: Mon, 13 Oct 2014 04:41:30 -0000 Message-Id: <482b13b2b0a6474ea7c97dd6e6fe555d@git.apache.org> In-Reply-To: <6e970e9d4fb34ec3806772577f9fed13@git.apache.org> References: <6e970e9d4fb34ec3806772577f9fed13@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/50] [abbrv] git commit: updated refs/heads/4.5 to 50ee981 CLOUDSTACK-7668: UI > When UI is loaded the first time, sometimes a blank screen instead of a login screen shows. Only after clicking Refresh button(i.e. loaded again) will the login screen show. (cherry picked from commit 53d5e8af1833b7992b48638b7a63a918adf65aee) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a9761a3e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a9761a3e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a9761a3e Branch: refs/heads/4.5 Commit: a9761a3eb3a7a7820b18499d5ecc900f4b526e21 Parents: 5f79fa3 Author: Jessica Wang Authored: Thu Oct 2 14:43:10 2014 -0700 Committer: David Nalley Committed: Mon Oct 13 00:26:35 2014 -0400 ---------------------------------------------------------------------- ui/scripts/cloudStack.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a9761a3e/ui/scripts/cloudStack.js ---------------------------------------------------------------------- diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js index a2e4dc2..ea6fc16 100644 --- a/ui/scripts/cloudStack.js +++ b/ui/scripts/cloudStack.js @@ -496,8 +496,9 @@ } //added for dictionary split up - - $.extend(dictionary,dictionary2); + if (dictionary != undefined && dictionary2 != undefined) { + $.extend(dictionary,dictionary2); + } // Localize validation messages cloudStack.localizeValidatorMessages();