Merge pull request #297 from x-team/issue-288

Issue 288: Minor glitch in UI when switching between Settings tabs
xwp · Mar 5, 2014 · 949511c · 949511c
2 parents 30d72ea + ffad95e
commit 949511c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ui/admin.css b/ui/admin.css
@@ -200,3 +200,7 @@
 .toplevel_page_wp_stream .new-row.fadeout {
 	background-color: transparent;
 }
+
+.stream_page_wp_stream_settings .nav-tab-wrapper a:not(.nav-tab-active) {
+    border-bottom: 1px solid #ccc;
+}
diff --git a/ui/admin.js b/ui/admin.js
@@ -84,13 +84,13 @@ jQuery(function($){
 			$optionsForm.prop('action', currentAction.replace( /(^[^#]*).*$/, '$1#' + index ));
 		};
 
-	$tabs.on('click', 'a', function(e){
-		e.preventDefault();
+	$tabs.on('click', 'a', function(){
 		var index = $tabs.find('a').index( $(this) );
 		$panels.hide().eq(index).show();
 		$tabs.find('a').removeClass('nav-tab-active').filter($(this)).addClass('nav-tab-active');
 		window.location.hash = index;
 		syncFormAction(index);
+		return false;
 	});
 	$tabs.children().eq( currentHash ).trigger('click');