--- a/front_idill/src/mosaic/js/pointers.js Fri Jul 06 13:44:25 2012 +0200
+++ b/front_idill/src/mosaic/js/pointers.js Mon Jul 09 14:24:42 2012 +0200
@@ -295,7 +295,7 @@
//On permet l'interaction après un laps de temps.
_this.canSlideInTL = true;
- $('.notifications').remove();
+ _this.removeNotifications();
_this.timelineTimeline();
// console.log('(4) TIMELINE SLIDE ' + _this.date());
@@ -574,7 +574,7 @@
//On permet l'interaction après un laps de temps.
_this.canSlideInTL = true;
- $('.notifications').remove();
+ _this.removeNotifications();
_this.timelineTimeline();
// console.log('(4) TIMELINE SLIDE ' + _this.date());
@@ -818,7 +818,7 @@
console.log(_this.date() + ' - ENTRE EN MODE FILTRAGE');
- $('.notifications').remove();
+ _this.removeNotifications();
_this.filterSearch();
}
else if(_this.currentMode == "VIDEO" || _this.currentMode == "TIMELINE")
@@ -828,7 +828,7 @@
console.log(_this.date() + ' - ENTRE EN MODE RECHERCHE');
// console.log('');
- $('.notifications').remove();
+ _this.removeNotifications();
_this.searchSearch();
}
@@ -969,7 +969,12 @@
_this.alreadyOnNotification = false;
_this.isCurrentlyInASearchByGesture = false;
- _this.currentSearchGesture = '';
+
+ if(_this.currentMode != 'MOSAIC' && _this.currentMode != 'FILTER')
+ {
+ _this.currentSearchGesture[_this.centerId] = '';
+ }
+
_this.canNotifyHelp = false;
}, this.config['timeoutRemoveNotificationByGesture']);
}
@@ -1019,16 +1024,18 @@
{
if(x > notification_search.position().left && x < (+notification_search.position().left + notification_search.width()) && y > notification_search.position().top && y < (+notification_search.position().top + notification_search.height()))
{
- $('.notifications').remove();
+ _this.removeNotifications();
if(_this.currentMode == 'SEARCH')
{
_this.player.widgets[0].removeSearchByGesture();
_this.currentMode = 'VIDEO';
+ _this.currentSearchGesture[_this.centerId] = '';
}
else if(_this.currentMode == 'TIMELINE')
{
_this.player.widgets[0].removeSearchByGesture();
_this.currentMode = 'TIMELINE';
+ _this.currentSearchGesture[_this.centerId] = '';
}
else if(_this.currentMode == 'FILTER')
{