diff --git a/web/app/assets/javascripts/react-components/PopupMediaControls.js.jsx.coffee b/web/app/assets/javascripts/react-components/PopupMediaControls.js.jsx.coffee index 59a068003..c92653bd1 100644 --- a/web/app/assets/javascripts/react-components/PopupMediaControls.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/PopupMediaControls.js.jsx.coffee @@ -16,6 +16,7 @@ if window.opener? if accessOpener + AppActions = window.opener.AppActions SessionActions = window.opener.SessionActions MixerActions = window.opener.MixerActions MixerStore = window.opener.MixerStore @@ -95,6 +96,10 @@ mixins.push(Reflux.listenTo(JamTrackStore, 'onJamTrackChanged')) close: () -> window.close() + help: (e) -> + e.preventDefault() + + AppActions.openExternalUrl($(e.target).attr('href')) render: () -> @@ -115,6 +120,7 @@ mixins.push(Reflux.listenTo(JamTrackStore, 'onJamTrackChanged')) mediaType = "JamTrack" mediaName = jamTrack.name closeLinkText = 'CLOSE JAMTRACK' + helpLink = 'https://jamkazam.desk.com/customer/portal/articles/2138903-using-custom-mixes-to-slow-tempo-change-pitch' selectedMixdown = jamTrack.activeMixdown @@ -392,11 +398,17 @@ mixins.push(Reflux.listenTo(JamTrackStore, 'onJamTrackChanged')) else mediaType = "" + if helpLink? + helpButton = `HELP` + `
` windowUnloaded: () -> diff --git a/web/app/assets/javascripts/react-components/actions/AppActions.js.coffee b/web/app/assets/javascripts/react-components/actions/AppActions.js.coffee index 6c054e3ec..dbe55b7e4 100644 --- a/web/app/assets/javascripts/react-components/actions/AppActions.js.coffee +++ b/web/app/assets/javascripts/react-components/actions/AppActions.js.coffee @@ -2,4 +2,5 @@ context = window @AppActions = Reflux.createActions({ appInit: {} + openExternalUrl: {} }) diff --git a/web/app/assets/javascripts/react-components/stores/AppStore.js.coffee b/web/app/assets/javascripts/react-components/stores/AppStore.js.coffee index bb5a11d98..887a38326 100644 --- a/web/app/assets/javascripts/react-components/stores/AppStore.js.coffee +++ b/web/app/assets/javascripts/react-components/stores/AppStore.js.coffee @@ -8,5 +8,9 @@ logger = context.JK.logger onAppInit: (app) -> @trigger(app) + + onOpenExternalUrl: (href) -> + + context.JK.popExternalLink(href) } ) diff --git a/web/app/assets/stylesheets/minimal/media_controls.css.scss b/web/app/assets/stylesheets/minimal/media_controls.css.scss index 8545aea86..72d065b77 100644 --- a/web/app/assets/stylesheets/minimal/media_controls.css.scss +++ b/web/app/assets/stylesheets/minimal/media_controls.css.scss @@ -33,10 +33,21 @@ body.media-controls-popup.popup { margin-bottom:5px; } - .close-link { + .actions { + position:relative; margin-top:20px; font-size:11px; margin-bottom:10px; + + } + + .help-link { + position:absolute; + left:8px; + top:0; + } + .close-link { + } .display-metronome {