--- a/front_idill/src/mosaic/js/notifications.js Mon Jul 30 16:45:46 2012 +0200
+++ b/front_idill/src/mosaic/js/notifications.js Tue Jul 31 16:26:00 2012 +0200
@@ -68,7 +68,7 @@
search_2hands_tab_text = ['no-motion', 'contact', 'grand-jete', 'screw', 'arc', 'circle', 'up-down', 'wave'];
search_body_tab = ['chute', 'knee_up', 'jump', 'bend'];
search_body_tab_text = ['fall', 'knee-up', 'jump', 'bend'];
- search_2hands_tab_opacities = [0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5];
+ search_2hands_tab_opacities = [1, 1, 1, 1, 1, 1, 1, 1];
search_body_tab_opacities = [1, 1, 1, 1];
}
@@ -91,7 +91,7 @@
else
{
controls_1hand_tab = ['deplacer', 'precedent', 'suivant', 'mosaique_horizontal', 'mosaique_vertical', 'move_down', 'move_up', 'move_right', 'move_left'];
- controls_1hand_tab = ['controls_timeline', 'controls_previous', 'controls_next', 'controls_mos_horizontal', 'controls_mos_vertical', 'controls_move_down', 'controls_move_up', 'controls_move_right', 'controls_move_left'];
+ controls_1hand_tab_text = ['controls_timeline', 'controls_previous', 'controls_next', 'controls_mos_horizontal', 'controls_mos_vertical', 'controls_move_down', 'controls_move_up', 'controls_move_right', 'controls_move_left'];
controls_1hand_tab_opacities = [1, 1, 1, 1, 1, 1, 1, 1, 1];
}
}
@@ -279,12 +279,12 @@
$('#controls_title').html(this.helpText.controls_title);
$('#controls_1hand_text').html(this.helpText.controls_1hand_text);
- //On affecte les images des actions de contrôle de l'interface.
- for(var i = 0 ; i < controls_1hand_tab.length ; i++)
- {
- $("#1hand_" + controls_1hand_tab[i]).css("background-image", "url('" + img_directory + controls_1hand_tab[i] + ".png')");
- $("#1hand_" + controls_1hand_tab[i]).html(this.helpText[controls_1hand_tab_text[i]]);
- }
+ //On affecte les images des actions de contrôle de l'interface.
+ for(var i = 0 ; i < controls_1hand_tab.length ; i++)
+ {
+ $("#1hand_" + controls_1hand_tab[i]).css("background-image", "url('" + img_directory + controls_1hand_tab[i] + ".png')");
+ $("#1hand_" + controls_1hand_tab[i]).html(this.helpText[controls_1hand_tab_text[i]]);
+ }
//On les fait apparaître.
$('#notify_help').css(
@@ -307,6 +307,8 @@
*/
Mosaic.prototype.removeHelp = function()
{
+ // console.trace();
+
//Si l'aide n'est pas affichée, on part.
if(!this.helpDisplayed)
{
@@ -553,7 +555,7 @@
{
return;
}
-
+
var _this = this;
//On spécifie les notifications en div.
@@ -569,7 +571,7 @@
if(_.include(this.gestures, gestureName))
{
- $('#notify_search_1gesture').css('background-image', 'url("./pictos/big/' + (this.config.mouseInteractions ? 'MI' : '') + '/' + (this.gestureDelRequested ? 'hover' : 'valid') + '/' + gestureName + '.png")');
+ $('#notify_search_1gesture').css('background-image', 'url("./pictos/big/' + (this.config.mouseInteractions ? 'MI/' : '') + (this.gestureDelRequested ? 'hover' : 'valid') + '/' + gestureName + '.png")');
}
else if(mode == 'none')
{
@@ -620,7 +622,7 @@
if(_.include(this.gestures, gestureName))
{
- $('#notify_search_1gesture').css('background-image', 'url("./pictos/big/' + (this.config.mouseInteractions ? 'MI' : '') + '/' + mode + '/' + gestureName + '.png")');
+ $('#notify_search_1gesture').css('background-image', 'url("./pictos/big/' + (this.config.mouseInteractions ? 'MI/' : '') + mode + '/' + gestureName + '.png")');
}
else if(mode == 'none')
{
@@ -682,7 +684,7 @@
var notifyTop = 0, notifyLeft = 0;
- if(direction.equals("left"))
+ if(direction == "left")
{
this.putText($('#notify_swipe'), this.notificationStrings.next);
}
@@ -999,7 +1001,7 @@
var notifyTop = 0, notifyLeft = 0;
this.putText($('#notify_search'), this.notificationStrings.search);
- if(direction.equals("left"))
+ if(direction == "left")
{
this.putText($('#notify_swipe'), this.notificationStrings.next);
}
@@ -1312,7 +1314,7 @@
$('#notify_search_1gesture').css('background-image', 'url("./pictos/big/normal/inconnu.png")');
}
- if(direction.equals("left"))
+ if(direction == "left")
{
this.putText($('#notify_swipe'), this.notificationStrings.next);
}