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 5F1F6175EA for ; Thu, 2 Oct 2014 21:43:34 +0000 (UTC) Received: (qmail 84610 invoked by uid 500); 2 Oct 2014 21:43:34 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 84580 invoked by uid 500); 2 Oct 2014 21:43:34 -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 84571 invoked by uid 99); 2 Oct 2014 21:43:33 -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, 02 Oct 2014 21:43:33 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B4B8CA17E5A; Thu, 2 Oct 2014 21:43:33 +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 Message-Id: <61fcb595171e46d495ffd2e67e677fa3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 53d5e8a Date: Thu, 2 Oct 2014 21:43:33 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master 0ef6cd36c -> 53d5e8af1 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. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/53d5e8af Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/53d5e8af Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/53d5e8af Branch: refs/heads/master Commit: 53d5e8af1833b7992b48638b7a63a918adf65aee Parents: 0ef6cd3 Author: Jessica Wang Authored: Thu Oct 2 14:43:10 2014 -0700 Committer: Jessica Wang Committed: Thu Oct 2 14:43:22 2014 -0700 ---------------------------------------------------------------------- ui/scripts/cloudStack.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/53d5e8af/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();