diff options
Diffstat (limited to 'public')
5 files changed, 15 insertions, 6 deletions
diff --git a/public/assets/javascripts/mx/primitives/mx.youtube.js b/public/assets/javascripts/mx/primitives/mx.youtube.js index 47d5507..e9a4578 100644 --- a/public/assets/javascripts/mx/primitives/mx.youtube.js +++ b/public/assets/javascripts/mx/primitives/mx.youtube.js @@ -31,6 +31,7 @@ MX.Youtube = MX.Object3D.extend({ var preload = document.createElement("div") preload.id = uid preload.style.backgroundImage = "url(" + this.media.thumbnail + ")" + preload.style.backgroundSize = "cover" preload.style.width = this.media.width + "px" preload.style.height = this.media.height + "px" preload.style.pointerEvents = "none" @@ -47,7 +48,11 @@ MX.Youtube = MX.Object3D.extend({ }.bind(this), 300) } else { - this.build(uid) + // not sure why i need to wait here.. + // stopped working until i added the setTimeout + setTimeout(function(){ + this.build(uid) + }.bind(this), 20) } }, @@ -67,6 +72,7 @@ MX.Youtube = MX.Object3D.extend({ disablekb: 1, controls: 0, enablejsapi: 1, + origin: window.location.origin, fs: 0, modestbranding: 1, iv_load_policy: 3, // no annotations @@ -84,6 +90,9 @@ MX.Youtube = MX.Object3D.extend({ if (this.media.autoplay) { this.play() } + else { + this.pause() + } if (this.media.mute) { this.mute() @@ -123,6 +132,7 @@ MX.Youtube = MX.Object3D.extend({ }, pause: function(){ + console.log(this, bzbz = this.player) this.paused = true this.player.pauseVideo() }, @@ -136,6 +146,7 @@ MX.Youtube = MX.Object3D.extend({ }, duration: function(){ + console.log(this, this.player) return this.player.getDuration() }, @@ -164,5 +175,5 @@ MX.Youtube = MX.Object3D.extend({ }) window.onYouTubePlayerAPIReady = function(){ - // console.log("youtube api ready") + // console.log("youtube api ready") } diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js index 1493fc6..abd14ba 100644 --- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js +++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js @@ -25,7 +25,6 @@ var Scenery = new function(){ scene_media = new Scenery.types.video ({ media: media, wall: wall, id: id }) break } - base.list[scene_media.id] = scene_media return scene_media } diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js index 65f3a94..7202ce0 100644 --- a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js +++ b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js @@ -10,7 +10,7 @@ Scenery.types.base = Fiber.extend(function(base){ this.media = opt.media this.dimensions = new vec2(this.media.width, this.media.height) this.scale = this.media.scale - + if (opt.wall) { this.set_wall(opt.wall) } 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..a52bdd0 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") |