1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/d4372175b7fc/
Changeset: d4372175b7fc
User: guerler
Date: 2013-06-26 17:04:54
Summary: Fix Scratchbook Scrolling
Affected #: 1 file
diff -r 870ed28587032d80fd955ca31c94bf0977f86165 -r
d4372175b7fcf2b61a1e6c8caeb1a1b5dc891e60 static/scripts/galaxy.frame.js
--- a/static/scripts/galaxy.frame.js
+++ b/static/scripts/galaxy.frame.js
@@ -161,17 +161,20 @@
/*if (!this.is_mobile())
{*/
this.events = {
+ // global page events
'mousedown' :
'event_frame_mouse_down',
- 'mousedown .f-close' :
'event_frame_close',
- 'mousedown .f-pin' :
'event_frame_lock',
'mousemove' :
'event_frame_mouse_move',
'mouseup' :
'event_frame_mouse_up',
'mouseleave' :
'event_frame_mouse_up',
+ 'mousewheel' :
'event_panel_scroll',
+ 'DOMMouseScroll' :
'event_panel_scroll',
+
+ // events fixed to elements
+ 'mousedown .f-close' :
'event_frame_close',
+ 'mousedown .f-pin' :
'event_frame_lock',
'mousedown .galaxy-frame-active' :
'event_panel_active',
'mousedown .galaxy-frame-load' :
'event_panel_load',
'mousedown .galaxy-frame-background' :
'event_panel_load',
- 'mousewheel' :
'event_panel_scroll',
- 'DOMMouseScroll' :
'event_panel_scroll',
'mousedown .galaxy-frame-scroll-up' :
'event_panel_scroll_up',
'mousedown .galaxy-frame-scroll-down' :
'event_panel_scroll_down'
};
@@ -421,6 +424,10 @@
// scroll
event_panel_scroll: function(e)
{
+ // check
+ if (this.event.type !== null || !this.visible)
+ return;
+
// get wheel delta
var delta = e.originalEvent.detail ? e.originalEvent.detail :
e.originalEvent.wheelDelta / -3;
@@ -431,12 +438,22 @@
// scroll up
event_panel_scroll_up: function()
{
+ // check
+ if (this.event.type !== null)
+ return;
+
+ // scroll up
this.panel_scroll(-this.options.scroll);
},
// scroll down
event_panel_scroll_down: function()
{
+ // check
+ if (this.event.type !== null)
+ return;
+
+ // scroll down
this.panel_scroll(this.options.scroll);
},
Repository URL:
https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from
bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.