Merge branch 'master' of github.com:okfocus/vvalls

8 files changed, 46 insertions, 31 deletions

diff --git a/bower.json b/bower.json
index ee8f9ba..faffbfb 100644
--- a/bower.json
+++ b/bower.json
@@ -7,6 +7,7 @@
     "momentjs": "~2.5.1",
     "lodash": "",
     "fiber": "",
-    "jquery-jsonview": "1.2.0"
+    "jquery-jsonview": "1.2.0",
+    "prefixfree": ""
   }
 }
diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index ca77525..2ba84a1 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -122,7 +122,7 @@ Scenery.resize = new function(){
 			Scenery.mouse.bind_el(dot.el)
 			$(dot.el).bind({
 				mouseenter: function(e){
-					Scenery.resize.hovering = true 
+// 					Scenery.resize.hovering = true 
 				},
 				mouseleave: function(e){
 // 					Scenery.resize.hovering = false
@@ -147,7 +147,7 @@ Scenery.resize = new function(){
 	function down (e, cursor){
 		var selection = dots.filter(function(dot){return e.target == dot.el})
 		if (! selection.length) return
-		
+
 		selected_dot = selection[0]
 		dragging = true
 
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 5513a9b..1b37aa0 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -65,8 +65,9 @@
             	return
             }
 
+            app.controller.toolbar.resetPermissions()
             Scenery.resize.show(scenery)
-            Scenery.hovering = true
+            Scenery.hovering = true 
 
   					UndoStack.push({
   					  type: 'create-scenery',
diff --git a/public/assets/javascripts/rectangles/util/minotaur.js b/public/assets/javascripts/rectangles/util/minotaur.js
index 0fcc766..4d9a795 100644
--- a/public/assets/javascripts/rectangles/util/minotaur.js
+++ b/public/assets/javascripts/rectangles/util/minotaur.js
@@ -4,7 +4,7 @@
     var base = this
     base.$el = $("#minotaur")
     base.timeout = null
-    base.delay = 1000
+    base.delay = 5000
     base.objects = {}
     
     base.init = function () {
diff --git a/public/assets/javascripts/rectangles/util/permissions.js b/public/assets/javascripts/rectangles/util/permissions.js
index 1b5a1b5..9e3ef4d 100644
--- a/public/assets/javascripts/rectangles/util/permissions.js
+++ b/public/assets/javascripts/rectangles/util/permissions.js
@@ -31,7 +31,7 @@ Permissions.prototype.add = function (key) {
 
 Permissions.prototype.remove = function (key) {	
 	var base = this
-	base[key] = true
+	base[key] = false
 }
 
 Permissions.prototype.clear = function () {	
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 9c74c7c..9f439c8 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -6,7 +6,7 @@ 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='resize-media']": 'resizeMedia',
 		"click [data-role='destroy-media']": 'destroyMedia',
 		"click [data-role='toggle-wallpaper-panel']": 'toggleWallpaper',
 		"click [data-role='toggle-light-control']": 'toggleLightControl',
@@ -39,9 +39,10 @@ var EditorToolbar = View.extend({
 	},
 
 	resetMode: function(){
-		this.resizeMedia(true)
+		// this.resizeMedia(true)
 		this.destroyMedia(false)
-		app.controller.hideExtras()
+		this.parent.hideExtras()
+		this.resetPermissions()
 	},
 	
 	resetControls: function(){
@@ -51,27 +52,34 @@ var EditorToolbar = View.extend({
 		this.parent.settings.hide()
 	},
 	
-	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()
-		}
+	resetPermissions: function(){
+    editor.permissions.add("pick")
+    editor.permissions.add("move")
+    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()
@@ -82,7 +90,12 @@ var EditorToolbar = View.extend({
 		else {
 			state = editor.permissions.toggle("destroy")
 		}
-		! state && editor.permissions.assign("move", true)
+		if (! state) {
+      this.resetPermissions()
+    }
+    else {
+      app.controller.hideExtras()
+		}
 		$(".inuse").removeClass("inuse")
 		$("[data-role='destroy-media']").toggleClass("inuse", state)
 		$("body").toggleClass("destroyActive", state)
diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index 2449465..1bfc6cb 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -29,7 +29,6 @@ var LayoutsIndex = View.extend({
 			
 			this.$templates.append($span)
 		}.bind(this))
-		console.log(this.$templates.html())
 		this.show()
 	}
 
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 7d56b2e..e0dd0f5 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -2,6 +2,7 @@
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/lodash/dist/lodash.min.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/momentjs/min/moment.min.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/fiber/src/fiber.min.js"></script>
+<script type="text/javascript" src="/assets/javascripts/vendor/bower_components/prefixfree/prefixfree.min.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/tube.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/loader.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/polyfill.js"></script>