Changeset 12916

Timestamp:

02/28/09 23:37:26 (3 years ago)

Author:

sys

Message:

textPrim editor : menu supplémentaire "Ouvrir cet item" pour uLink, objectLeaf, inlineImg, extBlock

Location:

trunk

Files:

• Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_textPrim/xedUi/text.xbl.xml.xsl (modified) (3 diffs)
• Xul_XedLib/chrome/content/scenarixedlib/libUiExtra/scRichText/textBase.xbl.xml (modified) (2 diffs)

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_textPrim/xedUi/text.xbl.xml.xsl

@@ -1900 +1900 @@
                                                 vInsertMenu.setAttribute("disabled", "true");
                                         }
-                                        //Menu suppression inline + propriétés
+                                        //Menu suppression inline
                                         var vRemovePopup = document.createElementNS(XULNS, "menupopup");
                                         this.fRichTextZone.buildRemoveInlinePopup(vRemovePopup);
@@ -1907 +1907 @@
                                                 vRemoveMenu.setAttribute("label", "Eliminer une balise du paragraphe...");
                                                 vRemoveMenu.appendChild(vRemovePopup);
-                                                //Propriétés...
+                                        }
+                                        //Ouvrir cet item
+                                        var vNode = this.fRichTextZone.getSelectedNode();
+                                        if(vNode && vNode.nodeType==3) vNode = vNode.parentNode;
+                                        if(vNode && vNode.getAttribute("refUri")) {
+                                                pPopup.appendChild(document.createElementNS(XULNS, "menuseparator"));
+                                                var vItem = document.createElementNS(XULNS, "menuitem");
+                                                vItem.setAttribute("label", "Ouvrir cet item...");
+                                                vItem.setAttribute("value", "openItem");
+                                                vItem.fHtmlNode = vNode;
+                                                pPopup.appendChild(vItem);
+                                        }
+                                        //Propriétés des balises inlines
+                                        if(vRemovePopup.hasChildNodes()) {
                                                 var vFirst = true;
-                                                var vItemRem = vRemovePopup.firstChild;
+                                                vItemRem = vRemovePopup.firstChild;
                                                 while(vItemRem) {
                                                         if(vItemRem.fStrucNode.hasSubEditor) {
@@ -1964 +1977 @@
                                                 } else if(vValue == "removeParent") {
                                                         this.fRichTextZone.removeParent(pEvent.originalTarget.fHtmlNode);
+                                                } else if(vValue == "openItem") {
+                                                        var vUriObjectBase = ut.searchUriObject(this);
+                                                        var vNode = pEvent.originalTarget.fHtmlNode;
+                                                        var vUriItem = ut.getUriFromItemPath(ut.getWspFromUri(vUriObjectBase.getUri()), vNode.getAttribute("refUri"));
+                                                        window.desk.loadUriObjectByUri(vUriObjectBase.getDataProvider(), vUriItem, ";newtab;");
                                                 }
                                         }

trunk/Xul_XedLib/chrome/content/scenarixedlib/libUiExtra/scRichText/textBase.xbl.xml

@@ -3629 +3629 @@
                                 ]]></body>
                         </method>
+                        <!-- Recherche le noeud sélectionné pour calculer les actions actives des menus contextuels. -->
+                        <method name="getSelectedNode">
+                                <body><![CDATA[
+                                        var vSel = this.fHTMLEditor.selection;
+                                        if(vSel.rangeCount == 1) {
+                                                var vRange = vSel.getRangeAt(0);
+                                                if( vRange.startContainer.nodeType==1 
+                                                        && vRange.startContainer == vRange.endContainer 
+                                                        && Math.abs(vRange.endOffset - vRange.startOffset)==1
+                                                        ) {
+                                                        return vRange.startContainer.childNodes[vRange.startOffset];
+                                                } else {
+                                                        return vRange.commonAncestorContainer;
+                                                }
+                                        }
+                                        return null;
+                                ]]></body>
+                        </method>
                         <!-- Popup menu des suppressions inline 
                         si pPopup est null ne fait que évaluer si il y a des balises à suppr et retourne le 1er noeud parent.
@@ -3635 +3653 @@
                                 <parameter name="pPopup"/>
                                 <body><![CDATA[
-                                        var vSel = this.fHTMLEditor.selection;
-                                        if(vSel.rangeCount == 1) {
-                                                var vRange = vSel.getRangeAt(0);
-                                                var vParent;
-                                                if( vRange.startContainer.nodeType==1 
-                                                        && vRange.startContainer == vRange.endContainer 
-                                                        && Math.abs(vRange.endOffset - vRange.startOffset)==1
-                                                        ) {
-                                                        vParent = vRange.startContainer.childNodes[vRange.startOffset];
-                                                } else {
-                                                        vParent = vRange.commonAncestorContainer;
-                                                }
-                                                
-                                                //Menu de suppression des parents
-                                                if(vParent && this.fClasses[vParent.nodeName].isInlineSibling) {
-                                                        var vParentClass = this.fClasses[vParent.nodeName];
-                                                        while(vParent && vParentClass.isInlineSibling) {
-                                                                if("getStructuralNodes" in vParentClass) {
-                                                                        if(!pPopup) return vParent; //Eval non null seulement.
-                                                                        var vStrucNode = vParentClass.getStructuralNodes(vParent);
-                                                                        var vItem = document.createElementNS(XULNS, "menuitem");
-                                                                        vItem.setAttribute("label", vStrucNode.title);
-                                                                        vItem.setAttribute("value", "removeParent");
-                                                                        pPopup.appendChild(vItem);
-                                                                        vItem.fHtmlNode = vParent;
-                                                                        vItem.fStrucNode = vStrucNode; //Pour post-traitement menu contextuel
-                                                                }
-                                                                vParent = vParent.parentNode;
-                                                                vParentClass = this.fClasses[vParent.nodeName];
-                                                        }
+                                        var vParent = this.getSelectedNode();
+                                        //Menu de suppression des parents
+                                        if(vParent && this.fClasses[vParent.nodeName].isInlineSibling) {
+                                                var vParentClass = this.fClasses[vParent.nodeName];
+                                                while(vParent && vParentClass.isInlineSibling) {
+                                                        if("getStructuralNodes" in vParentClass) {
+                                                                if(!pPopup) return vParent; //Eval non null seulement.
+                                                                var vStrucNode = vParentClass.getStructuralNodes(vParent);
+                                                                var vItem = document.createElementNS(XULNS, "menuitem");
+                                                                vItem.setAttribute("label", vStrucNode.title);
+                                                                vItem.setAttribute("value", "removeParent");
+                                                                pPopup.appendChild(vItem);
+                                                                vItem.fHtmlNode = vParent;
+                                                                vItem.fStrucNode = vStrucNode; //Pour post-traitement menu contextuel
+                                                        }
+                                                        vParent = vParent.parentNode;
+                                                        vParentClass = this.fClasses[vParent.nodeName];
                                                 }
                                         }