Changeset 468 for trunk

Timestamp:

02/02/09 17:58:53 (3 years ago)

Author:

sam

Message:

sync

Location:

trunk/model/sources/dkCore/genSld/wdt/mgr

Files:

• scPresMgr.doss/scPresMgr.js (modified) (22 diffs)
• scPresMgr.uiwidget (modified) (1 diff)
• scSlideMgr.doss/scSlideMgr.js (modified) (4 diffs)
• scSlideMgr.uiwidget (modified) (1 diff)

trunk/model/sources/dkCore/genSld/wdt/mgr/scPresMgr.doss/scPresMgr.js

@@ -77 +77 @@
         fCutableFilterComp : null,
         fListeners : [],
+        fToolElts : [],
         
         /* Etats */
@@ -85 +86 @@
          * @param pSldFraPath : path to the slide frame.
          * @param pNavPath : path to the navigation bar.
-         * @param pTocPath : path to table of contents.
-         * @param pTocLnksPath : relative path to all toc entries.
-         */
-        init : function(pSldFraPath, pNavPath, pTocPath, pTocLnksPath) {
+         * @param pTocLnksPath : path to all toc entries.
+         */
+        init : function(pSldFraPath, pNavPath, pTocLnksPath) {
                 //scCoLib.util.log("scPresMgr.init");
                 this.fSldFraPath = pSldFraPath;
                 this.fNavPath = pNavPath;
-                this.fTocPath = pTocPath;
-                this.fTocLnksPath = pTocLnksPath || "des:a";
+                this.fTocLnksPath = pTocLnksPath;
                 //Compilations paths et filters
                 this.fContainerFilterComp = scPaLib.compileFilter(this.fContainerFilter);
@@ -99 +98 @@
                 this.fBlkCoPathComp = scPaLib.compilePath(this.fBlkCoPath);
                 this.fCutableFilterComp = scPaLib.compileFilter(this.fCutableFilter);
-                
+                //Init Listeners
                 this.fListeners = {};
                 this.fListeners['onSldLoad'] = new Array();
                 this.fListeners['onSldShow'] = new Array();
+                //Init liste elements outils
+                this.fToolElts = new Array();
 
                 scOnLoads[scOnLoads.length] = this;
@@ -108 +109 @@
         setContainerFilter : function(pContainerFilter) {
                 this.fContainerFilter = pContainerFilter;
+        },
+        setContainerBlocksRootPath : function(pContainerBlocksRootPath) {
+                this.fContainerBlocksRootPath = pContainerBlocksRootPath;
         },
         setBlkCoPath : function(pBlkCoPath) {
@@ -118 +122 @@
                 try{
                         //scCoLib.util.log("scPresMgr.onLoad");
-                        // Init basic objects
-                        this.fToc = scPaLib.findNode(this.fTocPath);
+                        //Find Slideshow frame
                         this.fSldFra = scPaLib.findNode(this.fSldFraPath);
-                        
-                        // Enable fSsCssName CSS
+                        //Enable fSsCssName CSS
                         var vCss = null;
                         for(var i = 0; (vCss = document.getElementsByTagName("link")[i]); i++) {
@@ -130 +132 @@
                                 }
                         }
-                        
-                        //Nav
-                        this.fNav = scPaLib.findNode(this.fNavPath);
-                        this.fTocLnks = scPaLib.findNodes(this.fTocLnksPath, this.fToc);
+                        //Init toc
+                        this.fTocLnks = scPaLib.findNodes(this.fTocLnksPath);
                         this.fBtnHome = this.fTocLnks.shift();
                         this.fBtnHome.href = "#";
@@ -144 +144 @@
                                 this.fTocLnks[i].onclick = this.sOnClickTocLnk;
                         }
+                        //Init events
                         document.onkeyup = scPresMgr.sOnKeyUp;
                         this.fToolsShowTime = new Date().getTime();
-                        window.setInterval(this.sToolsHider,1000);
+                        this.fHeartbeat = window.setInterval(this.sHeartbeat,1000);
                         if(scCoLib.isIE) document.body.attachEvent("onmousemove", this.sMouseMgr);
                         else window.addEventListener("mousemove", this.sMouseMgr,true);
                         if(scCoLib.isIE) document.body.attachEvent("onmousedown", this.sMouseMgr);
                         else window.addEventListener("mousedown", this.sMouseMgr,true);
-
-                        // Init nav bar
+                        //Init nav bar
+                        this.fNav = scPaLib.findNode(this.fNavPath);
                         this.fNav.innerHTML = ""; // Purge the nav bar
                         this.fBtnPrv = this.xAddBtn(this.fNav, "btnPrv", "Précédant", "Précédant (flèche gauche)");
                         this.fBtnPrv.style.visibility = "hidden";
                         this.fBtnNxt = this.xAddBtn(this.fNav, "btnNxt", "Suivant", "Suivant (flèche droite)");
-                        // Init Slide d'accueil
+                        this.addToolElt(this.fNav);
+                        //Init Slide d'accueil
                         this.fSldHome = scPaLib.findNode("chi:div.slide", this.fSldFra);
                         this.fSldHome.fSldMgr = new scPresMgr.SldHomeMgr(this.fSldHome, -1);
-
                         this.fSldHome.fSldMgr.initSld();
-                        
-                        // Init zoom container
+                        //Init zoom container
                         this.fZoom = this.xAddEltHidden("div", document.body, "tplZm");
-//                      this.fZoom.fTi = this.xAddElt("div", this.fZoom, "tplZmTi");
-                        this.fZoom.fFra = scPresMgr.xAddElt("iframe", this.fZoom, "tplZmCo");
+                        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", "Fermer", "Fermer le zoom (ESC)");
-                        
-                        // Affichage du slide d'accueil (rendu instantanné)
+                        //Enable tool auto hiding
+                        this.enableToolHider(true);
+                        //Affichage du slide d'accueil (rendu instantanné)
                         this.fSwitchSldTask.initTask(this.fSldHome, "first", true);
-
-                        
                 }catch(e){scCoLib.util.logError("ERROR scPresMgr.onLoad : ", e);}
         },
@@ -225 +223 @@
         },
 
+        /** Show the passed ressource in the zoom. */
+        showZoom : function(pRes) {
+                return this.xShowZoom(pRes);
+        },
+
+        /** 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);
         },
 
@@ -241 +256 @@
          */
         xNxt : function(pSkip) {
-                this.xHideZoom();
-                var vFromSld =  scPresMgr.fSwitchSldTask.fNewSld || this.fCurrSld;
-                if( ! vFromSld || ! vFromSld.fSldMgr.fIsLoaded) return false;
-                if (pSkip || ! vFromSld.fSldMgr.goToNxt()) {
-                        return this.xGotoSlide(vFromSld.fSldMgr.fSldIdx+1, true, false);
+        
+                if(this.fZoom.fAct && !pSkip){
+                        if(this.fZoom.fSldMgr && !this.fZoom.fSldMgr.fIsLoaded) return false;
+                        if(!this.fZoom.fSldMgr || this.fZoom.fSldMgr && !this.fZoom.fSldMgr.goToNxt()) this.xHideZoom();
+                } else {
+                        this.xHideZoom();
+                        var vFromSld =  scPresMgr.fSwitchSldTask.fNewSld || this.fCurrSld;
+                        if( ! vFromSld || ! vFromSld.fSldMgr.fIsLoaded) return false;
+                        if (pSkip || ! vFromSld.fSldMgr.goToNxt()) {
+                                return this.xGotoSlide(vFromSld.fSldMgr.fSldIdx+1, true, false);
+                        }
                 }
                 return true;
@@ -254 +275 @@
          */
         xPrv : function(pSkip) {
-                this.xHideZoom();
-                var vFromSld =  scPresMgr.fSwitchSldTask.fNewSld || this.fCurrSld;
-                if( ! vFromSld ||  ! vFromSld.fSldMgr.fIsLoaded) return false;
-                if (pSkip || ! vFromSld.fSldMgr.goToPrv()) {
-                        return this.xGotoSlide(vFromSld.fSldMgr.fSldIdx-1, (pSkip ? true : false), false);
+                if(this.fZoom.fAct && !pSkip){
+                        if(this.fZoom.fSldMgr && !this.fZoom.fSldMgr.fIsLoaded) return false;
+                        if(!this.fZoom.fSldMgr || this.fZoom.fSldMgr && !this.fZoom.fSldMgr.goToPrv()) this.xHideZoom();
+                } else {
+                        var vFromSld =  scPresMgr.fSwitchSldTask.fNewSld || this.fCurrSld;
+                        if( ! vFromSld ||  ! vFromSld.fSldMgr.fIsLoaded) return false;
+                        if (pSkip || ! vFromSld.fSldMgr.goToPrv()) {
+                                return this.xGotoSlide(vFromSld.fSldMgr.fSldIdx-1, (pSkip ? true : false), false);
+                        }
                 }
                 return true;
@@ -381 +406 @@
                         case 8://bksp
                         case 37://left
-                        case 48://up
+                        case 38://up
                         case 80://p
                                 this.xPrv(); return false;
@@ -405 +430 @@
                 if (!vZm.fAct){
                         vZm.fAct = true;
-                        vZm.fFra.src = "";
                         vZm.fCo.innerHTML = "";
+                        vZm.fSld.innerHTML = "";
+                        vZm.fSldMgr = null;
                         if (pRes.nodeName.toLowerCase() == "a") {
-                                vZm.fCo.style.visibility = "hidden";
-                                vZm.fFra.style.visibility = "";
-                                // TODO zoom a slide
+                                new scPresMgr.FadeEltTask(vZm.fCo,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.initSld();
                         } else {
-                                vZm.fCo.style.visibility = "";
-                                vZm.fFra.style.visibility = "hidden";
+                                new scPresMgr.FadeEltTask(vZm.fCo,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);
+                                new scPresMgr.FadeEltTask(vZm,1);
+                        }
                 } else {
-                //TODO zoom already open
+                        if (pRes.nodeName.toLowerCase() == "a") {
+                                // TODO finalize zoom a slide
+                                vZm.fSldMgr = new scPresMgr.SldZoomMgr(vZm.fSld, pRes.href);
+                                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);
+                        }
                 }
                 return vDst;
@@ -427 +462 @@
                 if (this.fZoom.fAct){
                         this.fZoom.fAct = false;
-                        new scPresMgr.FadeEltTask(this.fZoom, 0, null, function(){scPresMgr.fZoom.fFra.src = ""; scPresMgr.fZoom.fCo.innerHTML = "";});
+                        new scPresMgr.FadeEltTask(this.fZoom, 0, null, function(){scPresMgr.fZoom.fSldMgr = null; scPresMgr.fZoom.fSld.innerHTML = ""; scPresMgr.fZoom.fCo.innerHTML = "";      scPresMgr.fNav.style.zIndex = "";});
                 }
         },
@@ -435 +470 @@
                 return this.fZoom.fCo;
         },
-        /** scPresMgr.xGetZoomFrame : return the zoom iframe
-         */
-        xGetZoomFrame : function(){
+        /** scPresMgr.xGetZoomSlide : return the zoom iframe container
+         */
+        xGetZoomSlide : function(){
                 return this.fZoom.fFra;
         },
@@ -461 +496 @@
                 }
         },
+        /** scPresMgr.xHideTools : tool hider
+         */
+        xHideTools : function(){
+                if (!this.fToolsHidden) {
+                        var vNewTime = new Date().getTime();
+                        if (vNewTime-this.fToolsShowTime >= 5000) {
+                                this.fToolsHidden = true;
+                                for (i in this.fToolElts) {
+                                        try {
+                                                new this.FadeEltTask(this.fToolElts[i],0,this.sFadeToolsStart,this.sFadeToolsEnd);
+                                        } catch(e) {scCoLib.util.logError("ERROR scPresMgr.xHideTools: ",e);}
+                                }
+                        }
+                }
+        },
+        /** scPresMgr.xShowTools : mouse event manager
+         */
+        xShowTools : function(){
+                if (this.fToolsHidden) {
+                        this.fToolsHidden = false;
+                        for (i in this.fToolElts) {
+                                try {
+                                        new this.FadeEltTask(this.fToolElts[i],1,this.sFadeToolsStart,this.sFadeToolsEnd);
+                                } catch(e) {scCoLib.util.logError("ERROR scPresMgr.xShowTools: ",e);}
+                        }
+                }
+                this.fToolsShowTime = new Date().getTime();
+        },
         /** scPresMgr.sMouseMgr : mouse event manager
          */
         sMouseMgr : function(){
-                if (scPresMgr.fToolsHidden) {
-                        scPresMgr.fToolsHidden = false;
-                        new scPresMgr.FadeEltTask(scPresMgr.fNav,1,scPresMgr.sFadeToolsStart,scPresMgr.sFadeToolsEnd);
-                        if (tocMgr.fTglBtn) new scPresMgr.FadeEltTask(tocMgr.fTglBtn,1,scPresMgr.sFadeToolsStart,scPresMgr.sFadeToolsEnd);
-                        
-                }
-                scPresMgr.fToolsShowTime = new Date().getTime();
-        },
-        /** scPresMgr.sToolsHider : nav bar hider
-         */
-        sToolsHider : function(){
-                if (!scPresMgr.fToolsHidden) {
-                        var vNewTime = new Date().getTime();
-                        if (vNewTime-scPresMgr.fToolsShowTime >= 5000) {
-                                scPresMgr.fToolsHidden = true;
-                                new scPresMgr.FadeEltTask(scPresMgr.fNav,0,scPresMgr.sFadeToolsStart,scPresMgr.sFadeToolsEnd);
-                                if (tocMgr.fTglBtn) new scPresMgr.FadeEltTask(tocMgr.fTglBtn,0,scPresMgr.sFadeToolsStart,scPresMgr.sFadeToolsEnd);
-                        }
-                }
-        },
+                if (scPresMgr.fToolHider) scPresMgr.xShowTools();
+        },
+
+        /** scPresMgr.sHeartbeat : run every second.
+         */
+        sHeartbeat : function(){
+                if (scPresMgr.fToolHider) scPresMgr.xHideTools();
+        },
+
         /** scPresMgr.sFadeToolsStart : 
          */
@@ -1053 +1105 @@
                 vSldMgr.fIsLoaded = true;
                 scPresMgr.xNotifyListeners("onSldSLoad", vSldMgr.fSldNode);
+                vSldMgr.postOnLoad();
         } catch(e){scCoLib.util.logError("ERROR error loading slide.", e);}
+}
+scPresMgr.SldMgr.prototype.postOnLoad = function() {
 }
 scPresMgr.SldMgr.prototype.getFirstBlock = function() {
@@ -1146 +1201 @@
         return scPresMgr.xGetZoomContainer();
 }
-scPresMgr.SldMgr.prototype.getZoomFrame = function(pRes){
-        return scPresMgr.xGetZoomFrame();
+scPresMgr.SldMgr.prototype.getZoomSlide = function(pRes){
+        return scPresMgr.xGetZoomSlide();
 }
 scPresMgr.SldMgr.prototype.setCurrBlock = function(pNewBlock){
@@ -1154 +1209 @@
 
 
-/** Slides de l'accueil : pas d'iframe. */
+/** Slide de l'accueil : pas d'iframe. */
 scPresMgr.SldHomeMgr = function(pSldNode, pIdx){
         this.fSldNode = pSldNode;
@@ -1169 +1224 @@
         this.fBlocksRoot = scSlideMgr.getBlocksRoot();
         this.fBlocks = scPresMgr.xInitBlocks(this, this.fBlocksRoot);
-
         // flag, load ok.
         this.fIsLoaded = true;
-        
 }
 scPresMgr.SldHomeMgr.prototype.redrawSld = function() {
@@ -1185 +1238 @@
 scPresMgr.SldHomeMgr.prototype.getAvailWidth = function(){
         return this.fBlocksRoot.offsetWidth;
+}
+
+/** Slide de zoom. */
+scPresMgr.SldZoomMgr = function(pSldNode, pUrl, pPostLoadFunc){
+        this.fSldNode = pSldNode;
+        this.fSldIdx = -1;
+        this.fPostLoadFunc = pPostLoadFunc || function(){};
+        this.fSldUrl = pUrl;
+        this.fIsLoaded = false;
+        this.fCurrBlk = null;
+}
+scPresMgr.SldZoomMgr.prototype = new scPresMgr.SldMgr();
+scPresMgr.SldZoomMgr.prototype.initSld = function(){
+        this.fFraNode = scPresMgr.xAddElt("iframe", this.fSldNode, "slideFra");
+        this.fFraNode.fSldMgr = this;
+        this.fCurrBlk = null;
+        if(scCoLib.isIE) this.fFraNode.onreadystatechange = scPresMgr.SldMgr.sOnLoadSld;
+        else this.fFraNode.onload = scPresMgr.SldMgr.sOnLoadSld;
+        this.fFraNode.src = this.fSldUrl;
+}
+scPresMgr.SldZoomMgr.prototype.postOnLoad = function() {
+        scPresMgr.fSwitchBlkTask.initTask(this.fCurrBlk, this.getFirstBlock(), "F", true);
+        scPresMgr.fNav.style.zIndex = this.hasNxt() ? "100" : "";
+        this.fPostLoadFunc();
 }
 
@@ -1642 +1719 @@
  * @param pStartFunc optionnal function that will be executed at the start of the task.
  * @param pEndFunc optionnal function that will be executed at the end of the task.
+ * @param pInstant optionnal parameter if true no animation.
  */
-scPresMgr.FadeEltTask = function(pElt,pDir,pStartFunc,pEndFunc){
+scPresMgr.FadeEltTask = function(pElt,pDir,pStartFunc,pEndFunc,pInstant){
         this.fRate = new Array();
         this.fRate[0] = [.9, .85, .8, .7, .6, .5, .4, .3, .2, .15, .1];
@@ -1652 +1730 @@
                 this.fStartFunc = pStartFunc || function(){};
                 this.fEndFunc = pEndFunc || function(){};
+                if (pInstant) {
+                        this.terminate();
+                        return;
+                }
                 if (this.fElt.fFadeTask) {
                         this.fElt.fFadeTask.changeDir(this.fDir);

trunk/model/sources/dkCore/genSld/wdt/mgr/scPresMgr.uiwidget

@@ -7 +7 @@
                 <sm:standardLibrary codeLib="SiLib"/>
                 <sm:linkScript path="scPresMgr.js" pathFrom="localPublishFiles" sortKey="AA"/>
-                <sm:otherBuffers keyBuffer="js.postLink">scPresMgr.init(&quot;ide:tplSldFra&quot;,&quot;ide:tplNav&quot;,&quot;ide:tplTocCo&quot;,&quot;des:a.toc_lnk&quot;);
+                <sm:otherBuffers keyBuffer="js.postLink">scPresMgr.init(&quot;ide:tplSldFra&quot;,&quot;ide:tplNav&quot;,&quot;ide:tplTocCo/des:a.toc_lnk&quot;);
 </sm:otherBuffers>
         </sm:fillTemplateBuffers>

trunk/model/sources/dkCore/genSld/wdt/mgr/scSlideMgr.doss/scSlideMgr.js

@@ -185 +185 @@
 }
 
+/* ===== SlideZoom Block class ================================================= */
+/** scSlideMgr.SldZmBlk : SlideZoom block (anchors pointing to slides that need to be opened as a zoom).
+ */
+scSlideMgr.SldZmBlk = function(pElt, pOpt){
+        pElt.onclick = this.onClickZoom;
+}
+scSlideMgr.SldZmBlk.prototype.onClickZoom = function(){
+        if (!window.frameElement || !window.frameElement.fSldMgr) return false;
+        var vSldMgr = window.frameElement.fSldMgr;
+        if(vSldMgr) vSldMgr.showZoom(this);
+        return false;
+}
+
 /* ===== Size Block classes ================================================= */
 
@@ -245 +258 @@
                         var vWantedH = pOwnerNode.fOriH * vRate;
                         var vMaxW = scSlideMgr.getBlocksAvailWidth() *  (this.fOpt.ratioWidth || .8);
-                        var vMaxH = scSlideMgr.getBlocksAvailHeight() * ( vIsAlone ? (this.fOpt.ratioHeightAlone || .9) : (this.fOpt.ratioHeight || .6) ) - (this.fOpt.captionHeight || 30);
+                        var vMaxH = scSlideMgr.getBlocksAvailHeight() * ( vIsAlone ? (this.fOpt.ratioHeightAlone || .9) : (this.fOpt.ratioHeight || .8) ) - (this.fOpt.captionHeight || 30);
                         var vFinalW;
                         var vZoomOn = false;
@@ -265 +278 @@
                                 pOwnerNode.fResFra.style.height=vImg.height+"px";
                         }
-                        if (pOwnerNode.fZoom) pOwnerNode.fZoom.style.display = (vZoomOn && i < l) ? "" : "none";
+                        if (pOwnerNode.fZoom) pOwnerNode.fZoom.style.display = (vZoomOn && i < l-1) ? "" : "none";
                 }catch(e){
                         scCoLib.util.logError("ERROR scSlideMgr.SizeBlkImg.onResizedAnc : ", e);
@@ -339 +352 @@
                         var vWantedH = vObj.oriH * vRate;
                         var vMaxW = scSlideMgr.getBlocksAvailWidth() *  (this.fOpt.ratioWidth || .8);
-                        var vMaxH = scSlideMgr.getBlocksAvailHeight() * ( vIsAlone ? (this.fOpt.ratioHeightAlone || .9) : (this.fOpt.ratioHeight || .6) ) - (this.fOpt.captionHeight || 30);
+                        var vMaxH = scSlideMgr.getBlocksAvailHeight() * ( vIsAlone ? (this.fOpt.ratioHeightAlone || .9) : (this.fOpt.ratioHeight || .8) ) - (this.fOpt.captionHeight || 30);
                         if(vWantedW > vMaxW || vWantedH > vMaxH) {
                                 var vRW = vWantedW / vMaxW;

trunk/model/sources/dkCore/genSld/wdt/mgr/scSlideMgr.uiwidget

@@ -10 +10 @@
 scSlideMgr.addBindableBlk("des:div.objInFlow",null,scSlideMgr.SizeBlkObj);
 scSlideMgr.addBindableBlk("des:span.objInline",{captionHeight:0},scSlideMgr.SizeBlkObj);
+scSlideMgr.addBindableBlk("bod:/des:a.ssZmLnk",null,scSlideMgr.SldZmBlk);
 </sm:otherBuffers>
         </sm:fillTemplateBuffers>