summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui
diff options
context:
space:
mode:
Diffstat (limited to 'public/assets/javascripts/ui')
-rw-r--r--public/assets/javascripts/ui/editor/MediaEditor.js13
-rw-r--r--public/assets/javascripts/ui/editor/TextEditor.js6
-rw-r--r--public/assets/javascripts/ui/reader/ShareView.js7
3 files changed, 10 insertions, 16 deletions
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index 9a3c355..db5878f 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -179,17 +179,8 @@ var MediaEditor = FormView.extend({
var scenery = this.scenery
this.hide()
- UndoStack.push({
- type: 'destroy-scenery',
- undo: scenery.serialize(),
- redo: { id: scenery.id },
- })
-
- // TODO: watch individual scenery object here
- Minotaur.watch( app.router.editorView.settings )
-
- Scenery.remove(scenery.id)
- Scenery.resize.hide()
+ scenery.remove()
+
this.tainted = false
this.scenery = null
},
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
index b559ba5..51077af 100644
--- a/public/assets/javascripts/ui/editor/TextEditor.js
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -136,10 +136,8 @@ var TextEditor = FormView.extend({
},
destroy: function(){
- var scenery = this.scenery
- this.hide()
- Scenery.remove(scenery.id)
- Scenery.resize.hide()
+ this.tainted = false
+ this.scenery.remove()
},
})
diff --git a/public/assets/javascripts/ui/reader/ShareView.js b/public/assets/javascripts/ui/reader/ShareView.js
index 35c23ca..4e5f832 100644
--- a/public/assets/javascripts/ui/reader/ShareView.js
+++ b/public/assets/javascripts/ui/reader/ShareView.js
@@ -22,6 +22,11 @@ var ShareView = View.extend({
var msg = $(".roomName").html() + " on VValls"
var url = "https://twitter.com/home?status=" + encodeURIComponent(window.location.origin + window.location.pathname + " " + msg);
window.open(url, "_blank")
- }
+ },
+
+ embed: function (e) {
+ e.preventDefault()
+
+ },
})