You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2013/05/14 03:34:37 UTC

svn commit: r1482169 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/utils/helper.js ambari-web/app/views/main/service/info/menu.js

Author: jaimin
Date: Tue May 14 01:34:36 2013
New Revision: 1482169

URL: http://svn.apache.org/r1482169
Log:
AMBARI-2114. Refresh on the Service page always activates summary tab. (jaimin)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/utils/helper.js
    incubator/ambari/trunk/ambari-web/app/views/main/service/info/menu.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1482169&r1=1482168&r2=1482169&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue May 14 01:34:36 2013
@@ -850,6 +850,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2114. Refresh on the Service page always activates summary tab. (jaimin)
+
  AMBARI-2120. Add few logs to allow root-cause the issue where agent seems
  to unable to communicate with the server. (smohanty)
 

Modified: incubator/ambari/trunk/ambari-web/app/utils/helper.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/utils/helper.js?rev=1482169&r1=1482168&r2=1482169&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/utils/helper.js (original)
+++ incubator/ambari/trunk/ambari-web/app/utils/helper.js Tue May 14 01:34:36 2013
@@ -20,6 +20,10 @@ String.prototype.trim = function () {
   return this.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
 };
 
+String.prototype.endsWith = function(suffix) {
+  return this.indexOf(suffix, this.length - suffix.length) !== -1;
+};
+
 /**
  * convert ip address string to long int
  * @return {*}

Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/menu.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/menu.js?rev=1482169&r1=1482168&r2=1482169&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/menu.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/menu.js Tue May 14 01:34:36 2013
@@ -34,7 +34,7 @@ App.MainServiceInfoMenuView = Em.Collect
 
   activateView:function () {
     $.each(this._childViews, function () {
-      this.set('active', (this.get('content.routing') == 'summary' ? "active" : ""));
+      this.set('active', (document.URL.endsWith(this.get('content.routing')) ? "active" : ""));
     });
   },