merge

8 files changed, 40 insertions, 14 deletions

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 b96943e..2b29961 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -5,6 +5,8 @@ var EditorSettings = FormView.extend({
 	createAction: "/api/project/new",
 	updateAction: "/api/project/edit",
 	destroyAction: "/api/project/destroy",
+	
+	useMinotaur: true,
   
 	events: {
 	  "mousedown": "stopPropagation",
@@ -15,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",
@@ -81,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()
 
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index 9b81db1..db5878f 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -161,7 +161,7 @@ var MediaEditor = FormView.extend({
 	
 	unbind: function(){
 	  if (this.scenery) {
-	    if (this.tainted) {
+	    if (this.tainted && this.scenery.media) {
         this.scenery.media.title = this.$name.val()
         this.scenery.media.description = this.$description.val()
         Minotaur.watch( app.router.editorView.settings )
@@ -178,8 +178,11 @@ var MediaEditor = FormView.extend({
 	destroy: function(){
     var scenery = this.scenery
     this.hide()
-    Scenery.remove(scenery.id)
-    Scenery.resize.hide()
+
+    scenery.remove()
+    
+    this.tainted = false
+    this.scenery = null
 	},
 
 })
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
index b559ba5..51077af 100644
--- a/public/assets/javascripts/ui/editor/TextEditor.js
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -136,10 +136,8 @@ var TextEditor = FormView.extend({
   },
   
 	destroy: function(){
-    var scenery = this.scenery
-    this.hide()
-    Scenery.remove(scenery.id)
-    Scenery.resize.hide()
+    this.tainted = false
+    this.scenery.remove()
 	},
 
 })
diff --git a/public/assets/javascripts/ui/lib/FormView.js b/public/assets/javascripts/ui/lib/FormView.js
index 17b748a..b3a4c71 100644
--- a/public/assets/javascripts/ui/lib/FormView.js
+++ b/public/assets/javascripts/ui/lib/FormView.js
@@ -1,6 +1,7 @@
 var FormView = View.extend({
 
 	method: "post",
+	useMinotaur: false,
 
 	events: {
 		"submit form": "save"
@@ -88,8 +89,15 @@ var FormView = View.extend({
 			processData: false,
 			contentType: false,
 		})
+
+    if (this.useMinotaur) {
+      Minotaur.show()
+    }
 		
 		request.done($.proxy(function (response) {
+		  if (this.useMinotaur) {
+		    Minotaur.hide()
+		  }
 			if (response.error) {
 				var errors = []
 				for (var key in response.error.errors) {
diff --git a/public/assets/javascripts/ui/lib/View.js b/public/assets/javascripts/ui/lib/View.js
index d94e6db..3c65131 100644
--- a/public/assets/javascripts/ui/lib/View.js
+++ b/public/assets/javascripts/ui/lib/View.js
@@ -60,7 +60,10 @@ var View = (function($, _){
 				var eventName = match[1], selector = match[2];
 				method = _.bind(method, this);
 				eventName += '.delegateEvents' + this._id;
-				if (selector === '') {
+				if (is_mobile && (selector === 'mouseenter' || selector === 'mouseleave')) {
+				  continue
+				}
+				else if (selector === '') {
 					this.$el.on(eventName, method);
 				} else {
 					this.$el.on(eventName, selector, method);
diff --git a/public/assets/javascripts/ui/reader/ShareView.js b/public/assets/javascripts/ui/reader/ShareView.js
index 35c23ca..4e5f832 100644
--- a/public/assets/javascripts/ui/reader/ShareView.js
+++ b/public/assets/javascripts/ui/reader/ShareView.js
@@ -22,6 +22,11 @@ var ShareView = View.extend({
 	  var msg = $(".roomName").html() + " on VValls"
 		var url = "https://twitter.com/home?status=" + encodeURIComponent(window.location.origin + window.location.pathname + " " + msg);
 		window.open(url, "_blank")
-	}
+	},
+	
+	embed: function (e) {
+	  e.preventDefault()
+	  
+	},
 
 })
diff --git a/public/assets/javascripts/ui/site/ProjectList.js b/public/assets/javascripts/ui/site/ProjectList.js
index 27c8aca..076a674 100644
--- a/public/assets/javascripts/ui/site/ProjectList.js
+++ b/public/assets/javascripts/ui/site/ProjectList.js
@@ -1,5 +1,5 @@
 var projectListTimeout = null
-window.fuck = 'suck'
+
 var ProjectList = View.extend({
 
 	el: ".projectList",