ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject git commit: AMBARI-7200 Views icon should highlight in the top nav when the user is on the views landing page or a particular view. (ababiichuk)
Date Mon, 08 Sep 2014 15:18:24 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 7c8299b1c -> d4a263c6d


AMBARI-7200 Views icon should highlight in the top nav when the user is on the views landing
page or a particular view. (ababiichuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d4a263c6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d4a263c6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d4a263c6

Branch: refs/heads/trunk
Commit: d4a263c6d1628130fee4108e193f4ec819899856
Parents: 7c8299b
Author: aBabiichuk <ababiichuk@cybervisiontech.com>
Authored: Mon Sep 8 18:11:45 2014 +0300
Committer: aBabiichuk <ababiichuk@cybervisiontech.com>
Committed: Mon Sep 8 18:11:45 2014 +0300

----------------------------------------------------------------------
 ambari-web/app/views/main/menu.js | 48 ++++++++++++----------------------
 1 file changed, 16 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/d4a263c6/ambari-web/app/views/main/menu.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/menu.js b/ambari-web/app/views/main/menu.js
index eb5a901..4e4fd3f 100644
--- a/ambari-web/app/views/main/menu.js
+++ b/ambari-web/app/views/main/menu.js
@@ -34,9 +34,7 @@ App.MainMenuView = Em.CollectionView.extend({
     var result = [];
     if (App.router.get('loggedIn')) {
 
-      if (App.router.get('clusterController.isLoaded')) {
-
-        if (App.get('clusterName')) {
+      if (App.router.get('clusterController.isLoaded') && App.get('clusterName'))
{
 
           result.push(
             { label:Em.I18n.t('menu.item.dashboard'), routing:'dashboard', active:'active'},
@@ -55,8 +53,6 @@ App.MainMenuView = Em.CollectionView.extend({
           if (App.get('isAdmin')) {
             result.push({ label:Em.I18n.t('menu.item.admin'), routing:'admin'});
           }
-
-        }
       }
 
       if (App.get('supports.views')) {
@@ -68,35 +64,23 @@ App.MainMenuView = Em.CollectionView.extend({
   }.property('App.router.loggedIn', 'App.router.clusterController.isLoaded', 'App.supports.views',
'App.supports.mirroring',
       'App.supports.secureCluster', 'App.supports.highAvailability', 'views.length'),
 
-    /**
-     *    Adds observer on lastSetURL and calls navigation sync procedure
-     */
-  didInsertElement:function () {
-    this.renderOnRoute();
-  },
-
-  /**
-   *    Syncs navigation menu with requested URL
-   */
-  renderOnRoute: function () {
-    if (App.get('clusterName') && App.router.get('clusterController.isLoaded')) {
-      var last_url = App.router.location.lastSetURL || location.href.replace(/^[^#]*#/, '');
-      if (last_url.substr(1, 4) !== 'main' || !this._childViews) {
-        return;
-      }
-      var reg = /^\/main\/([a-z]+)/g;
-      var sub_url = reg.exec(last_url);
-      var chunk = (null != sub_url) ? sub_url[1] : 'dashboard';
-      $.each(this._childViews, function () {
-        this.set('active', this.get('content.routing') == chunk ? "active" : "");
-      });
-    }
-  }.observes('App.router.location.lastSetURL', 'App.router.clusterController.isLoaded'),
-
   itemViewClass:Em.View.extend({
 
-    classNameBindings:['active', ':top-nav-dropdown'],
-    active:'',
+    classNameBindings: ['active', ':top-nav-dropdown'],
+
+    active: function () {
+      if (App.get('clusterName') && App.router.get('clusterController.isLoaded'))
{
+        var last_url = App.router.location.lastSetURL || location.href.replace(/^[^#]*#/,
'');
+        if (last_url.substr(1, 4) !== 'main' || !this._childViews) {
+          return;
+        }
+        var reg = /^\/main\/([a-z]+)/g;
+        var sub_url = reg.exec(last_url);
+        var chunk = (null != sub_url) ? sub_url[1] : 'dashboard';
+        return this.get('content.routing').indexOf(chunk) === 0 ? "active" : "";
+      }
+      return "";
+    }.property('App.router.location.lastSetURL', 'App.router.clusterController.isLoaded'),
 
     alertsCount:function () {
       if (this.get('content').routing == 'hosts') {


Mime
View raw message