UI-2369: Rename unique tab identifier to 'id' instead of 'name'

2600hz · Nov 18, 2016 · ceda35b · ceda35b
1 parent d5da83c
commit ceda35b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/apps/core/views/monster-app-navbar.html b/src/apps/core/views/monster-app-navbar.html
@@ -9,7 +9,7 @@
 	<ul class="navbar-menu{{#if float}} pull-{{float}}{{/if}}" data-menu_id="{{@index}}">
 	{{#each tabs}}
 		<li class="navbar-menu-item">
-			<a href="javascript:void(0);" class="navbar-menu-item-link{{#if default}} active{{/if}}" data-tab_id="{{@index}}"{{#if name}} data-name="{{name}}"{{/if}}>
+			<a href="javascript:void(0);" class="navbar-menu-item-link{{#if default}} active{{/if}}" data-tab_id="{{@index}}"{{#if id}} data-id="{{id}}"{{/if}}>
 				{{text}}
 			</a>
 		</li>

diff --git a/src/apps/core/views/monster-app-subnav.html b/src/apps/core/views/monster-app-subnav.html
@@ -15,7 +15,7 @@
 					<ul class="navbar-menu{{#if float}} pull-{{float}}{{/if}}" data-menu_id="{{@index}}">
 					{{#each tabs}}
 						<li class="navbar-menu-item">
-							<a href="javascript:void(0);" class="navbar-menu-item-link{{#if default}} active{{/if}}" data-tab_id="{{@index}}"{{#if name}} data-name="{{name}}"{{/if}}>
+							<a href="javascript:void(0);" class="navbar-menu-item-link{{#if default}} active{{/if}}" data-tab_id="{{@index}}"{{#if id}} data-id="{{id}}"{{/if}}>
 								{{text}}
 							</a>
 						</li>

diff --git a/src/js/lib/monster.ui.js b/src/js/lib/monster.ui.js
@@ -2021,9 +2021,9 @@ define(function(require){
 			callDefaultTabCallback();
 		},
 
-		loadTab: function(thisArg, name) {
+		loadTab: function(thisArg, id) {
 			var self = this,
-				$tab = $('.navbar-menu-item-link[data-name="' + name + '"]');
+				$tab = $('.navbar-menu-item-link[data-id="' + id + '"]');
 
 			self.onNavbarTabClick(thisArg, $tab);
 		},