Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id DD9C7200C44 for ; Mon, 13 Mar 2017 07:24:35 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id D9892160B87; Mon, 13 Mar 2017 06:24:35 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2DD0B160B77 for ; Mon, 13 Mar 2017 07:24:35 +0100 (CET) Received: (qmail 91941 invoked by uid 500); 13 Mar 2017 06:24:33 -0000 Mailing-List: contact commits-help@eagle.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@eagle.apache.org Delivered-To: mailing list commits@eagle.apache.org Received: (qmail 91932 invoked by uid 99); 13 Mar 2017 06:24:33 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Mar 2017 06:24:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8ADF0DFE61; Mon, 13 Mar 2017 06:24:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hao@apache.org To: commits@eagle.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: eagle git commit: [EAGLE-951] adjust the UI Date: Mon, 13 Mar 2017 06:24:33 +0000 (UTC) archived-at: Mon, 13 Mar 2017 06:24:36 -0000 Repository: eagle Updated Branches: refs/heads/master 56c2b8a6f -> a71a36bf4 [EAGLE-951] adjust the UI * Remove 'Back' in site level view. * Move integration out of user panel. * Fix site level widget first time no loading Author: zombieJ Closes #867 from zombieJ/EAGLE-951. Project: http://git-wip-us.apache.org/repos/asf/eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/eagle/commit/a71a36bf Tree: http://git-wip-us.apache.org/repos/asf/eagle/tree/a71a36bf Diff: http://git-wip-us.apache.org/repos/asf/eagle/diff/a71a36bf Branch: refs/heads/master Commit: a71a36bf4ea212e23ac21c117adae51568e13295 Parents: 56c2b8a Author: zombieJ Authored: Mon Mar 13 14:24:19 2017 +0800 Committer: Hao Chen Committed: Mon Mar 13 14:24:19 2017 +0800 ---------------------------------------------------------------------- eagle-server/src/main/webapp/app/dev/index.html | 6 ++-- .../app/dev/public/js/services/pageSrv.js | 5 ---- .../app/dev/public/js/services/siteSrv.js | 29 +++++++++++++++----- 3 files changed, 25 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/eagle/blob/a71a36bf/eagle-server/src/main/webapp/app/dev/index.html ---------------------------------------------------------------------- diff --git a/eagle-server/src/main/webapp/app/dev/index.html b/eagle-server/src/main/webapp/app/dev/index.html index e9c48a6..24e80c1 100644 --- a/eagle-server/src/main/webapp/app/dev/index.html +++ b/eagle-server/src/main/webapp/app/dev/index.html @@ -148,6 +148,9 @@

+ +

Integration -

Sign out

http://git-wip-us.apache.org/repos/asf/eagle/blob/a71a36bf/eagle-server/src/main/webapp/app/dev/public/js/services/pageSrv.js ---------------------------------------------------------------------- diff --git a/eagle-server/src/main/webapp/app/dev/public/js/services/pageSrv.js b/eagle-server/src/main/webapp/app/dev/public/js/services/pageSrv.js index 2faa059..99cf534 100644 --- a/eagle-server/src/main/webapp/app/dev/public/js/services/pageSrv.js +++ b/eagle-server/src/main/webapp/app/dev/public/js/services/pageSrv.js @@ -81,10 +81,6 @@ // = Portal = // ============================================================ serviceModule.service('Portal', function($wrapState, Site, Application, Auth) { - function checkSite() { - return Site.list.length !== 0; - } - var defaultPortalList = [ {name: "Overview", icon: "home", path: "#/"}, ]; @@ -114,7 +110,6 @@ } return[ - {name: "Back", icon: "arrow-left", path: "#/"}, {name: site.siteName || site.siteId + " Home", icon: "home", path: "#/site/" + site.siteId}, {name: "Alert", icon: "bell", list: alertPortal}, ]; http://git-wip-us.apache.org/repos/asf/eagle/blob/a71a36bf/eagle-server/src/main/webapp/app/dev/public/js/services/siteSrv.js ---------------------------------------------------------------------- diff --git a/eagle-server/src/main/webapp/app/dev/public/js/services/siteSrv.js b/eagle-server/src/main/webapp/app/dev/public/js/services/siteSrv.js index b4aa622..4c76ffe 100644 --- a/eagle-server/src/main/webapp/app/dev/public/js/services/siteSrv.js +++ b/eagle-server/src/main/webapp/app/dev/public/js/services/siteSrv.js @@ -55,13 +55,17 @@ } // Load sites + function notifyListener() { + $.each(reloadListenerList, function (i, listener) { + listener(Site); + }); + } + Site.reload = function () { var list = Site.list = Entity.query('sites'); list._promise.then(function () { linkApplications(list, Application.list); - $.each(reloadListenerList, function (i, listener) { - listener(Site); - }); + notifyListener(); }); return Site; }; @@ -111,12 +115,23 @@ }; // Initialization - Application.onReload(function () { - Site.reload(); - }); - Site.reload(); + (function () { + Application.getPromise().then(function () { + Application.onReload(function () { + Site.reload(); + }); + }); + + // Call listener at first time when site & application is ready + var siteList = Site.list; + $q.all([siteList._promise, Application.getPromise()]).then(function() { + linkApplications(siteList, Application.list); + notifyListener(); + }); + })(); + return Site; }); }());