From 0416ad01f1049ce46279411bb7f8bd2ba2040219 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Mon, 28 Dec 2015 12:43:50 -0600 Subject: [PATCH] * hover over vst instead of click, and fix placement of midi help link --- web/app/assets/javascripts/jquery.trackEffects.js | 10 +++++++++- .../ConfigureLiveTracksDialog.js.jsx.coffee | 7 +++++-- .../dialogs/configureLiveTracksDialog.css.scss | 8 +++++++- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/web/app/assets/javascripts/jquery.trackEffects.js b/web/app/assets/javascripts/jquery.trackEffects.js index b0a15c74e..1fb34f8ea 100644 --- a/web/app/assets/javascripts/jquery.trackEffects.js +++ b/web/app/assets/javascripts/jquery.trackEffects.js @@ -65,9 +65,17 @@ timeout = null; } waitForBubbleHover($(container)) - timeout = setTimeout(function() {$parent.btOff()}, 3000) + timeout = setTimeout(function() {/**$parent.btOff()*/}, 3000) } }); + + $parent.hoverIntent({ + over: function() { + $parent.btOn(); + }, + out: function() { + + }}); }); } diff --git a/web/app/assets/javascripts/react-components/ConfigureLiveTracksDialog.js.jsx.coffee b/web/app/assets/javascripts/react-components/ConfigureLiveTracksDialog.js.jsx.coffee index 8ea01a880..44436da27 100644 --- a/web/app/assets/javascripts/react-components/ConfigureLiveTracksDialog.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/ConfigureLiveTracksDialog.js.jsx.coffee @@ -216,8 +216,11 @@ ConfigureTracksStore = @ConfigureTracksStore if isAudio activeElement = @renderAudio() + scanHelpRight = `Don't see your plug-in in the list above?` else activeElement = @renderMidi() + scanHelpLeft = `Don't see your plug-in in the list above?` + if !@state.configureTracks?.newTrack action = 'CLOSE' @@ -225,7 +228,6 @@ ConfigureTracksStore = @ConfigureTracksStore else cancelBtn = `CANCEL` - scanHelp = `Don't see your plug-in in the list above?` `
@@ -237,9 +239,10 @@ ConfigureTracksStore = @ConfigureTracksStore {activeElement}
+ {scanHelpLeft} {cancelBtn} {action} - {scanHelp} + {scanHelpRight}
` diff --git a/web/app/assets/stylesheets/dialogs/configureLiveTracksDialog.css.scss b/web/app/assets/stylesheets/dialogs/configureLiveTracksDialog.css.scss index a811d4d6f..86dd1879c 100644 --- a/web/app/assets/stylesheets/dialogs/configureLiveTracksDialog.css.scss +++ b/web/app/assets/stylesheets/dialogs/configureLiveTracksDialog.css.scss @@ -20,7 +20,13 @@ font-size: 12px; margin-top: 2px; position: absolute; - right: 60px; + + &.left-side{ + left:35px; + } + &.right-side { + right: 60px; + } } .initial-scan { margin-top:20px;