Changeset 19610

Timestamp:

02/01/12 10:53:54 (4 months ago)

Author:

anp

Message:

debug init mainview sur itemdefault, space, ...

Location:

trunk/Xul_Wsp/content/Wsp/windows/contentView

Files:

• itemdefault/mainview.xul (modified) (1 diff)
• itemnull/mainview.xul (modified) (1 diff)
• mainview.init.js (modified) (2 diffs)
• space/mainview.xul (modified) (1 diff)
• ss/mainview.xul (modified) (1 diff)
• wsp/mainview.xul (modified) (1 diff)

trunk/Xul_Wsp/content/Wsp/windows/contentView/itemdefault/mainview.xul

@@ -41 +41 @@
 <?xml-stylesheet href="chrome://scenariWsp/content/windows/contentView/mainview.css" type="text/css"?>
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+        <script>
+                var deskName = "itemdefault";
+        </script>
         <script src="chrome://scenariWsp/content/windows/contentView/mainview.init.js"/>
         <ribbon type="Item indéfini"/>

trunk/Xul_Wsp/content/Wsp/windows/contentView/itemnull/mainview.xul

@@ -40 +40 @@
 <?xml-stylesheet href="chrome://scenariWsp/content/windows/contentView/mainview.css" type="text/css"?>
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="initPage();">
+        <script>
+                var deskName = "itemnull";
+        </script>
         <script src="chrome://scenariWsp/content/windows/contentView/mainview.init.js"/>
         <script>

trunk/Xul_Wsp/content/Wsp/windows/contentView/mainview.init.js

@@ -36 +36 @@
  * the terms of any one of the MPL, the GPL, the LGPL or the CeCILL.
  * ]]LICENCE
+ */
+
+/*
+ * Possibilité de définir en amont:
+ *              - deskName; à défaut, window.shortDesc.itModel est utilisé
  */
 
@@ -82 +87 @@
         if(vParentWin.scSecurityCtx) var scSecurityCtx = window.shortDesc ? vParentWin.scSecurityCtx.createSubSecurityCtx(extPoints, window.shortDesc.srcRoles, window.shortDesc.srcRi) : vParentWin.scSecurityCtx;
         // - initialisation de la frame
-        deskUtils.initInternalFrame(window, vParentWin, window.shortDesc.itModel);
+        deskUtils.initInternalFrame(window, vParentWin, "deskName" in this ? deskName : (window.shortDesc.itModel || "mainview"));
         
         // # Gestion des états d'ouverture des  blocks par défaut.

trunk/Xul_Wsp/content/Wsp/windows/contentView/space/mainview.xul

@@ -40 +40 @@
 
 <?xml-stylesheet href="chrome://scenariWsp/content/windows/contentView/mainview.css" type="text/css"?>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="initPage();">
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+        <script>
+                var deskName = "space";
+        </script>
         <script src="chrome://scenariWsp/content/windows/contentView/mainview.init.js"/>
-        <ribbon id="oHeadBlock" type="Espace"/>
-        <script>
-                function initPage(){
-                        document.getElementById('oHeadBlock').title = item.extractSpaceFromFullUri(document.fUriObject.getFullUri());
-                }
-        </script>       
+        <ribbon id="oHeadBlock" type="Espace"/>       
         <sctabs defaultTab="view">
                 <sctab label="Props." tooltiptext="Propriétés" color="#9abbff" icon="chrome://scenariWsp/content/widgets/sctab/icon/props.png">

trunk/Xul_Wsp/content/Wsp/windows/contentView/ss/mainview.xul

@@ -41 +41 @@
 <?xml-stylesheet href="chrome://scenariWsp/content/windows/contentView/mainview.css" type="text/css"?>
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="initPage();">
+        <script>
+                var deskName = "ss";
+        </script>
         <script src="chrome://scenariWsp/content/windows/contentView/mainview.init.js"/>
         <script><![CDATA[

trunk/Xul_Wsp/content/Wsp/windows/contentView/wsp/mainview.xul

@@ -41 +41 @@
 <?xml-stylesheet href="chrome://scenariWsp/content/windows/contentView/mainview.css" type="text/css"?>
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+        <script>
+                var deskName = "wsp";
+        </script>
         <script src="chrome://scenariWsp/content/windows/contentView/mainview.init.js"/>
         <ribbon type="Atelier"/>