[galaxy-commits] commit/galaxy-central: guerler: scratchbook: hide on disable

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/9ddb3130b98d/ Changeset: 9ddb3130b98d User: guerler Date: 2013-07-01 01:29:04 Summary: scratchbook: hide on disable Affected #: 2 files diff -r 27a8341736452288e7324559ff74df38abaa3931 -r 9ddb3130b98d450ca2be3f447f171ff5f192b8a1 static/scripts/galaxy.frame.js --- a/static/scripts/galaxy.frame.js +++ b/static/scripts/galaxy.frame.js @@ -123,8 +123,8 @@ this.event_initialize(); // add - $(".galaxy-frame-active").tooltip({title: "Enable/Disable Scratchbook"}); - $(".galaxy-frame-load").tooltip({title: "Show/Hide Scratchbook"}); + //$(".galaxy-frame-active").tooltip({title: "Enable/Disable Scratchbook"}); + //$(".galaxy-frame-load").tooltip({title: "Show/Hide Scratchbook"}); // catch window resize event var self = this; @@ -218,7 +218,7 @@ if (this.event.type === null) return; - // prevent text selection + // prevent e.preventDefault(); // identify frame @@ -340,6 +340,9 @@ if (this.event.type !== null) return; + // prevent + e.preventDefault(); + // get frame var frame = this.event_get_frame(e.target); var self = this; @@ -375,7 +378,7 @@ if (this.event.type !== null) return; - // prevent text selection + // prevent e.preventDefault(); // get frame @@ -413,7 +416,7 @@ if (this.event.type !== null) return; - // prevent text selection + // prevent e.preventDefault(); // load panel @@ -427,7 +430,7 @@ if (this.event.type !== null) return; - // prevent text selection + // prevent e.preventDefault(); // load panel @@ -441,7 +444,7 @@ if (this.event.type !== null || !this.visible) return; - // prevent text selection + // prevent e.preventDefault(); // get wheel delta @@ -458,7 +461,7 @@ if (this.event.type !== null) return; - // prevent text selection + // prevent e.preventDefault(); // scroll up @@ -472,7 +475,7 @@ if (this.event.type !== null) return; - // prevent text selection + // prevent e.preventDefault(); // scroll down @@ -774,6 +777,10 @@ // untoggle $(".galaxy-frame-active .icon").removeClass("f-toggle"); + + // hide panel + if (this.visible) + this.panel_show_hide(); } else { // activate this.active = true; @@ -789,9 +796,6 @@ // adds and displays a new frame/window frame_new: function(options) { - // trigger mouse leave - $(document).trigger('mouseleave'); - // validate if (!this.active) { diff -r 27a8341736452288e7324559ff74df38abaa3931 -r 9ddb3130b98d450ca2be3f447f171ff5f192b8a1 static/style/blue/galaxy.frame.css --- a/static/style/blue/galaxy.frame.css +++ b/static/style/blue/galaxy.frame.css @@ -95,7 +95,7 @@ z-index : 34010; position : absolute; top : 6px; - right : 165px; + right : 170px; cursor : pointer; color : #BCC800; } 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.