From 7ff9c2885de6b50f87166e9d2dc83539101c6639 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Thu, 29 Sep 2016 23:46:55 +0100 Subject: [PATCH] Fix scrollable tab buttons changing location hash --- editor/js/ui/common/tabs.js | 4 ++-- editor/sass/tabs.scss | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/editor/js/ui/common/tabs.js b/editor/js/ui/common/tabs.js index 9d4453faf..608b76e2b 100644 --- a/editor/js/ui/common/tabs.js +++ b/editor/js/ui/common/tabs.js @@ -43,9 +43,9 @@ RED.tabs = (function() { scrollContainer.addClass("red-ui-tabs-scroll-container"); scrollContainer.scroll(updateScroll); scrollLeft = $('
').appendTo(wrapper).find("a"); - scrollLeft.on('mousedown',function(evt) { scrollEventHandler(evt,'-=150') }); + scrollLeft.on('mousedown',function(evt) { scrollEventHandler(evt,'-=150') }).on('click',function(evt){ evt.preventDefault();}); scrollRight = $('
').appendTo(wrapper).find("a"); - scrollRight.on('mousedown',function(evt) { scrollEventHandler(evt,'+=150') }); + scrollRight.on('mousedown',function(evt) { scrollEventHandler(evt,'+=150') }).on('click',function(evt){ evt.preventDefault();}); } function scrollEventHandler(evt,dir) { evt.preventDefault(); diff --git a/editor/sass/tabs.scss b/editor/sass/tabs.scss index c848459e2..5c2697788 100644 --- a/editor/sass/tabs.scss +++ b/editor/sass/tabs.scss @@ -122,7 +122,7 @@ height: 35px; background: #fff; border-bottom: 1px solid $primary-border-color; - z-index: 3; + z-index: 2; a { @include workspace-button; @@ -133,7 +133,7 @@ margin-right:3px; margin-left:3px; border: 1px solid $primary-border-color; - z-index: 3; + z-index: 2; } }