summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/mx
diff options
context:
space:
mode:
Diffstat (limited to 'public/assets/javascripts/mx')
-rw-r--r--public/assets/javascripts/mx/extensions/mx.movements.js11
-rw-r--r--public/assets/javascripts/mx/primitives/mx.youtube.js13
2 files changed, 23 insertions, 1 deletions
diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index dc9660b..1ba33c9 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -62,7 +62,7 @@ MX.Movements = function (cam) {
},
keydown: function (e) {
- // console.log(e.keyCode)
+ console.log(e.keyCode)
if (locked || e.altKey || e.metaKey || e.ctrlKey) {
return
}
@@ -155,6 +155,15 @@ MX.Movements = function (cam) {
app.controller.toolbar.toggleMap()
}
break
+
+ case 8: // backspace
+ e.preventDefault()
+ if (app.controller.mediaEditor.scenery) {
+ app.controller.mediaEditor.scenery.remove()
+ }
+ else if (app.controller.textEditor.scenery) {
+ app.controller.textEditor.scenery.remove()
+ }
}
},
diff --git a/public/assets/javascripts/mx/primitives/mx.youtube.js b/public/assets/javascripts/mx/primitives/mx.youtube.js
index 873348f..8511173 100644
--- a/public/assets/javascripts/mx/primitives/mx.youtube.js
+++ b/public/assets/javascripts/mx/primitives/mx.youtube.js
@@ -34,9 +34,22 @@ MX.Youtube = MX.Object3D.extend({
preload.style.width = this.media.width + "px"
preload.style.height = this.media.height + "px"
preload.style.pointerEvents = "none"
+ preload.style.position = "absolute"
+ preload.style.top = "0"
+ preload.style.left = "0"
+ preload.style.zIndex = "1"
preload.className = "preload"
this.el.appendChild(preload)
+ var overlay = this.overlay = document.createElement("div")
+ overlay.style.width = "100%"
+ overlay.style.height = "100%"
+ overlay.style.position = "absolute"
+ overlay.style.top = "0"
+ overlay.style.left = "0"
+ overlay.style.zIndex = "2"
+ overlay.className = "overlay"
+ this.el.appendChild(overlay)
this.defer(uid)
},