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

1 files changed, 14 insertions, 1 deletions

diff --git a/public/assets/javascripts/ui/editor/HelpCursor.js b/public/assets/javascripts/ui/editor/HelpCursor.js
index 3bcfd7a..d0e1825 100644
--- a/public/assets/javascripts/ui/editor/HelpCursor.js
+++ b/public/assets/javascripts/ui/editor/HelpCursor.js
@@ -43,9 +43,12 @@ var HelpCursor = View.extend({
     document.removeEventListener("mousemove", this.moveFn)
   },
   
+  offset: 100,
+  lastPosition: { pageX: 0, pageY: 0 },
   move: function(e){
-    this.el.style.left = e.pageX + "px"
+    this.el.style.right = clamp(window.innerWidth - e.pageX, this.offset, window.innerWidth) + "px"
     this.el.style.top = e.pageY + "px"
+    this.lastPosition = e
   },
 
   show: function(name){
@@ -54,6 +57,16 @@ var HelpCursor = View.extend({
 
   message: function(name){
     if (! this.active) return
+    if (name == "start" || name == "media" || name == "settings") {
+      this.offset = 100
+    }
+    else if (name == "colors") {
+      this.offset = 270
+    }
+    else {
+      this.offset = 290
+    }
+    this.move(this.lastPosition)
     this.$el.html(this.messages[name])
   },