vmario/doodle3d-client
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2025-06-11 17:23:17 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wouter R
2014-01-17 13:00:08 +01:00
parent b25044d2d6 62f2bc824b
commit 032d6413f7
8 changed files with 21 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
js/Help.js
View File

@ -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);
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;
}
}
//console.log("GrandTour >> f:postStepCallback() >> index: " + index);
// var dataset = $(this)[0].$li[0].dataset;
};
this.postRideCallback = function(index, tip) {
// console.log("GrandTour >> f:postRideCallback() >> index: " + index + ", self.active: " + self.active);

12
js/buttonbehaviors.js
View File

@ -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) {
e.preventDefault();
console.log("btnInfo mouse up");
helpTours.startTour(helpTours.WELCOMETOUR);
});
function onBtnInfo(e) {
helpTours.startTour(helpTours.WELCOMETOUR);
}
enableButton(btnInfo, onBtnInfo);
}
}
function stopPrint() {

6
js/main.js
View File

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