summaryrefslogtreecommitdiff
path: root/public/assets/javascripts
diff options
context:
space:
mode:
Diffstat (limited to 'public/assets/javascripts')
-rw-r--r--public/assets/javascripts/rectangles/engine/map/ui_editor.js13
-rw-r--r--public/assets/javascripts/ui/_router.js9
-rw-r--r--public/assets/javascripts/ui/editor/EditorSettings.js6
3 files changed, 24 insertions, 4 deletions
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
index 1ab9c73..c838b8b 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -70,6 +70,9 @@ Map.UI.Editor = function(map){
Rooms.remove(room)
app.tube("builder-destroy-room", room)
+
+ // TODO: watch individual scenery object here
+ Minotaur.watch( app.router.editorView.settings )
return
}
else if (intersects.length) {
@@ -178,6 +181,9 @@ Map.UI.Editor = function(map){
Rooms.rebuild()
app.tube("builder-pick-room", room)
+
+ // TODO: watch individual scenery object here
+ Minotaur.watch( app.router.editorView.settings )
}
}
if (base.resizing || base.dragging) {
@@ -196,6 +202,9 @@ Map.UI.Editor = function(map){
redo: base.dragging.copy()
})
Rooms.rebuild()
+
+ // TODO: watch individual scenery object here
+ Minotaur.watch( app.router.editorView.settings )
}
var intersects = Rooms.filter(function(r){
@@ -231,6 +240,10 @@ Map.UI.Editor = function(map){
redo: intersects[0].copy()
})
Rooms.rebuild()
+
+ // TODO: watch individual scenery object here
+ Minotaur.watch( app.router.editorView.settings )
+
wheelState = null
}, 250)
}
diff --git a/public/assets/javascripts/ui/_router.js b/public/assets/javascripts/ui/_router.js
index d5a8e7f..7337357 100644
--- a/public/assets/javascripts/ui/_router.js
+++ b/public/assets/javascripts/ui/_router.js
@@ -73,12 +73,13 @@ var SiteRouter = Router.extend({
this.route()
- /*
if (is_mobile) {
- $(".topLinks").hide()
- $(".share").hide()
+ // $(".topLinks").hide()
+ // $(".share").hide()
+ $('.projectItem').each(function(){
+ this.href = this.href.replace(/\/edit$/, "")
+ })
}
- */
$("body").removeClass("loading")
},
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index de60b53..2b29961 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -17,6 +17,7 @@ var EditorSettings = FormView.extend({
"click [data-role='clone-project']": 'clone',
"click [data-role='clear-project']": 'clear',
"click [data-role='destroy-project']": 'destroy',
+ "click [data-role='toggle-map']": 'toggleMap',
"click #startText": "setStartPosition",
"click #moveText": "confirmStartPosition",
"click #confirmText": "setStartPosition",
@@ -83,6 +84,11 @@ var EditorSettings = FormView.extend({
this.parent.collaborators.show()
},
+ toggleMap: function(e){
+ e.preventDefault()
+ app.controller.toolbar.toggleMap()
+ },
+
clone: function(e){
e.preventDefault()