front_idill/src/mosaic/js/zoomInteractions.js
changeset 89 b6a115568b52
parent 79 9eff85166868
--- a/front_idill/src/mosaic/js/zoomInteractions.js	Wed Aug 29 11:29:14 2012 +0200
+++ b/front_idill/src/mosaic/js/zoomInteractions.js	Sun Sep 09 15:11:32 2012 +0200
@@ -25,7 +25,7 @@
  */
 Mosaic.prototype.preZoom = function(snapshot)
 {
-    if(this.currentMode == "NO-USER" || this.currentMode.indexOf("INCOMING") > -1 || snapshot == null || this.helpDisplayed || this.isMosaicFiltering || this.isSearchByCurvesOn || this.gestureDelRequested)
+    if(this.currentMode == "NO-USER" || this.currentMode.indexOf("INCOMING") > -1 || snapshot == null || this.helpDisplayed || this.creditsDisplayed || this.isMosaicFiltering || this.isSearchByCurvesOn || this.gestureDelRequested)
     {
         return;
     }
@@ -273,7 +273,7 @@
     var _this = this;
     
     //Si la mosaïque est en pleine écran, pas la peine de zoomer.
-    if(this.currentMode == "VIDEO" || this.currentMode == "SEARCH" || this.currentMode.indexOf("INCOMING") > -1 || this.helpDisplayed || this.isMosaicFiltering)
+    if(this.currentMode == "VIDEO" || this.currentMode == "SEARCH" || this.currentMode.indexOf("INCOMING") > -1 || this.helpDisplayed || this.creditsDisplayed || this.isMosaicFiltering)
     {
         return;
     }