help messages on button, starting drag stuff

8 files changed, 52 insertions, 30 deletions

diff --git a/public/assets/javascripts/app.js b/public/assets/javascripts/app.js
index 98e1820..f8372cd 100644
--- a/public/assets/javascripts/app.js
+++ b/public/assets/javascripts/app.js
@@ -18,10 +18,6 @@ else {
 new WOW().init();
 
 
-$('#help-button').click( function(){
-   $('body').chardinJs('start')
-});
-
 var scene, cam, map;
 
 var app = new function(){}
diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index b158625..40e786d 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -129,9 +129,19 @@ MX.Movements = function (cam) {
 					}
 					else if (app.controller.mediaViewer && app.controller.mediaViewer.$el.hasClass("active")) {
 						app.controller.mediaViewer.hide()
+						$(".inuse").removeClass("inuse")
 					}
 					else if (app.controller.lightControl.$el.hasClass('active')) {
 						app.controller.lightControl.hide()
+						$(".inuse").removeClass("inuse")
+					}
+					else if (app.controller.wallpaperPicker.$el.hasClass('active')) {
+						app.controller.wallpaperPicker.hide()
+						$(".inuse").removeClass("inuse")
+					}
+					else if (app.controller.presets.$el.hasClass('active')) {
+						app.controller.presets.hide()
+						$(".inuse").removeClass("inuse")
 					}
 					else {
 						app.controller.toolbar.toggleMap()
@@ -242,7 +252,7 @@ MX.Movements = function (cam) {
 			
 			var ry = cam.rotationY
 			var s = creeping ? scale * creepFactor : scale
-			var vrrrr = creeping ? vr * creepFactor * 5 : vr
+			var vrrrr = creeping ? vr * creepFactor * 5 : vr * 0.5
 			var moving = moveForward || moveBackward || moveRight || moveLeft || moveUp || moveDown || turnLeft || turnRight || turnUp || turnDown
 			vx = vz = 0
 
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index e47739b..c0c140f 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -122,7 +122,7 @@ var EditorSettings = FormView.extend({
  	  $(".inuse").removeClass("inuse")
 		$("[data-role='toggle-project-settings']").toggleClass("inuse", state)
     if (state) {
-      this.parent.cursor.show("settings")
+      this.parent.cursor.message("settings")
     }
 	},
 
diff --git a/public/assets/javascripts/ui/editor/HelpCursor.js b/public/assets/javascripts/ui/editor/HelpCursor.js
index 4a6e616..8bfaef8 100644
--- a/public/assets/javascripts/ui/editor/HelpCursor.js
+++ b/public/assets/javascripts/ui/editor/HelpCursor.js
@@ -2,6 +2,8 @@
 var HelpCursor = View.extend({
 	el: "#helpCursor",
 	
+	active: false,
+	
 	messages: {
 	  start: "Welcome to Vvalls!  Click one of the tools at right to learn how it works.",
 	  media: "This is where you pick media to go on the walls.  You can upload media, paste links, or use some of the found media.",
@@ -10,33 +12,47 @@ var HelpCursor = View.extend({
 	  colors: "Use these colors to change the color of the walls, floor, and ceiling.",
 	  settings: "This is where you publish your project. Give it a name, hit save, and you'll have a URL you can share with your friends.",
 	},
-	shown: {},
 
   initialize: function(){
-    $(window).mousemove(function(e){
-      this.el.style.left = e.pageX + "px"
-      this.el.style.top = e.pageY + "px"
-    }.bind(this))
-    this.show("start")
+		$('#help-button').click(this.toggle.bind(this));
   },
-
-  show: function(name){
-    this.showMessage(name)
+  
+  toggle: function(){
+    this.active ? this.stop() : this.start()
+  },
+  
+  start: function(){
+    if (this.active) return
+    this.active = true
+    this.message('start')
     this.$el.show()
+//     $('body').chardinJs('start')
+//     $(window).one("click", function(){
+//       $('body').chardinJs('stop')
+//     })
+    this.move({ pageX: -1000, pageY: -10000 })
+    this.moveFn = this.move.bind(this)
+    document.addEventListener("mousemove", this.moveFn)
   },
-
-  hide: function(){
+  
+  stop: function(){
+    this.active = false
     this.$el.hide()
+    document.removeEventListener("mousemove", this.moveFn)
+  },
+  
+  move: function(e){
+    this.el.style.left = e.pageX + "px"
+    this.el.style.top = e.pageY + "px"
+  },
+
+  show: function(name){
+    this.showMessage(name)
   },
 
-  showMessage: function(name){
-    if (+(this.shown[name] || 0) < 2) {
-      this.$el.html(this.messages[name])
-      this.shown[name] = (+this.shown[name] || 0) + 1
-    }
-    else {
-      this.$el.html("")
-    }
+  message: function(name){
+    if (! this.active) return
+    this.$el.html(this.messages[name])
   },
 
 })
diff --git a/public/assets/javascripts/ui/editor/LightControl.js b/public/assets/javascripts/ui/editor/LightControl.js
index bb4454a..10f8d2c 100644
--- a/public/assets/javascripts/ui/editor/LightControl.js
+++ b/public/assets/javascripts/ui/editor/LightControl.js
@@ -77,7 +77,7 @@ var LightControl = View.extend({
   },
   
   show: function(){
-    this.parent.cursor.show("colors")
+    this.parent.cursor.message("colors")
     this.toggle(true)
   },
   
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index df77fb1..e196e41 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -68,7 +68,7 @@ var MediaViewer = ModalView.extend({
 			this.loadTrending()
 		}
 		else {
-		  this.parent.cursor.show("media")
+		  this.parent.cursor.message("media")
 			this.__super__.show.call(this)
 		}
 	},
@@ -147,7 +147,7 @@ var MediaViewer = ModalView.extend({
 		}
 		else  {
 			this.loaded = true
-      this.parent.cursor.show("media")
+      this.parent.cursor.message("media")
 			this.__super__.show.call(this)
 		}
 	},
diff --git a/public/assets/javascripts/ui/editor/Presets.js b/public/assets/javascripts/ui/editor/Presets.js
index 6222e33..35b5b58 100644
--- a/public/assets/javascripts/ui/editor/Presets.js
+++ b/public/assets/javascripts/ui/editor/Presets.js
@@ -43,7 +43,7 @@ var Presets = View.extend({
   },
   
   show: function(){
-    this.parent.cursor.show("presets")
+    this.parent.cursor.message("presets")
     this.toggle(true)
   },
   
diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js
index 9583376..ad30ad8 100644
--- a/public/assets/javascripts/ui/editor/WallpaperPicker.js
+++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js
@@ -29,7 +29,7 @@ var WallpaperPicker = UploadView.extend({
   loaded: false,
 	show: function(){
 		if (! this.loaded) {
-      this.parent.cursor.show("wallpaper")
+      this.parent.cursor.message("wallpaper")
 			this.load()
 		}
 		else {