diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-07-17 14:18:26 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-07-17 14:18:26 -0400 |
| commit | c175b8b78cad5424f81370e721277b18af6aff92 (patch) | |
| tree | 18d52ab439b4afb91e454d303ed4f45aee2602a0 /public/assets/javascripts/ui | |
| parent | 4ee827ad464dfa0edb664d27e5069811877deb1e (diff) | |
| parent | e5911a4760d62b803a166139835e661183850187 (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/ui')
| -rw-r--r-- | public/assets/javascripts/ui/builder/BuilderInfo.js | 1 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/editor/MediaEditor.js | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js index 9bbd385..ee6c81a 100644 --- a/public/assets/javascripts/ui/builder/BuilderInfo.js +++ b/public/assets/javascripts/ui/builder/BuilderInfo.js @@ -32,7 +32,6 @@ var BuilderInfo = View.extend({ this.$viewHeight.unitVal( data.viewHeight || app.defaults.viewHeight ) this.$units.val( "ft" ) this.$unitName.html( "ft" ) - this.$resolution.val( app.defaults.footResolution ) }, toggle: function(state){ diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js index a075e6b..f4e8071 100644 --- a/public/assets/javascripts/ui/editor/MediaEditor.js +++ b/public/assets/javascripts/ui/editor/MediaEditor.js @@ -47,7 +47,7 @@ var MediaEditor = FormView.extend({ if (this.scenery) { this.unbind() } - +console.log(scenery) this.bind(scenery) this.$el.addClass("active") @@ -105,7 +105,7 @@ var MediaEditor = FormView.extend({ }, setLoop: function(){ var checked = this.$loop.prop('checked') - this.scenery.media.loop = checked + this.scenery.setLoop(checked) }, setMute: function(){ var checked = this.$mute.prop('checked') |