diff options
Diffstat (limited to 'public')
5 files changed, 10 insertions, 9 deletions
diff --git a/public/assets/javascripts/rectangles/engine/map/ui/editor.js b/public/assets/javascripts/rectangles/engine/map/ui/editor.js index 7308344..3e1d720 100644 --- a/public/assets/javascripts/rectangles/engine/map/ui/editor.js +++ b/public/assets/javascripts/rectangles/engine/map/ui/editor.js @@ -73,7 +73,7 @@ Map.UI.Editor = function(map){ app.tube("builder-destroy-room", room) // TODO: watch individual scenery object here - Minotaur.watch( app.router.editorView.settings ) + Minotaur.watch( app.controller.settings ) return } else if (intersects.length) { @@ -205,7 +205,7 @@ Map.UI.Editor = function(map){ Rooms.rebuild() // TODO: watch individual scenery object here - Minotaur.watch( app.router.editorView.settings ) + Minotaur.watch( app.controller.settings ) } var intersects = Rooms.filter(function(r){ @@ -247,7 +247,7 @@ Map.UI.Editor = function(map){ Rooms.rebuild() // TODO: watch individual scenery object here - Minotaur.watch( app.router.editorView.settings ) + Minotaur.watch( app.controller.settings ) wheelState = null }, 250) @@ -268,7 +268,7 @@ Map.UI.Editor = function(map){ Rooms.rebuild() // TODO: watch individual scenery object here - Minotaur.watch( app.router.editorView.settings ) + Minotaur.watch( app.controller.settings ) wheelState = null }, 250) diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js index d8cfca6..5aa88e9 100644 --- a/public/assets/javascripts/ui/editor/EditorSettings.js +++ b/public/assets/javascripts/ui/editor/EditorSettings.js @@ -41,7 +41,7 @@ var EditorSettings = FormView.extend({ this.action = data.isNew ? this.createAction : this.updateAction this.parent.data = data - if (data.shapes.length) { + if (data.shapes && data.shapes.length) { Rooms.deserializeFromShapes(data, data.walls) } else if (data.rooms) { diff --git a/public/assets/javascripts/ui/lib/Parser.js b/public/assets/javascripts/ui/lib/Parser.js index 411f425..ab9d08d 100644 --- a/public/assets/javascripts/ui/lib/Parser.js +++ b/public/assets/javascripts/ui/lib/Parser.js @@ -62,10 +62,11 @@ var Parser = { dataType: "jsonp", data: { id: id, - key: "AIzaSyDYPKGD0-_VRBWpUYRmX8Qg6BtWmcPU_cM", + key: "AIzaSyCMlxLNawPWFwOIsrEz3bwfl_gZgkQwfMk", part: "id,contentDetails,snippet,status", }, success: function(result){ + console.log(result.items) var res = result.items[0] done({ url: url, @@ -279,4 +280,4 @@ var Parser = { }, }; -Parser.lookup = _.indexBy(Parser.integrations, 'type'); +Parser.lookup = _.keyBy(Parser.integrations, 'type'); diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js index 0222077..427a376 100644 --- a/public/assets/javascripts/ui/site/LayoutsModal.js +++ b/public/assets/javascripts/ui/site/LayoutsModal.js @@ -40,7 +40,7 @@ var LayoutsModal = ModalView.extend(LayoutsIndex.prototype).extend({ // show lockout message } */ - if (! data.layouts.length) { + if (! data.layouts.length && ! data.user_layouts.length) { this.$templates.hide() this.$form.hide() this.$noTemplates.show() diff --git a/public/assets/javascripts/ui/site/NewProjectModal.js b/public/assets/javascripts/ui/site/NewProjectModal.js index 31675ba..5e79929 100644 --- a/public/assets/javascripts/ui/site/NewProjectModal.js +++ b/public/assets/javascripts/ui/site/NewProjectModal.js @@ -47,7 +47,7 @@ var NewProjectModal = ModalView.extend(LayoutsIndex.prototype).extend({ this.$newBlueprintButton.hide() } */ - if (! data.layouts.length) { + if (! data.layouts.length && ! data.user_layouts.length) { this.$templates.hide() this.$form.hide() this.$noTemplates.show() |