summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/rectangles/models/wall.js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-10-06 16:01:13 -0400
committerJules Laplace <jules@okfoc.us>2014-10-06 16:01:13 -0400
commitc19fbc87676404636a2f5df304ddd7875fc98e66 (patch)
tree7e46b018e7abb7a982bcedb40024c0ca70e6c755 /public/assets/javascripts/rectangles/models/wall.js
parent0250ce5260ce75f7c4337693b4e8e7f434e29458 (diff)
new scenery type: text
Diffstat (limited to 'public/assets/javascripts/rectangles/models/wall.js')
-rw-r--r--public/assets/javascripts/rectangles/models/wall.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index fdc8d8c..dc38183 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -68,9 +68,7 @@
},
*/
mousedown: function(e){
- if (Scenery.nextText) {
- }
- else if (Scenery.nextMedia) {
+ if (Scenery.nextMedia) {
var offset = offsetFromPoint(e, mx.el)
if (! offset) { return }
@@ -91,13 +89,15 @@
app.controller.toolbar.resetPermissions()
Scenery.resize.show(scenery)
Scenery.hovering = true
+
+ app.controller.pick(scenery)
UndoStack.push({
type: 'create-scenery',
undo: { id: scenery.id },
redo: scenery.serialize(),
})
-
+
// TODO: watch individual scenery object here
Minotaur.watch( app.router.editorView.settings )
}