| Still Needed: |
-
+
-
+
{open_slots_remaining}
@@ -346,13 +346,13 @@ SessionUtils = context.JK.SessionUtils
`
| RSVPs: |
-
+
-
+
{rsvp_musicians_remaining}
@@ -485,7 +485,7 @@ SessionUtils = context.JK.SessionUtils
`
{remark}
-
+
| {name} |
@@ -505,7 +505,7 @@ SessionUtils = context.JK.SessionUtils
-
+
{inSessionMusicians}
{rsvps}
@@ -522,4 +522,4 @@ SessionUtils = context.JK.SessionUtils
`
-})
\ No newline at end of file
+})
diff --git a/web/app/assets/javascripts/react-components/JamBlasterScreen.js.jsx.coffee b/web/app/assets/javascripts/react-components/JamBlasterScreen.js.jsx.coffee
index b6467f523..4df4ecbde 100644
--- a/web/app/assets/javascripts/react-components/JamBlasterScreen.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/JamBlasterScreen.js.jsx.coffee
@@ -72,7 +72,7 @@ JamBlasterActions = @JamBlasterActions
@setState({userdhcp: "true" == value})
- componentWillUpdate: (nextProps, nextState) ->
+ UNSAFE_componentWillUpdate: (nextProps, nextState) ->
if @networkStale && @state.pairedJamBlaster?
console.log("stale network update", @state)
nextState.userdhcp = @state.pairedJamBlaster.network?.dhcp
@@ -450,4 +450,4 @@ JamBlasterActions = @JamBlasterActions
`
-})
\ No newline at end of file
+})
diff --git a/web/app/assets/javascripts/react-components/JamTrackAutoComplete.js.jsx.coffee b/web/app/assets/javascripts/react-components/JamTrackAutoComplete.js.jsx.coffee
index a38252509..c20b0695b 100644
--- a/web/app/assets/javascripts/react-components/JamTrackAutoComplete.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/JamTrackAutoComplete.js.jsx.coffee
@@ -1,5 +1,6 @@
context = window
MIX_MODES = context.JK.MIX_MODES
+SelectComponent = window.Select
@JamTrackAutoComplete = React.createClass({
@@ -16,19 +17,29 @@ MIX_MODES = context.JK.MIX_MODES
searchValue = if @state.search == 'SEPARATOR' then '' else window.JamTrackSearchInput
- ``
+ else
+ ``
getDefaultProps: () ->
@@ -39,6 +50,25 @@ MIX_MODES = context.JK.MIX_MODES
filterOption:() ->
true
+ onFallbackChange: (e) ->
+ window.JamTrackSearchInput = e.target.value
+ @setState({search: e.target.value})
+
+ onFallbackKeyDown: (e) ->
+ return unless e.keyCode == 13
+ e.preventDefault()
+ @triggerFallbackSearch()
+
+ triggerFallbackSearch: () ->
+ return unless window.JamTrackSearchInput? && window.JamTrackSearchInput.length > 0
+
+ if typeof @props.onSearch is 'string'
+ searchFunction = eval(@props.onSearch)
+ else
+ searchFunction = @props.onSearch
+
+ searchFunction('user-input', window.JamTrackSearchInput)
+
onSelectChange: (val) ->
#@logger.debug("CHANGE #{val}")
@@ -111,4 +141,4 @@ MIX_MODES = context.JK.MIX_MODES
callback(null, {options: options, complete: false})
)
-})
\ No newline at end of file
+})
diff --git a/web/app/assets/javascripts/react-components/LessonBooking.js.jsx.coffee b/web/app/assets/javascripts/react-components/LessonBooking.js.jsx.coffee
index ed74fafbe..8e0b865b9 100644
--- a/web/app/assets/javascripts/react-components/LessonBooking.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/LessonBooking.js.jsx.coffee
@@ -25,7 +25,7 @@ UserStore = context.UserStore
onUpdateAllDecision: (update_all) ->
@setState({update_all: update_all?.update_all})
- componentWillMount: () ->
+ UNSAFE_componentWillMount: () ->
componentDidMount: () ->
@checkboxes = [{selector: 'input.slot-decision', stateKey: 'slot-decision'}]
@@ -93,7 +93,7 @@ UserStore = context.UserStore
booking.onlyOption = onlyOption
#nextProps.slot_decision = 'counter'
- componentWillUpdate: (nextProps, nextState) ->
+ UNSAFE_componentWillUpdate: (nextProps, nextState) ->
if nextState.booking?
booking = nextState.booking
if !booking.post_processed
@@ -1141,4 +1141,4 @@ UserStore = context.UserStore
`
-})
\ No newline at end of file
+})
diff --git a/web/app/assets/javascripts/react-components/ManageVstsDialog.js.jsx.coffee b/web/app/assets/javascripts/react-components/ManageVstsDialog.js.jsx.coffee
index 508fb203c..d3a712129 100644
--- a/web/app/assets/javascripts/react-components/ManageVstsDialog.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/ManageVstsDialog.js.jsx.coffee
@@ -79,10 +79,10 @@ ConfigureTracksActions = @ConfigureTracksActions
componentDidMount: () ->
$root = $(@getDOMNode())
- componentWillUpdate: () ->
+ UNSAFE_componentWillUpdate: () ->
@ignoreICheck = true
$root = $(@getDOMNode())
componentDidUpdate: () ->
$root = $(@getDOMNode())
-})
\ No newline at end of file
+})
diff --git a/web/app/assets/javascripts/react-components/TeacherExperienceEditableList.js.jsx.coffee b/web/app/assets/javascripts/react-components/TeacherExperienceEditableList.js.jsx.coffee
index f21101986..3e11dc0c7 100644
--- a/web/app/assets/javascripts/react-components/TeacherExperienceEditableList.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/TeacherExperienceEditableList.js.jsx.coffee
@@ -3,7 +3,7 @@ rest = window.JK.Rest()
logger = context.JK.logger
@TeacherExperienceEditableList = React.createClass({
- componentDidUnmount: () ->
+ componentWillUnmount: () ->
@root.off("submit", ".teacher-experience-teaching-form")
componentDidMount: () ->
@@ -88,16 +88,16 @@ logger = context.JK.logger
`
-})
\ No newline at end of file
+})
diff --git a/web/app/assets/javascripts/react-components/TeacherSetupPricing.js.jsx.coffee b/web/app/assets/javascripts/react-components/TeacherSetupPricing.js.jsx.coffee
index 5178559e5..72ea91bde 100644
--- a/web/app/assets/javascripts/react-components/TeacherSetupPricing.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/TeacherSetupPricing.js.jsx.coffee
@@ -11,7 +11,7 @@ rest = window.JK.Rest()
]
iCheckIgnore: false
- componentDidUnmount: () ->
+ componentWillUnmount: () ->
@root.off("change", ".checkbox-enabler")
componentDidMount: () ->
@@ -220,8 +220,7 @@ rest = window.JK.Rest()
key={priceKey}
checked={this.state[priceKey]}
onChange={this.handleCheckChange}
- ref={priceKey}>
-
+ ref={priceKey} />
@@ -245,8 +244,7 @@ rest = window.JK.Rest()
onBlur={this.captureCurrency}
onChange={this.handleTextChange}
onFocus={this.handleFocus}
- disabled={!lessonEnabled}>
-
+ disabled={!lessonEnabled} />
$
-
+ disabled={!monthlyEnabled} />
@@ -274,12 +271,12 @@ rest = window.JK.Rest()
Offer Lessons Pricing & Payments:
-
+
-
+
@@ -312,7 +309,7 @@ rest = window.JK.Rest()
TestDrive Program:
-
+
@@ -327,4 +324,4 @@ rest = window.JK.Rest()
`
-})
\ No newline at end of file
+})
diff --git a/web/app/assets/javascripts/react-components/TeacherStudentLevel.js.jsx.coffee b/web/app/assets/javascripts/react-components/TeacherStudentLevel.js.jsx.coffee
index 5048714f1..9324447d3 100644
--- a/web/app/assets/javascripts/react-components/TeacherStudentLevel.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/TeacherStudentLevel.js.jsx.coffee
@@ -27,7 +27,7 @@ logger = context.JK.logger
render: () ->
`
-
+
{this.props.display}
`
@@ -39,6 +39,6 @@ logger = context.JK.logger
getInitialState: () ->
{checked:@props.level}
- componentWillReceiveProps: (nextProps) ->
+ UNSAFE_componentWillReceiveProps: (nextProps) ->
@setState({checked: nextProps.level})
-})
\ No newline at end of file
+})
diff --git a/web/app/assets/javascripts/react-components/TryTestDriveDialog.js.jsx.coffee b/web/app/assets/javascripts/react-components/TryTestDriveDialog.js.jsx.coffee
index bc541ed9d..9dbe15047 100644
--- a/web/app/assets/javascripts/react-components/TryTestDriveDialog.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/TryTestDriveDialog.js.jsx.coffee
@@ -90,10 +90,10 @@ ConfigureTracksActions = @ConfigureTracksActions
componentDidMount: () ->
$root = $(@getDOMNode())
- componentWillUpdate: () ->
+ UNSAFE_componentWillUpdate: () ->
@ignoreICheck = true
$root = $(@getDOMNode())
componentDidUpdate: () ->
$root = $(@getDOMNode())
-})
\ No newline at end of file
+})
diff --git a/web/app/assets/javascripts/react-components/UploadAvatarDialog.js.jsx.coffee b/web/app/assets/javascripts/react-components/UploadAvatarDialog.js.jsx.coffee
index 315f3193e..56a5f7f90 100644
--- a/web/app/assets/javascripts/react-components/UploadAvatarDialog.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/UploadAvatarDialog.js.jsx.coffee
@@ -38,9 +38,9 @@ context = window
componentDidMount: () ->
$root = $(@getDOMNode())
- componentWillUpdate: () ->
+ UNSAFE_componentWillUpdate: () ->
$root = $(@getDOMNode())
componentDidUpdate: () ->
$root = $(@getDOMNode())
-})
\ No newline at end of file
+})
diff --git a/web/app/assets/javascripts/react-components/stores/WebcamViewer.js.jsx.coffee b/web/app/assets/javascripts/react-components/stores/WebcamViewer.js.jsx.coffee
index 60ec85880..29e564187 100644
--- a/web/app/assets/javascripts/react-components/stores/WebcamViewer.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/stores/WebcamViewer.js.jsx.coffee
@@ -74,6 +74,7 @@ mixins.push(Reflux.listenTo(VideoStore, 'onVideoStateChanged'))
backBtn = `BACK`
selectedDevice = this.selectedDeviceName(@state)
+ selectedDeviceValue = selectedDevice || ''
# build list of webcams
@@ -82,11 +83,10 @@ mixins.push(Reflux.listenTo(VideoStore, 'onVideoStateChanged'))
# the backend does not allow setting no video camera. So if a webcam is selected, prevent un-selecting
if noneSelected
- webcams.push ``
+ webcams.push ``
context._.each @state.deviceNames, (deviceName, deviceGuid) ->
- selected = deviceGuid == selectedDevice
- webcams.push ``
+ webcams.push ``
noWebcams = Object.keys(@state.deviceNames).length == 0
@@ -101,10 +101,7 @@ mixins.push(Reflux.listenTo(VideoStore, 'onVideoStateChanged'))
value = resolutionKey
text = resolution
-
- selected = captureResolution.toString() == value.toString()
-
- captureResolutions.push ``
+ captureResolutions.push ``
testBtnClassNames = {'button-orange' : true, 'webcam-test-btn' : true}
@@ -172,13 +169,13 @@ mixins.push(Reflux.listenTo(VideoStore, 'onVideoStateChanged'))
| | | |