Changeset 664

Timestamp:

01/26/12 12:36:53 (4 months ago)

Author:

sam

Message:

sync Dokiel

Location:

trunk/model/sources

Files:

• dkCore/genSld/wdt/mgr/scHPS.doss/scHPS.js (modified) (6 diffs)
• dkCore/genWeb/wdt/img/scImgMgr.doss/scImgMgr.js (modified) (3 diffs)
• dkGuide/genWeb/genDocChm/uiFrame/genDocChm.uiframe (modified) (1 diff)

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

@@ -505 +505 @@
         this.fId = pId || "";
         this.fRootKey = document.location.pathname.substring(0,document.location.pathname.lastIndexOf("/")) +"/";
-        if ("localStorage" in window) {
+        if ("localStorage" in window && typeof window.localStorage != "undefined") {
                 this.get = function(pKey) {var vRet = localStorage.getItem(this.fRootKey+this.xKey(pKey));return (typeof vRet == "string" ? unescape(vRet) : null)};
                 this.set = function(pKey, pVal) {localStorage.setItem(this.fRootKey+this.xKey(pKey), escape(pVal))};
@@ -1129 +1129 @@
                 //scCoLib.util.log("PresMgr.xNotifyListeners: "+pType);
                 var vListener = this.fListeners[pType];
-                for (i in vListener) {
+                for (var i in vListener) {
                         try {
                                 vListener[i](pRes);
@@ -1141 +1141 @@
                         if (vNewTime-this.fToolsShowTime >= 5000) {
                                 this.fToolsHidden = true;
-                                for (i in this.fToolElts) {
+                                for (var i in this.fToolElts) {
                                         try {
                                                 new scHPS.FadeEltTask(this.fToolElts[i],0,this,scHPS.sFadeEltStart,scHPS.sFadeEltEnd);
@@ -1153 +1153 @@
                 if (this.fToolsHidden) {
                         this.fToolsHidden = false;
-                        for (i in this.fToolElts) {
+                        for (var i in this.fToolElts) {
                                 try {
                                         new scHPS.FadeEltTask(this.fToolElts[i],1,this,scHPS.sFadeEltStart,scHPS.sFadeEltEnd);
@@ -2555 +2555 @@
         this.fEndTime = this.fNxtSwitchTime + 100;
         this.fImgs = scPaLib.findNodes(this.fPathImgs, pElt);
-        for (i in this.fImgs) {
+        for (var i in this.fImgs) {
                 this.fImgs[i].style.position = "absolute";
                 this.fImgs[i].style.visibility = "hidden";
@@ -2601 +2601 @@
                         try{
                                 var vMaxHeight = 0;
+                                var i;
                                 for (i in pOwnerNode.fImgs){
                                         vMaxHeight = Math.max(vMaxHeight,pOwnerNode.fImgs[i].clientHeight);

trunk/model/sources/dkCore/genWeb/wdt/img/scImgMgr.doss/scImgMgr.js

@@ -570 +570 @@
         if ("scDragMgr" in window) { // do not open the zoom if the image is in a scDragMgr label that has just been dropped.
                 var vAncs = scPaLib.findNodes("anc:",pAnc);
-                for (i in vAncs) if (vAncs[i].fGroup && vAncs[i].fGroup._isThresholdExceeded) return;
+                for(var i in vAncs) if (vAncs[i].fGroup && vAncs[i].fGroup._isThresholdExceeded) return;
         }
         if(!pAnc.fCo) scImgMgr.xInitZm(pAnc);
@@ -1060 +1060 @@
 scImgMgr.xNotifyListeners = function(pType,pRes) {
         var vListener = scImgMgr.fListeners[pType];
-        for (i in vListener) {
+        for(var i in vListener) {
                 try {
                         vListener[i](pRes);
@@ -1137 +1137 @@
                 var vNewClasses = new Array();
                 var vClassFound = false;
-                for (var i = 0, n = vCurrentClasses.length; i < n; i++) {
+                for(var i = 0, n = vCurrentClasses.length; i < n; i++) {
                         if (vCurrentClasses[i] != pClassOld) {
                                 vNewClasses.push(vCurrentClasses[i]);

trunk/model/sources/dkGuide/genWeb/genDocChm/uiFrame/genDocChm.uiframe

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sm:freeUiFrame xmlns:sc="http://www.utc.fr/ics/scenari/v3/core" xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling">
-        <sm:publishFiles sc:refUri="/dkGuide/genWeb/genDocChm/uiFrame/ui.doss"/>
+        <sm:callRootModel/>
+        <sm:publishFiles sc:refUri="/dkGuide/genWeb/genDocChm/uiFrame/ui.doss">
+                <sm:callRootModel axis="toc" codeView="xhtmlContent"/>
+        </sm:publishFiles>
         <sm:bsRoot sc:refUri="/dkGuide/genWeb/genDocChm/uiFrame/bs.doss"/>
 </sm:freeUiFrame>