Merge branch 'text-experiment' of github.com:Doodle3D/doodle3d-client into text-experiment

js/Help.js

@@ -56,12 +56,13 @@ function GrandTour(_name) {
         $(this).joyride('set_li', false);
       }
     }
-
+    
+    
     // bring up thermometer and progressbar to explain them
     thermometer.show();
     progressbar.show();
     message.hide();
-
+    
   };
   this.preStepCallback = function(index, tip) {
 //    console.log("GrandTour >> f:preStepCallback() >> index: " + index);
@@ -71,51 +72,17 @@ function GrandTour(_name) {
 
     var dataset = $(this)[0].$li[0].dataset;
     if (dataset.action != undefined) {
-      console.log("    THERE'S AN ACTION!");
       switch (dataset.action) {
-        case "sayHello":
-          console.log("    action: sayHello");
-          break;
         case "showMessage":
           console.log("    action: showMessage");
           message.set("This is a status message...", Message.NOTICE);
-//          message.show();
-          break;
-        case "showProgressBar":
-          console.log("    action: showProgressBar");
-          progressbar.show();
-          break;
-        case "showThermometer":
-          console.log("    action: showThermometer");
-          thermometer.show();
           break;
       }
     }
   };
   this.postStepCallback = function(index, tip) {
-    console.log("GrandTour >> f:postStepCallback() >> index: " + index);
+    //console.log("GrandTour >> f:postStepCallback() >> index: " + index);
-
+   // var dataset = $(this)[0].$li[0].dataset;
-    var dataset = $(this)[0].$li[0].dataset;
-    if (dataset.action != undefined) {
-      console.log("    THERE *WAS* AN ACTION!");
-      switch (dataset.action) {
-        case "sayHello":
-//          console.log("    action: sayHello");
-          break;
-        case "showMessage":
-//          console.log("    action: showMessage");
-//          message.hide();
-          break;
-        case "showProgressBar":
-//          console.log("    action: showProgressBar");
-//          progressbar.hide();
-          break;
-        case "showThermometer":
-//          console.log("    action: showThermometer");
-//          thermometer.hide();
-          break;
-      }
-    }
   };
   this.postRideCallback = function(index, tip) {
 //    console.log("GrandTour >> f:postRideCallback() >> index: " + index + ", self.active: " + self.active);

js/buttonbehaviors.js

@@ -177,18 +177,16 @@ function initButtonBehavior() {
 
   enableButton(btnSettings, openSettingsWindow);
 
-
+  
   // 29-okt-2013 - we're not doing help for smartphones at the moment
   if (clientInfo.isSmartphone) {
     btnInfo.addClass("disabled");
   } else {
-    btnInfo.mouseup(function(e) {
+  	function onBtnInfo(e) {
-      e.preventDefault();
+  		helpTours.startTour(helpTours.WELCOMETOUR);
-      console.log("btnInfo mouse up");
+    }
-      helpTours.startTour(helpTours.WELCOMETOUR);
+    enableButton(btnInfo, onBtnInfo);
-    });
   }
-
 }
 
 function stopPrint() {

js/main.js

@@ -131,14 +131,14 @@ function disableDragging() {
 function enableButton(elem, handler) {
 	//var elem = $('#'+domId);
 	elem.removeClass("disabled");
- 	elem.unbind('click');
+ 	elem.unbind('onButtonClick');
- 	elem.bind('click', handler);
+ 	elem.bind('onButtonClick', handler);
 }
 
 function disableButton(elem) {
 	//var elem = $('#'+domId);
 	elem.addClass("disabled");
- 	elem.unbind('click');
+ 	elem.unbind('onButtonClick');
 }
 
 function showOrHideThermo() {

less/base.less

@@ -45,7 +45,7 @@ body {
   transition: opacity .35s linear;
   position: absolute;
   left: 0px;
-  z-index: -5;
+  //z-index: -5;
 }
 
 #bgTop {

less/buttons.less

@@ -146,15 +146,6 @@
   }
 }
 
-/*#btnAddOpen {
-  position: absolute;
-  top: 370px;
-  left: 60px;
-  z-index: 1000;
-  width: 200%;
-  display: none;
-}*/
-
 .buttonGroup {
   /*background-color: white;*/
   background-color: #fff;

less/help_joyride-2.1.less

@@ -299,7 +299,7 @@
 .joyride-expose-cover {
   background: transparent;
   position: absolute;
-  z-index: 10000;
+  //z-index: 10000;
   top: 0;
   left: 0;
   border-radius: 5px;

less/message.less

@@ -13,7 +13,7 @@
   color: #333;
   white-space:nowrap;
 
-  z-index: 5;
+  //z-index: 5;
 	
   display:none;
 

www/helpcontent.html

@@ -20,7 +20,7 @@
     <h2>Save</h2>
     <p>Saves your doodle to the local Doodle3D Wi-Fi box.</p>
   </li>
-  <li data-id="btnsPrevNext" data-button="Next" data-options="tipLocation:right;tipAdjustmentY:-25" data-action="sayHello">
+  <li data-id="btnsPrevNext" data-button="Next" data-options="tipLocation:right;tipAdjustmentY:-25">
     <h2>View saved doodles</h2>
     <p>Use the buttons '<' and '>' to flip through all the saved doodles on your Wi-Fi box.</p>
   </li>
@@ -36,6 +36,10 @@
     <h2>Doodle area</h2>
     <p>This is the drawing canvas. Unleash your inner artist!</p>
   </li>
+  <li data-id="btnToggleEdit" data-button="Next" data-options="tipLocation:right">
+    <h2>Edit</h2>
+    <p>Behind this button you'll find buttons to do simple 2D edits</p>
+  </li>
   <li data-id="preview" data-button="Next" data-options="tipLocation:left">
     <h2>Preview</h2>
     <p>The preview field shows a preview of how your doodle will look in real life.</p>