summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui
diff options
context:
space:
mode:
authorJulie Lala <jules@okfoc.us>2014-06-18 01:53:05 -0400
committerJulie Lala <jules@okfoc.us>2014-06-18 01:53:05 -0400
commit51ec5bd2f498a38bb53d0f9a271f01e439827be2 (patch)
treeef96b9585e899cba32ab0a27627995ff3f07b4f8 /public/assets/javascripts/ui
parent7771ed9a92f3b0da66e633c829316ac904300713 (diff)
sizing stuff
Diffstat (limited to 'public/assets/javascripts/ui')
-rw-r--r--public/assets/javascripts/ui/editor/EditorSettings.js2
-rw-r--r--public/assets/javascripts/ui/editor/MediaViewer.js14
2 files changed, 16 insertions, 0 deletions
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 9263dd7..1e70dbb 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -106,6 +106,8 @@ var EditorSettings = FormView.extend({
fd.append( "name", this.$name.val() )
fd.append( "privacy", this.$privacy.filter(":checked").val() == "private" )
fd.append( "rooms", JSON.stringify( Rooms.serialize() ) )
+// fd.append( "walls", JSON.stringify( Rooms.serialize() ) )
+ fd.append( "media", JSON.stringify( Scenery.serialize() ) )
fd.append( "startPosition", JSON.stringify( app.position(scene.camera) ) )
fd.append( "thumbnail", dataUriToBlob(map.canvas.toDataURL()) )
return fd
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index a1198f3..05e666b 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -87,6 +87,7 @@ var MediaViewer = ModalView.extend({
}).complete(cb || function(){})
},
+ picked: null,
pick: function(e) {
e.stopPropagation()
@@ -101,6 +102,19 @@ var MediaViewer = ModalView.extend({
return
}
+// else {
+// this.picked = {}
+// this.picked.media = media
+// this.picked.image = image
+// }
+// },
+//
+// drag: function(e){
+// if (! this.pickedMedia) return
+// var media = this.picked.media
+// var image = this.picked.image
+// this.picked = null
+
this.hide()
var $ants = $('.ants');