summaryrefslogtreecommitdiff
path: root/src/static/js/broadcast_slider.js
diff options
context:
space:
mode:
Diffstat (limited to 'src/static/js/broadcast_slider.js')
-rw-r--r--src/static/js/broadcast_slider.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/static/js/broadcast_slider.js b/src/static/js/broadcast_slider.js
index a1418140..eff20b52 100644
--- a/src/static/js/broadcast_slider.js
+++ b/src/static/js/broadcast_slider.js
@@ -290,6 +290,11 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded)
$(document).keyup(function(e)
{
+ // If focus is on editbar, don't do anything
+ var target = $(':focus');
+ if($(target).parents(".toolbar").length === 1){
+ return;
+ }
var code = -1;
if (!e) var e = window.event;
if (e.keyCode) code = e.keyCode;