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 <[email protected]> Authored: Thu Oct 2 14:43:10 2014 -0700 Committer: Jessica Wang <[email protected]> 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();
