front_idill/src/mosaic/js/neighbours.js
changeset 45 0e29ae4568a0
parent 44 8393d3473b98
child 47 4e1ee94d70b1
--- a/front_idill/src/mosaic/js/neighbours.js	Fri Jun 29 16:16:24 2012 +0200
+++ b/front_idill/src/mosaic/js/neighbours.js	Thu Jul 05 16:04:33 2012 +0200
@@ -238,22 +238,43 @@
             opacity: '1'
         }, _this.config['timeNeighbourGlowing'], function()
 		{
-			console.log('SWAG !!!', _this.currentMode, _this.currentSearchGesture);
-			if(_this.currentMode == 'VIDEO')
-			{
-				$('.notifications').remove();
-				_this.videoMoveAndUnzoom(snapshotId);
-			}
-			else if(_this.currentMode == 'SEARCH' && !_this.currentSearchGesture)
+			if(_this.mouseInteractions)
 			{
-				$('.notifications').remove();
-				_this.searchSearchAndMoveAndUnzoom(snapshotId);
+				if(_this.currentMode == 'VIDEO')
+				{
+					$('.notifications').remove();
+					_this.videoMove(snapshotId);
+				}
+				else if(_this.currentMode == 'SEARCH' && !_this.currentSearchGesture)
+				{
+					$('.notifications').remove();
+					_this.searchSearchAndMove(snapshotId);
+				}
+				else if(_this.currentMode == 'SEARCH' && _this.currentSearchGesture)
+				{
+					$('.notifications').remove();
+					_this.searchGestureAndMove(_this.currentSearchGesture, 'valid', snapshotId);
+				}
+				
+				_this.canMoveToNeighbour = true;
 			}
-			else if(_this.currentMode == 'SEARCH' && _this.currentSearchGesture)
+			else
 			{
-				$('.notifications').remove();
-				console.log('swag');
-				_this.searchGestureAndMoveAndUnzoom(_this.currentSearchGesture, 'valid', snapshotId);
+				if(_this.currentMode == 'VIDEO')
+				{
+					$('.notifications').remove();
+					_this.videoMoveAndUnzoom(snapshotId);
+				}
+				else if(_this.currentMode == 'SEARCH' && !_this.currentSearchGesture)
+				{
+					$('.notifications').remove();
+					_this.searchSearchAndMoveAndUnzoom(snapshotId);
+				}
+				else if(_this.currentMode == 'SEARCH' && _this.currentSearchGesture)
+				{
+					$('.notifications').remove();
+					_this.searchGestureAndMoveAndUnzoom(_this.currentSearchGesture, 'valid', snapshotId);
+				}
 			}
 		});