merge

16 files changed, 139 insertions, 78 deletions

diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index e6b7e97..0bf2338 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -3,6 +3,7 @@ var BuilderInfo = View.extend({
 	el: "#builderInfo",
 
 	events: {
+	  "mousedown": "stopPropagation",
 		"keydown": 'stopPropagation',
 		"change [name=x]": 'changeX',
 		"change [name=y]": 'changeY',
@@ -66,27 +67,27 @@ var BuilderInfo = View.extend({
 	changeWidth: function(e){
 		e.stopPropagation()
 		this.room.rect.x.setLength( this.$width.unitVal() )
-		Rooms.clipper.update()
+    Rooms.rebuild()
 	},
 	changeDepth: function(e){
 		e.stopPropagation()
 		this.room.rect.y.setLength( this.$depth.unitVal() )
-		Rooms.clipper.update()
+    Rooms.rebuild()
 	},
 	changeHeight: function(e){
 		e.stopPropagation()
 		this.room.height = this.$height.unitVal()
-		Rooms.clipper.update()
+    Rooms.rebuild()
 	},
 	changeX: function(e){
 		e.stopPropagation()
 		this.room.rect.x.setPosition( this.$x.unitVal() )
-		Rooms.clipper.update()
+    Rooms.rebuild()
 	},
 	changeY: function(e){
 		e.stopPropagation()
 		this.room.rect.y.setPosition( this.$y.unitVal() )
-		Rooms.clipper.update()
+    Rooms.rebuild()
 	},
 	changeUnits: function(){
 		app.units = this.$units.val()
diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js
index 7ae6294..fe67e9b 100644
--- a/public/assets/javascripts/ui/builder/BuilderSettings.js
+++ b/public/assets/javascripts/ui/builder/BuilderSettings.js
@@ -7,6 +7,7 @@ var BuilderSettings = FormView.extend({
 	destroyAction: "/api/layout/destroy",
 
 	events: {
+	  "mousedown": "stopPropagation",
 		"keydown": 'stopPropagation',
 		"keydown [name=name]": 'enterSubmit',
 		"click [data-role='save-layout']": 'clickSave',
diff --git a/public/assets/javascripts/ui/builder/BuilderToolbar.js b/public/assets/javascripts/ui/builder/BuilderToolbar.js
index 2eb7590..6c218be 100644
--- a/public/assets/javascripts/ui/builder/BuilderToolbar.js
+++ b/public/assets/javascripts/ui/builder/BuilderToolbar.js
@@ -3,6 +3,7 @@ var BuilderToolbar = View.extend({
 	el: "#builderToolbar",
 
 	events: {
+	  "mousedown": "stopPropagation",
 		"click [data-role='toggle-map-view']": 'toggleMap',
 		"click [data-role='toggle-layout-settings']": 'toggleSettings',
 		"click [data-role='undo']": 'undo',
diff --git a/public/assets/javascripts/ui/builder/BuilderView.js b/public/assets/javascripts/ui/builder/BuilderView.js
index 81dce52..a89111f 100644
--- a/public/assets/javascripts/ui/builder/BuilderView.js
+++ b/public/assets/javascripts/ui/builder/BuilderView.js
@@ -12,11 +12,6 @@ var BuilderView = View.extend({
 		this.toolbar = new BuilderToolbar ({ parent: this })
 		this.settings = new BuilderSettings ({ parent: this })
 		this.lightControl = new LightControl ({ parent: this })
-
-		app.on("rooms-built", function(){
-		  Walls.paint()
-		})
-
 	},
 
 	load: function(name){
diff --git a/public/assets/javascripts/ui/editor/Collaborators.js b/public/assets/javascripts/ui/editor/Collaborators.js
index 452ad15..b57510d 100644
--- a/public/assets/javascripts/ui/editor/Collaborators.js
+++ b/public/assets/javascripts/ui/editor/Collaborators.js
@@ -9,6 +9,7 @@ var Collaborators = ModalFormView.extend({
 	destroyAction: function(){ return "/api/collaborator/" + this.parent.data.slug + "/destroy" },
 	
 	events: {
+	  "mousedown": "stopPropagation",
 	  "keydown [name=email]": "enterSubmit",
 	  "click [data-role=destroy-collaborator]": "destroy",
 	},
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 0c08369..89040e1 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -7,6 +7,7 @@ var EditorSettings = FormView.extend({
 	destroyAction: "/api/project/destroy",
   
 	events: {
+	  "mousedown": "stopPropagation",
 		"keydown": 'stopPropagation',
 		"keydown [name=name]": 'enterSubmit',
 		"click [data-role='show-collaborators']": 'showCollaborators',
@@ -31,8 +32,7 @@ var EditorSettings = FormView.extend({
 		this.action = data.isNew ? this.createAction : this.updateAction
     this.parent.data = data
     
-		data.rooms && Rooms.deserialize(data.rooms)
-		data.walls && Walls.deserialize(data.walls)
+		data.rooms && Rooms.deserialize(data.rooms, data.walls)
 		data.startPosition && scene.camera.move(data.startPosition)
 
     if (data.colors && data.colors.wall) {
@@ -65,10 +65,6 @@ var EditorSettings = FormView.extend({
 			
 			data.media && Scenery.deserialize(data.media)
 		}
-
-    app.on("rooms-built", function(){
-		  Walls.paint()
-		})
 	},
 	
 	showCollaborators: function(e){
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 49decc2..8a707ec 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -7,8 +7,8 @@ var EditorToolbar = View.extend({
 		"click [data-role='toggle-map-view']": 'toggleMap',
 		"click [data-role='toggle-project-settings']": 'toggleSettings',
 		"click [data-role='open-media-viewer']": 'openMediaViewer',
-// 		"click [data-role='resize-media']": 'resizeMedia',
-		"click [data-role='destroy-media']": 'destroyMedia',
+    "click [data-role='toggle-presets']": 'togglePresets',
+// 		"click [data-role='destroy-media']": 'destroyMedia',
 		"click [data-role='toggle-wallpaper-panel']": 'toggleWallpaper',
 		"click [data-role='toggle-light-control']": 'toggleLightControl',
 		"click [data-role='toggle-text-editor']": 'toggleTextEditor',
@@ -19,13 +19,18 @@ var EditorToolbar = View.extend({
 	},
 
 	toggleMap: function(){
-		map.toggle()
-		// $("#minimap").toggleClass("hide");
+		var state = ! $("[data-role='toggle-map-view']").hasClass("inuse")
+		this.resetControls()
+    $("[data-role='toggle-map-view']").toggleClass("inuse", state)
+		map.toggle(state)
+		$("#minimap").toggleClass("hide", state)
+		this.parent.info.toggle(state)
 	},
 	
 	toggleSettings: function(){
 // 	  this.resetMode()
     this.parent.textEditor.hide()
+		this.parent.presets.hide()
 		this.parent.lightControl.hide()
 		this.parent.wallpaperPicker.hide()
 		this.parent.mediaEditor.hide()
@@ -52,6 +57,7 @@ var EditorToolbar = View.extend({
 	  $(".inuse").removeClass("inuse")
     this.parent.textEditor.hide()
 		this.parent.wallpaperPicker.hide()
+		this.parent.presets.hide()
 		this.parent.lightControl.hide()
 		this.parent.settings.hide()
 	},
@@ -62,28 +68,6 @@ var EditorToolbar = View.extend({
     editor.permissions.add("resize")
     editor.permissions.remove("destroy")
 	},
-
-// 	resizeMedia: function(e, state){
-// 		this.resetControls()
-// 		if (! state && typeof e == "boolean") {
-// 			state = e
-// 			editor.permissions.assign("resize", state)
-// 		}
-// 		else {
-// 			state = editor.permissions.toggle("resize")
-// 		}
-// 		! state && editor.permissions.assign("move", true)
-// 		$(".inuse").removeClass("inuse")
-// 		$("[data-role='resize-media']").toggleClass("inuse", state)
-// 		if (state) {
-// 			if (this.parent.mediaEditor.scenery) {
-//         Scenery.resize.show( this.parent.mediaEditor.scenery )
-//       }
-// 		}
-// 		else {
-// 			Scenery.resize.hide()
-// 		}
-// 	},
 	
 	destroyMedia: function(e, state){
 		this.resetControls()
@@ -113,6 +97,7 @@ var EditorToolbar = View.extend({
 		this.parent.lightControl.hide()
     this.parent.textEditor.hide()
 		this.parent.settings.hide()
+		this.parent.presets.hide()
 		this.parent.wallpaperPicker.toggle(state)
 	},
 	
@@ -124,6 +109,7 @@ var EditorToolbar = View.extend({
 		this.parent.wallpaperPicker.hide()
     this.parent.textEditor.hide()
 		this.parent.settings.hide()
+		this.parent.presets.hide()
 		this.parent.lightControl.toggle(state)
 	},
 	
@@ -135,9 +121,21 @@ var EditorToolbar = View.extend({
 		this.parent.wallpaperPicker.hide()
 		this.parent.lightControl.hide()
 		this.parent.settings.hide()
+		this.parent.presets.hide()
 		this.parent.textEditor.toggle(state)
   },
 
+	togglePresets: function(){
+		var state = ! $("[data-role='toggle-presets']").hasClass("inuse")
+		this.resetMode()
+		$("[data-role='toggle-presets']").toggleClass("inuse", state)
+		this.parent.mediaEditor.hide()
+		this.parent.wallpaperPicker.hide()
+    this.parent.textEditor.hide()
+		this.parent.settings.hide()
+		this.parent.lightControl.hide()
+		this.parent.presets.toggle(state)
+	},
 })
 
 var editor = new function(){
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index f60b149..6aff601 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -11,6 +11,7 @@ var EditorView = View.extend({
 	initialize: function(){
 		this.toolbar = new EditorToolbar ({ parent: this })
 		this.settings = new EditorSettings ({ parent: this })
+		this.info = new BuilderInfo ({ parent: this })
 		this.mediaViewer = new MediaViewer ({ parent: this })
 		this.mediaUpload = new MediaUpload ({ parent: this })
 		this.mediaEditor = new MediaEditor ({ parent: this })
@@ -18,6 +19,7 @@ var EditorView = View.extend({
 		this.lightControl = new LightControl ({ parent: this })
 		this.textEditor = new TextEditor ({ parent: this })
 		this.collaborators = new Collaborators ({ parent: this })
+		this.presets = new Presets ({ parent: this })
 	},
 
 	load: function(name){
@@ -26,6 +28,11 @@ var EditorView = View.extend({
 	},
 	
 	loadLayout: function(layout){
+	  if (layout == "empty") {
+	    this.readyLayout({})
+	    this.toolbar.toggleMap()
+      return
+	  }
 		layout = sanitize(layout)
 		$.get(this.layoutAction + layout, this.readyLayout.bind(this))
 	},
diff --git a/public/assets/javascripts/ui/editor/LightControl.js b/public/assets/javascripts/ui/editor/LightControl.js
index 51e6be7..3eb2861 100644
--- a/public/assets/javascripts/ui/editor/LightControl.js
+++ b/public/assets/javascripts/ui/editor/LightControl.js
@@ -10,7 +10,6 @@ var LightControl = View.extend({
     "input #brightness-control": "updateBrightness",
     "input #outline-hue": "updateShadow",
     "input #wall-hue": "updateShadow",
-    "click .presets span": "selectPreset",
   },
   
   initialize: function(){
@@ -115,39 +114,6 @@ var LightControl = View.extend({
     this.setMode(mode)
   },
   
-  presets: {
-    wireframe: {
-      wall: [255,255,255],
-      outline: [0,0,0],
-      floor: [246,246,246],
-      ceiling: [255,255,255],
-    },
-    shaded: {
-      wall: [205,205,204],
-      outline: [0,0,0],
-      floor: [109,116,106],
-      ceiling: [159,163,157],
-    },
-    pfunk: {
-      wall: [255,63,78],
-      outline: [255,246,0],
-      floor: [255,255,0],
-      ceiling: [225,118,252],
-    },
-    inverse: {
-      wall: [0,0,0],
-      outline: [0,230,255],
-      floor: [0,0,0],
-      ceiling: [0,0,0],
-    },
-  },
-  selectPreset: function(e){
-    var preset = $(e.currentTarget).data('preset')
-    if (! this.presets[preset]) return
-    this.load(this.presets[preset])
-    $(e.currentTarget).addClass('active')
-  },
-  
   beginBrightness: function(){
     this.begin()
     $(window).one("mouseup", this.finalize.bind(this))
diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js
index 3f425c3..fddfefc 100644
--- a/public/assets/javascripts/ui/editor/MediaUpload.js
+++ b/public/assets/javascripts/ui/editor/MediaUpload.js
@@ -6,6 +6,7 @@ var MediaUpload = UploadView.extend({
 	uploadAction: "/api/media/upload",
 	
 	events: {
+    'mousedown': "stopPropagation",
 		"keydown .url": "enterSubmit",
 	},
 	
@@ -56,6 +57,7 @@ var MediaUpload = UploadView.extend({
 		console.log(media)
 		this.parent.mediaViewer.add(media, this.parent.mediaViewer.$myMedia)
     this.parent.mediaViewer.$deleteMedia.show()
+    this.parent.mediaViewer.$noMedia.hide()
 	},
 	
 	beforeUpload: function(){
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index 1414e16..c18fb49 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -6,6 +6,7 @@ var MediaViewer = ModalView.extend({
 	loaded: false,
 	
 	events: {
+	  'mousedown': "stopPropagation",
 		'click .foundToggle': "foundToggle",
 		'click .userToggle': "userToggle",
 		'click #deleteMedia': "deleteArmed",
diff --git a/public/assets/javascripts/ui/editor/Presets.js b/public/assets/javascripts/ui/editor/Presets.js
new file mode 100644
index 0000000..a7e92b6
--- /dev/null
+++ b/public/assets/javascripts/ui/editor/Presets.js
@@ -0,0 +1,59 @@
+var Presets = View.extend({
+	el: "#presets",
+	
+	events: {
+    "click .presets span": "selectPreset",
+	},
+
+  presets: {
+    wireframe: {
+      wall: [255,255,255],
+      outline: [0,0,0],
+      floor: [246,246,246],
+      ceiling: [255,255,255],
+    },
+    shaded: {
+      wall: [205,205,204],
+      outline: [0,0,0],
+      floor: [109,116,106],
+      ceiling: [159,163,157],
+    },
+    pfunk: {
+      wall: [255,63,78],
+      outline: [255,246,0],
+      floor: [255,255,0],
+      ceiling: [225,118,252],
+    },
+    inverse: {
+      wall: [0,0,0],
+      outline: [255,255,255],
+      floor: [0,0,0],
+      ceiling: [0,0,0],
+    },
+  },
+  
+  initialize: function(opt){
+    this.parent = opt.parent
+  },
+
+  toggle: function(state){
+    this.$el.toggleClass("active", state);
+  },
+  
+  show: function(){
+    this.toggle(true)
+  },
+  
+  hide: function(){
+    this.toggle(false)
+  },
+
+  selectPreset: function(e){
+    var preset = $(e.currentTarget).data('preset')
+    if (! this.presets[preset]) return
+    this.parent.lightControl.load(this.presets[preset])
+    this.$(".active").removeClass('active')
+    $(e.currentTarget).addClass('active')
+  },
+  
+})
\ No newline at end of file
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
index 0aa5aad..c8879b3 100644
--- a/public/assets/javascripts/ui/editor/TextEditor.js
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -92,6 +92,7 @@ var TextEditor = FormView.extend({
 			this.unbind()
 		}
 
+    this.parent.settings.hide()
 		Scenery.resize.show(scenery)
 		Scenery.hovering = true
 		
diff --git a/public/assets/javascripts/ui/lib/Router.js b/public/assets/javascripts/ui/lib/Router.js
index 0b6385c..28905b2 100644
--- a/public/assets/javascripts/ui/lib/Router.js
+++ b/public/assets/javascripts/ui/lib/Router.js
@@ -16,6 +16,7 @@ var Router = View.extend({
 		
 		if (pathname in routes) {	
 			this[this.routes[pathname]](null)
+			return
 		}
 		
 		if (path[path.length-1] == null) {
diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index 99db2a3..5974fc3 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -112,6 +112,7 @@ var NewProjectModal = ModalView.extend(LayoutsIndex.prototype).extend({
 	action: "/api/layout",
 
 	events: {
+		"click [data-role='create-new-layout']": 'createNewLayout',
 		"click .templates span": 'choose',
 		"submit form": 'choose',
 	},
@@ -128,6 +129,10 @@ var NewProjectModal = ModalView.extend(LayoutsIndex.prototype).extend({
  		var layout = $(e.currentTarget).data("slug")
 		if (! layout || ! layout.length) return
 		window.location.pathname = "/project/new/" + layout
-	}
+	},
+
+	createNewLayout: function(){
+	  window.location.pathname = "/project/new/empty"
+	},
 	
 })
diff --git a/public/assets/javascripts/ui/site/ProjectList.js b/public/assets/javascripts/ui/site/ProjectList.js
index ebb0a96..27c8aca 100644
--- a/public/assets/javascripts/ui/site/ProjectList.js
+++ b/public/assets/javascripts/ui/site/ProjectList.js
@@ -1,14 +1,17 @@
 var projectListTimeout = null
+window.fuck = 'suck'
 var ProjectList = View.extend({
 
 	el: ".projectList",
 
 	events: {
+	  "click .viewMore": 'viewMore',
 		"mouseenter .room": 'enter',
 		"mouseleave .room": 'leave',
 	},
 	
 	initialize: function(){
+	  this.$viewMore = this.$(".viewMore")
 	  this.$(".images").each(function(){
 	    $divs = $(this).children("div")
 	    $divs.hide()
@@ -41,7 +44,30 @@ var ProjectList = View.extend({
     $divs.eq(index).hide()
     $divs.eq(nextIndex).show()
     $images.data("index", nextIndex)
-	}
+	},
+	
+	viewMore: function(e){
+	  e.preventDefault()
+	  var criteria = {}
+	  criteria.offset = this.$(".projectItem").length
+	  if (window.location.pathname == "/" || window.location.pathname.match("/home")) {
+	    criteria.home = 1
+	  }
+	  else {
+	    criteria.user_id = this.$(".projectItem").first().data("userid")
+	  }
+    
+	  $.get("/api/project/paginate", criteria, function(data){
+	    var offset = this.$viewMore.offset()
+	    var $data = $(data)
+      var $els = $data.find(".projectItem")
+      $els.insertBefore( this.$viewMore )
+      if (! $data.find(".viewMore").length) {
+        this.$viewMore.hide()
+      }
+      $("body,html").animate({ scrollTop: offset.top - 80 }, 300)
+	  }.bind(this))
+	},
 	
 /*
 	spinOn: function(e){