Changeset 478 for branches/sc36/model/sources/dkCore/genSld/wdt/mgr/scPresMgr.doss/scPresMgr.js

Timestamp:

06/16/09 11:47:05 (3 years ago)

Author:

sam

Message:

merge to #477

Location:

branches/sc36

Files:

• . (modified) (1 prop)
• model/sources/dkCore/genSld/wdt/mgr/scPresMgr.doss/scPresMgr.js (modified) (66 diffs)

branches/sc36/model/sources/dkCore/genSld/wdt/mgr/scPresMgr.doss/scPresMgr.js

@@ -17 +17 @@
  * samuel.monsarrat@kelis.fr
  *
- * Portions created by the Initial Developer are Copyright (C) 2008
+ * Portions created by the Initial Developer are Copyright (C) 2009
  * the Initial Developer. All Rights Reserved.
  *
@@ -47 +47 @@
         fNavPath : null,
         
+        /* Paths standards. */
         fContainerFilter : ".ssContainer",
         fContainerBlocksRootPath : "des:.ssBkRoot",
-        fBlkCoPath :       "des:.ssBkCo",
-        fCutableFilter :   ".ssCutable|p|ol|ul|li",
-        
+        fBlkCoPath : "des:.ssBkCo",
+        fCutableFilter : ".ssCutable|p|ol|ul|li",
+
+        /* Constantes de stylage. */
         fSsCssName : "modeSS",
+        fSsClassPrefix : "tpl",
 
         /* Constantes pour les animations. */
-        
         /** Largeur mini du slide */
         fBlockMinWidth : 500,
         /** Ratio de marge max par rapport à la largeur du container */
-        fBlockMaxMargin : .3,
+        fBlockMaxMargin : 0.3,
         /** Ratio d'espace libre à placer au dessus du contenu */
-        fBlockTopSpace : .3,
+        fBlockTopSpace : 0.3,
         /** Opacité pour les masks des steps. */
         fStepMaskOpacity : 0.9,
@@ -78 +80 @@
         fListeners : [],
         fToolElts : [],
+        fSldPosStyledElts : [],
+        fEnableEffects : true,
         
         /* Etats */
@@ -83 +87 @@
 
         /* Localisations */
-        fStrings : {en:["previous","previous image (left arrow)",       //0
-                    "next","next image (right arrow)",                  //2
-                    "close","close the zoom (ESC)",                     //4
-                    "WARNING: The Firebug extention is active.\nIt is advisable to deactivate Firebug while viewing this slide-show",""],//6
+        fStrings : {en:["previous","previous (left arrow)",       //0
+                    "next","next (right arrow)",                  //2
+                    "close","close the zoom (ESC)",               //4
+                    "WARNING: The Firebug extention is active.\nIt is advisable to deactivate Firebug while viewing this slide-show.",""],//6
                     fr:["Précédant","Précédant (flèche gauche)",
                     "Suivant","Suivant (flèche droite)",
                     "Fermer","Fermer le zoom (ESC)",
-                    "ATTENTION : L'extension Firebug est actif.\nIl est conseillé de désactiver Firebug pour visualiser ce diaporama.",""]
+                    "ATTENTION : L'extension Firebug est actif.\nIl est conseillé de désactiver Firebug pour visualiser ce diaporama.",""],
+                    es:["anterior","anterior (flecha izquierda)",
+              "siguiente","siguiente (flecha derecha)",
+              "cerrar","cerrar el zoom (ESC)",
+              "ATENCIÓN: La extensión Firebug esta activa.\nSe recomienda desactivar Firebug mientras consulte esa presentación",""]
                     },
 
@@ -116 +124 @@
                 //Init liste elements outils
                 this.fToolElts = new Array();
+                //Init liste elements stylés avec la position actuel dans le slide-show (FirstSlide LastSlide, FirstStep, LastStep)
+                this.fSldPosStyledElts = new Array();
 
                 scOnLoads[scOnLoads.length] = this;
@@ -122 +132 @@
                 this.fContainerFilter = pContainerFilter;
         },
+        setCutableFilter : function(pCutableFilter) {
+                this.fCutableFilter = pCutableFilter;
+        },
         setContainerBlocksRootPath : function(pContainerBlocksRootPath) {
                 this.fContainerBlocksRootPath = pContainerBlocksRootPath;
@@ -128 +141 @@
                 this.fBlkCoPath = pBlkCoPath;
         },
-        setCutableFilter : function(pCutableFilter) {
-                this.fCutableFilter = pCutableFilter;
-        },
+        /** Set paths of elements that constitute the zoom frame. */
+        setZoomPaths : function(pZoomFramePath,pZoomContentPath) {
+                this.fZoomFramePath = pZoomFramePath;
+                this.fZoomContentPath = pZoomContentPath;
+        },
+        /** register a path as a slide-position styled element. */
+        addSlidePositionStyledPath : function(pPath) {
+                this.fSldPosStyledElts.push(pPath);
+        },
+        /** register a listener. */
+        register : function(pType, pFunc) {
+                this.fListeners[pType].push(pFunc);
+        },
+        /** Enable / Disable auto tool hiding */
+        enableToolHider : function(pEnable) {
+                this.fToolHider = pEnable;
+                if (!pEnable) this.xShowTools();
+        },
+        /** Enable / Disable visual effects */
+        enableEffects : function(pEnable) {
+                this.fEnableEffects = pEnable;
+        },
+        /** Enable / Disable visual effects */
+        toggleEffects : function() {
+                this.fEnableEffects = ! this.fEnableEffects;
+        },
+        /** register a node as a tool (auto hidden elements). */
+        addToolElt : function(pNode) {
+                this.fToolElts.push(pNode);
+        },
+        /** Main OnLoad function called by the SCENARI framework. */
         onLoad : function() {
                 try{
@@ -166 +207 @@
                         //Init nav bar
                         this.fNav = scPaLib.findNode(this.fNavPath);
+                        this.fNav.fDefaultClass = this.fNav.className;
                         this.fNav.innerHTML = ""; // Purge the nav bar
                         this.fBtnPrv = this.xAddBtn(this.fNav, "btnPrv", this.xGetStr(0), this.xGetStr(1));
@@ -176 +218 @@
                         this.fSldHome.fSldMgr.initSld();
                         //Init zoom container
-                        this.fZoom = this.xAddEltHidden("div", document.body, "tplZm");
-                        this.fZoom.fSld = scPresMgr.xAddElt("div", this.fZoom, "tplZmSld");
-                        this.fZoom.fCo = this.xAddElt("div", this.fZoom, "tplZmCo");
-                        this.fZoom.fBtnCls = this.xAddBtn(this.fZoom, "btnZmCls", this.xGetStr(4), this.xGetStr(5));
+                        this.fZoom = (this.fZoomFramePath ? scPaLib.findNode(this.fZoomFramePath) : this.xAddElt("div", document.body, null));
+                        this.fZoom.className = this.fZoom.className + " "+this.fSsClassPrefix+"Zm"
+                        this.fZoom.style.visibility = "hidden";
+                        this.fZoom.fCo = (this.fZoomContentPath ? scPaLib.findNode(this.fZoomContentPath) : this.fZoom);
+                        this.fZoom.fSld = scPresMgr.xAddElt("div", this.fZoom.fCo, this.fSsClassPrefix+"ZmSld");
+                        this.fZoom.fFrg = this.xAddElt("div", this.fZoom.fCo, this.fSsClassPrefix+"ZmFrg");
+                        this.fZoom.fBtnCls = this.xAddBtn(this.fZoom.fCo, "btnZmCls", this.xGetStr(4), this.xGetStr(5));
+                        //Init slide-position styled elements
+                        for (var i in this.fSldPosStyledElts){
+                                this.fSldPosStyledElts[i] = scPaLib.findNode(this.fSldPosStyledElts[i]);
+                                if (this.fSldPosStyledElts[i]) this.fSldPosStyledElts[i].fBaseClass = this.fSldPosStyledElts[i].className;
+                        }
                         //Enable tool auto hiding
                         this.enableToolHider(true);
                         //Affichage du slide d'accueil (rendu instantanné)
                         this.fSwitchSldTask.initTask(this.fSldHome, "first", true);
+//                      this.xUpdateSldPosStyledElts();
                         if (!scCoLib.fDebug && window.console && window.console.firebug) alert(this.xGetStr(6));
                 }catch(e){scCoLib.util.logError("ERROR scPresMgr.onLoad : ", e);}
         },
         loadSortKey : "A",
-
         /** Load a slide by index id. 
          * @param pFromStart affiche le slide du début (true) ou de la fin (false).
@@ -195 +245 @@
          */
         loadSld : function(pIdx, pFromStart, pInstantResult) {
-                //scCoLib.util.log("scPresMgr.loadSld: "+pIdx);
+                scCoLib.util.log("scPresMgr.loadSld: "+pIdx);
                 this.xResetFocus();
                 return this.xGotoSlide(pIdx, pFromStart, pInstantResult);
         },
-
         /** Returns the current slide. */
         getCurrSld : function(){
                 return scPresMgr.fSwitchSldTask.fNewSld || this.fCurrSld;
         },
-
         /** Redessinement de la zone des slides (suite à resize notamment). */
         redrawSlideZone : function(){
@@ -221 +269 @@
                 }
         },
-
         /** Show the passed ressource in the zoom. */
         showZoom : function(pRes) {
                 return this.xShowZoom(pRes);
         },
-
         /** Returns true if the presentation has a next step / slide. */
         hasNxt : function() {
@@ -234 +280 @@
                 } else return false;
         },
-
         /** Returns true if the presentation has a previous step / slide. */
         hasPrv : function() {
@@ -241 +286 @@
                         return (vSld.fSldMgr.hasPrv() ? true : !vSld.fSldMgr.isFirstSld());
                 } else return false;
-        },
-
-        /** register a listener. */
-        register : function(pType, pFunc) {
-                this.fListeners[pType].push(pFunc);
-        },
-
-        /** Enable / Disable auto tool hiding */
-        enableToolHider : function(pEnable) {
-                this.fToolHider = pEnable;
-                if (!pEnable) this.xShowTools();
-        },
-
-        /** register a node as a tool (auto hidden elements). */
-        addToolElt : function(pNode) {
-                this.fToolElts.push(pNode);
         },
 
@@ -280 +309 @@
                 return true;
         },
-
         /** Move back 1 step / slide.
          * @param pSkip if true move to beginning of previous slide.
@@ -305 +333 @@
                         this.fBtnPrv.style.visibility = (vSld.fSldMgr.hasPrv() ? "" : (!vSld.fSldMgr.isFirstSld() ? "" : "hidden"));
                 }
-        },
-        
+                this.xUpdateSldPosStyledElts();
+        },
+        /** xUpdateSldPosStyledElts */
+        xUpdateSldPosStyledElts : function() {
+                // Add slide-postion classes on registed elements if needed.
+                var vSld = this.getCurrSld();
+                if (vSld && vSld.fSldMgr) {
+                        for (var i in this.fSldPosStyledElts){
+                                var vNewClass = this.fSldPosStyledElts[i].fBaseClass + (vSld.fSldMgr.isFirstSld() ? " "+this.fSsClassPrefix+"FirstSlide" + (!vSld.fSldMgr.hasPrv() ? " "+this.fSsClassPrefix+"FirstStep" : "") : (vSld.fSldMgr.isLastSld() ? " "+this.fSsClassPrefix+"LastSlide" + (!vSld.fSldMgr.hasNxt() ? " "+this.fSsClassPrefix+"LastStep" : "") : ""));
+//                              var vNewClass = this.fSldPosStyledElts[i].fBaseClass + (vSld.fSldMgr.isFirstSld() ? " "+this.fSsClassPrefix+"FirstSlide" + (!vSld.fSldMgr.hasPrv() ? " "+this.fSsClassPrefix+"FirstStep" : "") : "");
+                                if (this.fSldPosStyledElts[i].className != vNewClass) this.fSldPosStyledElts[i].className = vNewClass;
+                        }
+                }
+        },
         /** Navigation vers un slide. 
          * @param pFromStart affiche le slide du début (true) ou de la fin (false).
@@ -312 +352 @@
          */
         xGotoSlide : function(pIdx, pFromStart, pInstantResult) {
-                //scCoLib.util.log("scPresMgr.xGotoSlide: "+pIdx);
+                scCoLib.util.log("scPresMgr.xGotoSlide: "+pIdx);
                 try{
                         //Borne pIdx selon les limites du slide show
@@ -341 +381 @@
                                                 //Trouvé
                                                 scPresMgr.fSwitchSldTask.initTask(vSld, pFromStart? "first" : "last", pInstantResult);
+//                                              this.xUpdateSldPosStyledElts();
                                                 return true;
                                         }
@@ -348 +389 @@
                                 scPresMgr.fSwitchSldTask.initTask(this.xBuildSlide(pIdx), pFromStart? "first" : "last", pInstantResult);
                         }
+//                      this.xUpdateSldPosStyledElts();
                         return true;
                 }catch(e){scCoLib.util.logError("ERROR scPresMgr.xGotoSlide: ",e);}
         },
-        
         /** Affecte le nouveau slide "stabilisé" et devient la nouvelle référence.
          * Gère le cache des slides en fonction de cette nouvelle position.
@@ -390 +431 @@
                 }catch(e){scCoLib.util.logError("ERROR scPresMgr.xSetCurrSlide: ",e);}
         },
-        
         /** Chargement d'un slide. */
         xBuildSlide : function(pIdx) {
@@ -399 +439 @@
                 return vSld;
         },
-        
         /** Buttons manager. */
         xBtnMgr : function(pBtn){
@@ -412 +451 @@
                 this.xResetFocus();
         },
-        
         /** Event clavier. */
         sOnKeyUp : function(pEvent){
@@ -419 +457 @@
                 return scPresMgr.xKeyMgr(vCharCode);
         },
-
         /** scPresMgr.xKeyMgr */
         xKeyMgr : function(pCharCode){
@@ -435 +472 @@
                         case 80://p
                                 this.xPrv(); return false;
+                        case 70://f
+                                this.toggleEffects(); return false;
                         case 34://pg_dwn
                                 this.xNxt(true); return false;
@@ -445 +484 @@
                 }
         },
-
         /** scPresMgr.xShowZoom : display the zoom window
          * @param pRes : resource to zoom : if it is a anchor (A) then we zoom the href as a slide otherwise we clone/import the node
@@ -454 +492 @@
                 if (!vZm.fAct){
                         vZm.fAct = true;
-                        vZm.fCo.innerHTML = "";
+                        vZm.fFrg.innerHTML = "";
                         vZm.fSld.innerHTML = "";
                         vZm.fSldMgr = null;
                         if (pRes.nodeName.toLowerCase() == "a") {
-                                new scPresMgr.FadeEltTask(vZm.fCo,0,null,null,true);
+                                new scPresMgr.FadeEltTask(vZm.fFrg,0,null,null,true);
                                 new scPresMgr.FadeEltTask(vZm.fSld,1,null,null,true);
-                                vZm.fSldMgr = new scPresMgr.SldZoomMgr(vZm.fSld, pRes.href,function(){new scPresMgr.FadeEltTask(scPresMgr.fZoom,1);});
+                
+                                vZm.fSldMgr = new scPresMgr.SldZoomMgr(vZm.fSld, pRes.href,function(){new scPresMgr.FadeEltTask(scPresMgr.fZoom,1,this.sFadeEltStart,this.sFadeEltEnd);});
                                 vZm.fSldMgr.initSld();
                         } else {
-                                new scPresMgr.FadeEltTask(vZm.fCo,1,null,null,true);
+                                new scPresMgr.FadeEltTask(vZm.fFrg,1,null,null,true);
                                 new scPresMgr.FadeEltTask(vZm.fSld,0,null,null,true);
-                                vDst = scPresUt.importDeepNode(pRes, vZm.fCo.ownerDocument, vZm.fCo);
-                                new scPresMgr.FadeEltTask(vZm,1);
-                        }
+                                vDst = scPresUt.importDeepNode(pRes, vZm.fFrg.ownerDocument, vZm.fFrg);
+                                new scPresMgr.FadeEltTask(vZm,1,this.sFadeEltStart,this.sFadeEltEnd);
+                        }
+                        this.fNav.className = this.fNav.fDefaultClass + " "+this.fSsClassPrefix+"NavZoom";
                 } else {
                         if (pRes.nodeName.toLowerCase() == "a") {
@@ -474 +514 @@
                                 vZm.fSldMgr.initSld();
                         } else {
-                                vDst = scPresUt.importDeepNode(pRes, vZm.fCo.ownerDocument, vZm.fCo);
-                                new scPresMgr.FadeEltTask(vZm.fSld,0);
-                                new scPresMgr.FadeEltTask(vZm.fCo,1);
+                                vDst = scPresUt.importDeepNode(pRes, vZm.fFrg.ownerDocument, vZm.fFrg);
+                                new scPresMgr.FadeEltTask(vZm.fSld,0,this.sFadeEltStart,this.sFadeEltEnd);
+                                new scPresMgr.FadeEltTask(vZm.fFrg,1,this.sFadeEltStart,this.sFadeEltEnd);
                         }
                 }
                 return vDst;
         },
-
         /** scPresMgr.xHideZoom : hide the zoom window */
         xHideZoom : function(){
                 if (this.fZoom.fAct){
                         this.fZoom.fAct = false;
-                        new scPresMgr.FadeEltTask(this.fZoom, 0, null, function(){scPresMgr.fZoom.fSldMgr = null; scPresMgr.fZoom.fSld.innerHTML = ""; scPresMgr.fZoom.fCo.innerHTML = "";      scPresMgr.fNav.style.zIndex = "";});
-                }
-        },
-
+                        new scPresMgr.FadeEltTask(this.fZoom, 0, this.sFadeEltStart, this.sHideZoomEnd);
+                        this.fNav.className = this.fNav.fDefaultClass;
+                }
+        },
+        /** scPresMgr.sHideZoomEnd */
+        sHideZoomEnd : function(){
+                this.fElt.fSldMgr = null; 
+                this.fElt.fSld.innerHTML = "";
+                this.fElt.fFrg.innerHTML = "";
+                if (scCoLib.isIE) this.fElt.style.backgroundColor = "";
+        },
         /** scPresMgr.xGetZoomContainer : return the zoom container */
         xGetZoomContainer : function(){
-                return this.fZoom.fCo;
-        },
-
+                return this.fZoom.fFrg;
+        },
         /** scPresMgr.xGetZoomSlide : return the zoom iframe container */
         xGetZoomSlide : function(){
                 return this.fZoom.fFra;
         },
-
         /** scPresMgr.xResetFocus - sets the focus to the current slide. */
         xResetFocus : function() {
@@ -510 +554 @@
                 }
         },
-        /** scPresMgr.xNotifyListeners - calls all the listeners of a given type.
-         */
+        /** scPresMgr.xNotifyListeners - calls all the listeners of a given type. */
         xNotifyListeners : function(pType,pRes) {
                 //scCoLib.util.log("scPresMgr.xNotifyListeners: "+pType);
@@ -521 +564 @@
                 }
         },
-
         /** scPresMgr.xHideTools : tool hider */
         xHideTools : function(){
@@ -530 +572 @@
                                 for (i in this.fToolElts) {
                                         try {
-                                                new this.FadeEltTask(this.fToolElts[i],0,this.sFadeToolsStart,this.sFadeToolsEnd);
+                                                new this.FadeEltTask(this.fToolElts[i],0,this.sFadeEltStart,this.sFadeEltEnd);
                                         } catch(e) {scCoLib.util.logError("ERROR scPresMgr.xHideTools: ",e);}
                                 }
@@ -536 +578 @@
                 }
         },
-
         /** scPresMgr.xShowTools : mouse event manager */
         xShowTools : function(){
@@ -543 +584 @@
                         for (i in this.fToolElts) {
                                 try {
-                                        new this.FadeEltTask(this.fToolElts[i],1,this.sFadeToolsStart,this.sFadeToolsEnd);
+                                        new this.FadeEltTask(this.fToolElts[i],1,this.sFadeEltStart,this.sFadeEltEnd);
                                 } catch(e) {scCoLib.util.logError("ERROR scPresMgr.xShowTools: ",e);}
                         }
@@ -549 +590 @@
                 this.fToolsShowTime = new Date().getTime();
         },
-
         /** Init tous les blocks fils d'un blockRoot (du slide ou d'un container) */
         xInitBlocks : function(pParentMgr, pBlockRoot){
@@ -570 +610 @@
                 return vResult;
         },
-
         /** scPresMgr.sOnClickTocLnk : TOC item onclick event */
         sOnClickTocLnk : function(){
@@ -576 +615 @@
                 return false;
         },
-        
         /** scPresMgr.sMouseMgr : mouse event manager */
         sMouseMgr : function(){
                 if (scPresMgr.fToolHider) scPresMgr.xShowTools();
         },
-
         /** scPresMgr.sHeartbeat : run every second. */
         sHeartbeat : function(){
                 if (scPresMgr.fToolHider) scPresMgr.xHideTools();
         },
-
-        /** scPresMgr.sFadeToolsStart */
-        sFadeToolsStart : function(){
-                if (scCoLib.isIE) this.fElt.style.backgroundColor = scPresMgr.xReadStyle(scPresMgr.fSldFra, "backgroundColor") || "white";
-        },
-        /** scPresMgr.sFadeToolsEnd */
-        sFadeToolsEnd : function(){
+        /** scPresMgr.sFadeEltStart */
+        sFadeEltStart : function(){
+                var vBkColor = scPresMgr.xReadStyle(scPresMgr.fSldFra, "backgroundColor") || "white";
+                if (scCoLib.isIE) this.fElt.style.backgroundColor = (vBkColor == "transparent" ? "white" : vBkColor);
+        },
+        /** scPresMgr.sFadeEltEnd */
+        sFadeEltEnd : function(){
                 if (scCoLib.isIE) this.fElt.style.backgroundColor = "";
         },
@@ -606 +643 @@
                         if (pNxtSib) pParent.insertBefore(vFrmHolder,pNxtSib)
                         else pParent.appendChild(vFrmHolder);
-                        vFrmHolder.innerHTML = "<iframe scrolling='no' frameborder='0'></iframe>";
+                        vFrmHolder.innerHTML = "<iframe scrolling='no' frameborder='0' allowtransparency='true'></iframe>";
                         vElt = vFrmHolder.firstChild;
                 } else {
@@ -618 +655 @@
                 return vElt;
         },
-
         /** scPresMgr.xAddEltNoDisp : Add a non displayed HTML element to a parent node. */
         xAddEltNoDisp : function(pName, pParent, pClassName) {
@@ -624 +660 @@
                 return vElt;
         },
-
         /** scPresMgr.xAddEltHidden : Add a hidden HTML element to a parent node. */
         xAddEltHidden : function(pName, pParent, pClassName) {
@@ -630 +665 @@
                 return vElt;
         },
-
         /** scPresMgr.xAddBtn : Add a HTML button to a parent node. */
         xAddBtn : function(pParent, pClassName, pCapt, pTitle, pNxtSib) {
@@ -648 +682 @@
                 return vBtn;
         },
-
         /** scPresMgr.xReadStyle : Read a style property (inline or CSS). */
         xReadStyle : function(pElt, pProp) {
@@ -669 +702 @@
                 }
         },
-
         /** scPresMgr.xGetEltTop : Retrun an element's absolute top (from pRoot or the top of the page).
          * @param pElt start element.
@@ -684 +716 @@
                 return vY;
         },
-
         /** scPresMgr.xGetEltH : Retrun an element's height. */
         xGetEltH: function(pElt) {
                 return(scCoLib.toInt(pElt.style.pixelHeight || pElt.offsetHeight));
         },
-        
         /** Set the opacity of a given node.
          * @param pRate Variable de 0 à 1.
@@ -697 +727 @@
                 else pNode.style.opacity = pRate;
         },
-
         /** Start the opacity of a given node.
          * On ajoute le filtre d'opacité sur IE.
@@ -708 +737 @@
                 pNode.style.visibility = "";
         },
-
         /** End the opacity of a given node.
          * On supprime le filtre d'opacité sur IE (évite des bugs de refresh).
@@ -720 +748 @@
                 else pNode.style.visibility = "";
         },
-
         /** Reteive a localized string. */
         xGetStr: function(pStrId) {
@@ -735 +762 @@
                 fNewSld: null,
                 fStatus: null,
-                
                 fIdx: -1,
                 fRateOld: [.9, .8, .7, .5, .3, .2, .1,  0,  0,  0,  0],
                 fRateNew: [ 0,  0,  0,  0, .1, .2, .3, .5, .7, .8, .9],
-                
-                /**
-                 * Init la task pour accéder à un nouveau slide.
+                /** Init la task pour accéder à un nouveau slide.
                  * @param pBlock block à afficher.
                  * @param pStatus 
@@ -751 +775 @@
                         //scCoLib.util.log("fSwitchSldTask.initTask: status: "+pStatus);
                         try{
+                        if (!scPresMgr.fEnableEffects) pInstantResult = true;
                         //On annule tout autre task en cours
                         scPresMgr.fSwitchStpTask.precipitateEndTask();
@@ -840 +865 @@
                                 scPresMgr.xEndOpacityEffect(this.fNewSld, 1);
                         }
+                        scPresMgr.xUpdateGui();
                         scPresMgr.xSetCurrSlide(this.fNewSld);
-                        scPresMgr.xUpdateGui();
                         this.fNewSld = null;
                         this.fIdx = -1;
@@ -868 +893 @@
                 fNewBlock: null,
                 fStep: 0,
-                
                 fIdx: -1,
                 fRateOld: [.9, .8, .7, .5, .3, .2, .1,  0,  0,  0,  0],
                 fRateNew: [ 0,  0,  0,  0, .1, .2, .3, .5, .7, .8, .9],
-        
-                /**
-                 * init la task pour accéder à un nouveau block.
+                /** init la task pour accéder à un nouveau block.
                  * @param pTarget Block/Step cible à afficher
                  *                      "F" : First
@@ -885 +907 @@
                         //scCoLib.util.log("fSwitchBlkTask.initTask: "+pNewBlock);
                         try{
+                        if (!scPresMgr.fEnableEffects) pInstantResult = true;
                         //On précipite le chgt de steps.
                         scPresMgr.fSwitchStpTask.precipitateEndTask();
@@ -965 +988 @@
                 /** Mask précédent qui détenait le focus. */
                 fOldMask : null,
-                
-                /**
-                 * init la task pour accéder à un nouveau step.
+                /** init la task pour accéder à un nouveau step.
                  * @param pTargetStep Step cible à passer en focus
                  *                      "F" : First (pInstantResult est alors forcé à true)
@@ -979 +1000 @@
                 initTask : function(pBlock, pTargetStep, pInstantResult){
                         try{
+                                if (!scPresMgr.fEnableEffects) pInstantResult = true;
                                 if(this.fBlockMgr) {
                                         this.precipitateEndTask();
@@ -1062 +1084 @@
                         }
                         }catch(e){scCoLib.util.log("ERROR fSwitchStpTask.execTask: "+e);}
-                }
-                ,
+                },
                 /** Permet de précipiter la fin de la task en cours. */
                 precipitateEndTask : function(){
@@ -1114 +1135 @@
                 var vSldMgr = this.fSldMgr;
                 scCoLib.util.log("scPresMgr.SldMgr.sOnLoadSld: "+vSldDoc.title);
-                
                 // Enable fSsCssName CSS on slide
                 var vCss = null;
@@ -1298 +1318 @@
 scPresMgr.SldZoomMgr.prototype.postOnLoad = function() {
         scPresMgr.fSwitchBlkTask.initTask(this.fCurrBlk, this.getFirstBlock(), "F", true);
-        scPresMgr.fNav.style.zIndex = this.hasNxt() ? "100" : "";
         this.fPostLoadFunc();
 }
@@ -1375 +1394 @@
                         }
                 }
-        } else {
-                this.fCurrStep = -1;
-        }
-        
+        } else this.fCurrStep = -1;
         // Centre le block dans son container
         this.xCenterBlock();
-        
         // Resize ok
         this.fNeedResize = false;
-
         //On resize et redessine le block
         scPresMgr.fSwitchBlkTask.initTask(this.fBlkNode, this.fBlkNode, "S", true);
@@ -1409 +1423 @@
                 // Flag ok
                 this.fNeedResize = false;
-
-                //scCoLib.util.log("Afetr RESIAZE : this.fTargetStepIdx: "+pTarget+" - "+this.fCurrStep);
-                //scCoLib.util.log("Afetr RESIAZE : this.fBlockMgr.fMasks: "+this.fMasks);
         }
         //Redraw sans animation des steps du block.
@@ -1475 +1486 @@
         if(! this.fAllSteps || this.fAllSteps.length==0) return;
         //On fige les dimensions du content du block
-        var vContentH = Math.max(20, vAvailH - scPresMgr.xGetEltTop(this.fBlkContent,this.fParentMgr.fBlocksRoot));
+        var vContentH = Math.max(20, vAvailH - scPresMgr.xGetEltTop(this.fBlkNode,this.fParentMgr.fBlocksRoot) - (this.fBlkNode.offsetHeight - this.fBlkContent.offsetHeight));
         vBlkContentStyle.position = "absolute";
         vBlkContentStyle.width = "100%";
@@ -1492 +1503 @@
                 var vTop = pNode.offsetTop;
                 var vH = vTop - vPreviousTop;
-                if(vH > vAvailH) return -1;
+                if(vH > vContentH) return -1;
                 //Malus en fonction de la profondeur de cuttable au dessus
                 var vP = pNode.parentNode;
@@ -1500 +1511 @@
                 }
                 //Malus si le dernier step devient plus petit que celui-là
-                if( vRealH - vTop < vTop - vPreviousTop) vH -= (vAvailH - (vRealH - vTop))/2;
+                if( vRealH - vTop < vTop - vPreviousTop) vH -= (vContentH - (vRealH - vTop))/2;
                 return 1000000 + vH;
         }
@@ -1522 +1533 @@
                         vPreviousAllStepsIdx = vBestIdx;
                 }
-        } while(vBestIdx>=0 && (vRealH-vPreviousTop > vAvailH));
+        } while(vBestIdx>=0 && (vRealH-vPreviousTop > vContentH));
         //On crée le tableau des masks
         if(! this.fMasks) this.fMasks = [];
@@ -1601 +1612 @@
         this.fBlkNode = pBlkContainerNode;
         this.fBlkIdx = pBlkIdx;
-        
         // Racine des blocks du container.
-        this.fSubBlocksRoot = scPaLib.findNode(scPresMgr.fContainerBlocksRootPathComp, this.fBlkNode);
-        
+        this.fBlocksRoot = scPaLib.findNode(scPresMgr.fContainerBlocksRootPathComp, this.fBlkNode);
         //Fixe les dim du container
         this.xFixContainerSize();
-        
         //init les blocks de ce container
-        this.fSubBlocks = scPresMgr.xInitBlocks(this, this.fSubBlocksRoot);
-        
+        this.fSubBlocks = scPresMgr.xInitBlocks(this, this.fBlocksRoot);
         // Sous-bloc en cours.
         this.fCurrSubBlk = null;
@@ -1724 +1731 @@
 /** Hauteur disponible pour les fils de ce container. */
 scPresMgr.BlkContainerMgr.prototype.getAvailHeight = function(){
-        return this.fSubBlocksRoot.offsetHeight;
+        return this.fBlocksRoot.offsetHeight;
 }
 /** Largeur disponible pour les fils de ce container. */
 scPresMgr.BlkContainerMgr.prototype.getAvailWidth = function(){
-        return this.fSubBlocksRoot.offsetWidth;
+        return this.fBlocksRoot.offsetWidth;
 }
 /** Fixe la taille du container dans son contexte parent. */
 scPresMgr.BlkContainerMgr.prototype.xFixContainerSize = function(){
         var vBodyH = this.fParentMgr.getAvailHeight();
-        var vTop = this.fSubBlocksRoot.offsetTop;
+        var vTop = this.fBlocksRoot.offsetTop;
         //scCoLib.util.log("vBodyH: "+vBodyH+" - vTop"+vTop);
-        this.fSubBlocksRoot.style.height = Math.max(50, vBodyH - vTop)+"px";
+        this.fBlocksRoot.style.height = Math.max(50, vBodyH - vTop)+"px";
         this.fNeedResize = false;
 }
-
-
-
 
 /** scPresMgr.FadeEltTask : TiLib task that fades a given element in or out.
@@ -1758 +1762 @@
                 this.fStartFunc = pStartFunc || function(){};
                 this.fEndFunc = pEndFunc || function(){};
-                if (pInstant) {
+                if (pInstant || !scPresMgr.fEnableEffects) {
                         this.terminate();
                         return;
@@ -1800 +1804 @@
 }
 
-/** scSlideMgr : scSlideMgr pour le homeSlide.
- */
+/** scSlideMgr : scSlideMgr pour le homeSlide. */
 var scSlideMgr = {
         fDefaultFontSize : 22, // fontSize in pixels
@@ -1826 +1829 @@
                 return this.fBlocksRoot.offsetWidth;
         },
-
         /** Api scSiLib. */
         onResizedAnc : function(pOwnerNode, pEvent) {
@@ -1861 +1863 @@
 }
 
-/** scPresUt : Browser dependant utility toolbox.
- */
+/** scPresUt : Browser dependant utility toolbox. */
 var scPresUt = {};
 if(scCoLib.isIE) {