Changeset 15078
- Timestamp:
- 03/08/10 13:36:59 (5 months ago)
- Location:
- trunk
- Files:
-
- 2 added
- 5 removed
- 3 modified
-
Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_textPrim.xml (modified) (1 diff)
-
Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_textPrim/xedUi/extBlockProps.xul.xsl (deleted)
-
Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_textPrim/xedUi/inlineImgProps.xul.xsl (deleted)
-
Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_textPrim/xedUi/objectLeafProps.xul.xsl (deleted)
-
Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_textPrim/xedUi/phraseProps.xul.xsl (deleted)
-
Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_textPrim/xedUi/text.xbl.xml.xsl (modified) (11 diffs)
-
Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_textPrim/xedUi/uLinkProps.xul.xsl (deleted)
-
Xul_XedLib/content/scenariXedLib/libUiExtra/scRichText/inlineImgLinkEditor.overlay.xul (added)
-
Xul_XedLib/content/scenariXedLib/libUiExtra/scRichText/textBase.xbl.xml (modified) (13 diffs)
-
Xul_XedLib/content/scenariXedLib/libUiExtra/scRichText/uLinkUrlEditor.xul (added)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_textPrim.xml
r13657 r15078 355 355 </affichage> 356 356 </valeur> 357 358 <!-- Ecrans de propriétés de l'éditeur formulaire. -->359 <affichage code="extBlockProps.xul" racine="sm:structure/sm:blockTags/sm:extBlockTag" codecomposant="concat('extBlockProps_', @role, '.xul')">360 <actif type="xpath-dynamique">resultatAgent(concat('//isExtBlock_', @role))</actif>361 <urlPage type="xpath-dynamique">concat('content/', resultatAgent('//codeModel'), '/xedUi/', codeAgent(.))</urlPage>362 <page>363 <zone cle="mainZone" type="xslOnSrc-dynamique" href="bs:xedUi/extBlockProps.xul.xsl"/>364 </page>365 </affichage>366 <affichage code="phraseProps.xul" racine="sm:structure/sm:inlineTags/sm:phraseTag" codecomposant="concat('phraseProps_', @role, '.xul')">367 <urlPage type="xpath-dynamique">concat('content/', resultatAgent('//codeModel'), '/xedUi/', codeAgent(.))</urlPage>368 <page>369 <zone cle="mainZone" type="xsl-statique" href="bs:xedUi/phraseProps.xul.xsl"/>370 </page>371 </affichage>372 <affichage code="uLinkProps.xul" racine="sm:structure/sm:inlineTags/sm:uLinkTag" codecomposant="concat('uLinkProps_', @role, '.xul')">373 <actif type="xpath-dynamique">resultatAgent(concat('//isULink_', @role))</actif>374 <urlPage type="xpath-dynamique">concat('content/', resultatAgent('//codeModel'), '/xedUi/', codeAgent(.))</urlPage>375 <page>376 <zone cle="mainZone" type="xslOnSrc-dynamique" href="bs:xedUi/uLinkProps.xul.xsl"/>377 </page>378 </affichage>379 <affichage code="objectLeafProps.xul" racine="sm:structure/sm:inlineTags/sm:objectLeafTag" codecomposant="concat('objectLeafProps_', @role, '.xul')">380 <actif type="xpath-dynamique">resultatAgent(concat('//isObjectLeaf_', @role))</actif>381 <urlPage type="xpath-dynamique">concat('content/', resultatAgent('//codeModel'), '/xedUi/', codeAgent(.))</urlPage>382 <page>383 <zone cle="mainZone" type="xslOnSrc-dynamique" href="bs:xedUi/objectLeafProps.xul.xsl"/>384 </page>385 </affichage>386 <affichage code="inlineImgProps.xul" racine="sm:structure/sm:inlineTags/sm:inlineImgTag" codecomposant="concat('inlineImgProps_', @role, '.xul')">387 <actif type="xpath-dynamique">resultatAgent(concat('//isInlineImg_', @role))</actif>388 <urlPage type="xpath-dynamique">concat('content/', resultatAgent('//codeModel'), '/xedUi/', codeAgent(.))</urlPage>389 <page>390 <zone cle="mainZone" type="xslOnSrc-dynamique" href="bs:xedUi/inlineImgProps.xul.xsl"/>391 </page>392 </affichage>393 357 394 358 <!-- Test si cet extBlock doit être actif ou non (dépend de ses modèles liés). --> 395 359 <valeur code="isExtBlock_" racine="sm:structure/sm:blockTags/sm:extBlockTag" codecomposant="concat('isExtBlock_', @role)"> 396 <source type="xpathOnSrc-dynamique">testExpr(sm: refItem/sm:allowedModel, resultatAgent(concat('@', getIdFromPath(@sc:refUri), '/isStandAloneItem')) = 'true', 'or')</source>360 <source type="xpathOnSrc-dynamique">testExpr(sm:allowedModel, resultatAgent(concat('@', getIdFromPath(@sc:refUri), '/isStandAloneItem')) = 'true', 'or')</source> 397 361 <resultat cache="*"/> 398 362 </valeur> -
trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_textPrim/xedUi/text.xbl.xml.xsl
r14987 r15078 134 134 <xsl:variable name="vParamEditor" select="self::sm:formEditor"/> 135 135 <xsl:variable name="vInlineBhv" select="$vParamEditor/sm:inlineBehaviors"/> 136 <xsl:variable name="isInlineTags" select="boolean(/sm:textPrim/sm:structure/sm:inlineTags/*)"/> 136 137 <!-- Listes de tags retsreints par des contraintes externes (items publics) --> 138 <xsl:variable name="vVisibleExtBlockTags" select="/sm:textPrim/sm:structure/sm:blockTags/sm:extBlockTag[resultatAgent(concat('//isExtBlock_', @role)) = 'true']"/> 139 <xsl:variable name="vVisibleObjectLeafTags" select="/sm:textPrim/sm:structure/sm:inlineTags/sm:objectLeafTag[resultatAgent(concat('//isObjectLeaf_', @role)) = 'true']"/> 140 <xsl:variable name="vVisibleInlineImgTags" select="/sm:textPrim/sm:structure/sm:inlineTags/sm:inlineImgTag[resultatAgent(concat('//isInlineImg_', @role)) = 'true']"/> 141 <xsl:variable name="vVisibleULinkTags" select="/sm:textPrim/sm:structure/sm:inlineTags/sm:uLinkTag[resultatAgent(concat('//isULink_', @role)) = 'true']"/> 142 143 <!-- Flags pour construires les ihm. --> 144 <xsl:variable name="isInlineTags" select="$vVisibleObjectLeafTags or $vVisibleInlineImgTags or $vVisibleULinkTags or boolean(/sm:textPrim/sm:structure/sm:inlineTags[sm:noteTag or sm:phraseTag or sm:inlineStyleTag or sm:textLeafTag or sm:emptyLeafTag])"/> 137 145 <xsl:variable name="isListTags" select="boolean(/sm:textPrim/sm:structure/sm:blockTags/*[contains(local-name(), 'List')])"/> 138 146 <xsl:variable name="isTableTags" select="boolean(/sm:textPrim/sm:structure/sm:blockTags/sm:tableTag)"/> 139 <xsl:variable name="isBlockTags" select="boolean( /sm:textPrim/sm:structure/sm:blockTags[sm:extBlockTag or sm:emptyBlockTag])"/>147 <xsl:variable name="isBlockTags" select="boolean($vVisibleExtBlockTags or /sm:textPrim/sm:structure/sm:blockTags/sm:emptyBlockTag)"/> 140 148 <xsl:variable name="isInsertChars" select="boolean($vParamEditor/sm:insertCharacters/*)"/> 141 <xsl:variable name="isLinkTags" select=" boolean(/sm:textPrim/sm:structure/sm:inlineTags[sm:uLinkTag or sm:inlineImgTag or sm:objectLeafTag]) or boolean(/sm:textPrim/sm:structure/sm:blockTags[sm:extBlockTag])"/>149 <xsl:variable name="isLinkTags" select="$vVisibleExtBlockTags or $vVisibleObjectLeafTags or $vVisibleInlineImgTags or $vVisibleULinkTags"/> 142 150 <xsl:variable name="isMetaTags" select="boolean(/sm:textPrim/sm:structure/descendant::sm:meta)"/> 143 151 … … 195 203 </resources> 196 204 <implementation> 205 <property name="fCodeModel" onget="return '{resultatAgent('//codeModel')}';"/> 197 206 <property name="fHtmlStyleSheet" onget="return '{resultatAgent('../textHtmlEdit.css', 'act:')}';"/> 198 207 <property name="fUrlCssShowTag" onget="return '{resultatAgent('../textHtmlTag.css', 'act:')}';"/> … … 201 210 <method name="initClasses"> 202 211 <body> 203 if(window._<xsl:value-of select="resultatAgent('//codeModel')"/>_classes) return window._<xsl:value-of select="resultatAgent('//codeModel')"/>_classes; 204 window._<xsl:value-of select="resultatAgent('//codeModel')"/>_classes = this.buildClasses(); 212 if( ! window._<xsl:value-of select="resultatAgent('//codeModel')"/>_classes) window._<xsl:value-of select="resultatAgent('//codeModel')"/>_classes = this.buildClasses(); 205 213 return window._<xsl:value-of select="resultatAgent('//codeModel')"/>_classes; 206 214 </body> … … 864 872 <xsl:if test="$vExtBlockTagList"> 865 873 switch(pNode.nodeType==1 ? pNode.getAttribute("role")||"" : pNode) { 866 <xsl:for-each select="$vExtBlockTagList">case "<xsl:value-of select="@role"/>" : return {title:"<xsl:value-of select="chaineProtegeJs(@name)"/>", hasLinkEditor:true, urlLinkEditor:"<xsl:value-of select="resultatAgent(concat('//extBlockProps_', @role, '.xul'), 'act:')"/>", <xsl:if test="resultatAgent('//isMetaEnabled', .)">hasSubEditor:true, urlSubEditor:"chrome://scenariCms/content/xed/richText/metaEditor.xul", urlXedMeta:"<xsl:value-of select="resultatAgent('//getUrlXedMeta', .)"/>", <xsl:if test="sm:meta/@usage='optional'">isMetaOptional:true, </xsl:if></xsl:if>_node:pNode};874 <xsl:for-each select="$vExtBlockTagList">case "<xsl:value-of select="@role"/>" : return {title:"<xsl:value-of select="chaineProtegeJs(@name)"/>", hasLinkEditor:true, linkEditorFunc:"linkEditor_extBlock", <xsl:if test="resultatAgent('//isMetaEnabled', .)">hasSubEditor:true, urlSubEditor:"chrome://scenariCms/content/xed/richText/metaEditor.xul", urlXedMeta:"<xsl:value-of select="resultatAgent('//getUrlXedMeta', .)"/>", <xsl:if test="sm:meta/@usage='optional'">isMetaOptional:true, </xsl:if></xsl:if>_node:pNode}; 867 875 </xsl:for-each> 868 876 } … … 1074 1082 <xsl:if test="$vULinkTagList"> 1075 1083 switch(pNode.nodeType==1 ? pNode.getAttribute("role")||"" : pNode) { 1076 <xsl:for-each select="$vULinkTagList">case "<xsl:value-of select="@role"/>" : return {title:"<xsl:value-of select="chaineProtegeJs(@name)"/>", hasLinkEditor:true, urlLinkEditor:"<xsl:value-of select="resultatAgent(concat('//uLinkProps_', @role, '.xul'), 'act:')"/>", <xsl:if test="resultatAgent('//isMetaEnabled', .)">hasSubEditor:true, urlSubEditor:"chrome://scenariCms/content/xed/richText/metaEditor.xul", urlXedMeta:"<xsl:value-of select="resultatAgent('//getUrlXedMeta', .)"/>", <xsl:if test="sm:meta/@usage='optional'">isMetaOptional:true, </xsl:if></xsl:if>_node:pNode};1084 <xsl:for-each select="$vULinkTagList">case "<xsl:value-of select="@role"/>" : return {title:"<xsl:value-of select="chaineProtegeJs(@name)"/>", hasLinkEditor:true, linkEditorFunc:"<xsl:value-of select="si(sm:refItem, 'linkEditor_uLinkRefItem', 'linkEditor_uLinkUrl')"/>", <xsl:if test="resultatAgent('//isMetaEnabled', .)">hasSubEditor:true, urlSubEditor:"chrome://scenariCms/content/xed/richText/metaEditor.xul", urlXedMeta:"<xsl:value-of select="resultatAgent('//getUrlXedMeta', .)"/>", <xsl:if test="sm:meta/@usage='optional'">isMetaOptional:true, </xsl:if></xsl:if>_node:pNode}; 1077 1085 </xsl:for-each> 1078 1086 } … … 1184 1192 <xsl:if test="$vInlineImgTagList"> 1185 1193 switch(pNode.nodeType==1 ? pNode.getAttribute("role")||"" : pNode) { 1186 <xsl:for-each select="$vInlineImgTagList">case "<xsl:value-of select="@role"/>" : return {title:"<xsl:value-of select="chaineProtegeJs(@name)"/>", hasLinkEditor:true, urlLinkEditor:"<xsl:value-of select="resultatAgent(concat('//inlineImgProps_', @role, '.xul'), 'act:')"/>", <xsl:if test="resultatAgent('//isMetaEnabled', .)">hasSubEditor:true, urlSubEditor:"chrome://scenariCms/content/xed/richText/metaEditor.xul", urlXedMeta:"<xsl:value-of select="resultatAgent('//getUrlXedMeta', .)"/>", <xsl:if test="sm:meta/@usage='optional'">isMetaOptional:true, </xsl:if></xsl:if>_node:pNode};1194 <xsl:for-each select="$vInlineImgTagList">case "<xsl:value-of select="@role"/>" : return {title:"<xsl:value-of select="chaineProtegeJs(@name)"/>", hasLinkEditor:true, linkEditorFunc:"linkEditor_inlineImg", <xsl:if test="resultatAgent('//isMetaEnabled', .)">hasSubEditor:true, urlSubEditor:"chrome://scenariCms/content/xed/richText/metaEditor.xul", urlXedMeta:"<xsl:value-of select="resultatAgent('//getUrlXedMeta', .)"/>", <xsl:if test="sm:meta/@usage='optional'">isMetaOptional:true, </xsl:if></xsl:if>_node:pNode}; 1187 1195 </xsl:for-each>} 1188 1196 </xsl:if> … … 1210 1218 isDescForbidden : function(pAncHtmlNode, pDescClass, pDescRole) { 1211 1219 return vClasses[pAncHtmlNode.parentNode.nodeName].isDescForbidden(pAncHtmlNode.parentNode, pDescClass, pDescRole); 1220 }, 1221 getAltTextTitle : function(pNode){ 1222 <xsl:if test="$vInlineImgTagList"> 1223 switch(pNode.getAttribute("role")||"") { 1224 <xsl:for-each select="$vInlineImgTagList">case "<xsl:value-of select="@role"/>" : return "<xsl:value-of select="chaineProtegeJs(sm:alternativeText/@name)"/>"; 1225 </xsl:for-each> 1226 } 1227 </xsl:if> 1228 return false; 1212 1229 } 1213 1230 }; … … 1255 1272 <xsl:if test="$vObjectLeafTagList"> 1256 1273 switch(pNode.nodeType==1 ? pNode.getAttribute("role")||"" : pNode) { 1257 <xsl:for-each select="$vObjectLeafTagList">case "<xsl:value-of select="@role"/>" : return {title:"<xsl:value-of select="chaineProtegeJs(@name)"/>", hasLinkEditor:true, urlLinkEditor:"<xsl:value-of select="resultatAgent(concat('//objectLeafProps_', @role, '.xul'), 'act:')"/>", <xsl:if test="resultatAgent('//isMetaEnabled', .)">hasSubEditor:true, urlSubEditor:"chrome://scenariCms/content/xed/richText/metaEditor.xul", urlXedMeta:"<xsl:value-of select="resultatAgent('//getUrlXedMeta', .)"/>", <xsl:if test="sm:meta/@usage='optional'">isMetaOptional:true, </xsl:if></xsl:if>_node:pNode};1274 <xsl:for-each select="$vObjectLeafTagList">case "<xsl:value-of select="@role"/>" : return {title:"<xsl:value-of select="chaineProtegeJs(@name)"/>", hasLinkEditor:true, linkEditorFunc:"linkEditor_objectLeaf", <xsl:if test="resultatAgent('//isMetaEnabled', .)">hasSubEditor:true, urlSubEditor:"chrome://scenariCms/content/xed/richText/metaEditor.xul", urlXedMeta:"<xsl:value-of select="resultatAgent('//getUrlXedMeta', .)"/>", <xsl:if test="sm:meta/@usage='optional'">isMetaOptional:true, </xsl:if></xsl:if>_node:pNode}; 1258 1275 </xsl:for-each>} 1259 1276 </xsl:if> … … 1412 1429 <xsl:call-template name="defaultGenericActions"/> 1413 1430 </xsl:for-each> 1414 <xsl:variable name="vULink" select="sm:inlineTags/sm:uLinkTag[resultatAgent(concat('//isULink_', @role)) = 'true']"/> 1415 <xsl:for-each select="$vULink"> 1431 <xsl:for-each select="$vVisibleULinkTags"> 1416 1432 <xsl:call-template name="defaultGenericActions"/> 1417 1433 </xsl:for-each> 1418 <xsl:variable name="vObjectLeaf" select="sm:inlineTags/sm:objectLeafTag[resultatAgent(concat('//isObjectLeaf_', @role)) = 'true']"/> 1419 <xsl:for-each select="$vObjectLeaf"> 1434 <xsl:for-each select="$vVisibleObjectLeafTags"> 1420 1435 <xsl:call-template name="defaultGenericActions"/> 1421 1436 </xsl:for-each> 1422 <xsl:if test="sm:inlineTags/sm:phraseTag or $v ULink or $vObjectLeaf">1437 <xsl:if test="sm:inlineTags/sm:phraseTag or $vVisibleULinkTags or $vVisibleObjectLeafTags"> 1423 1438 this.createSeparator(pPopup); 1424 1439 </xsl:if> … … 1432 1447 this.createSeparator(pPopup); 1433 1448 </xsl:if> 1434 <xsl:variable name="vInlineImg" select="sm:inlineTags/sm:inlineImgTag[resultatAgent(concat('//isInlineImg_', @role)) = 'true']"/> 1435 <xsl:for-each select="$vInlineImg"> 1449 <xsl:for-each select="$vVisibleInlineImgTags"> 1436 1450 <xsl:call-template name="defaultGenericActions"/> 1437 1451 </xsl:for-each> 1438 <xsl:if test="sm:inlineTags/sm:noteTag and $v InlineImg">1452 <xsl:if test="sm:inlineTags/sm:noteTag and $vVisibleInlineImgTags"> 1439 1453 this.createSeparator(pPopup); 1440 1454 </xsl:if> … … 1706 1720 1707 1721 var vItem; 1708 <xsl:for-each select=" sm:blockTags/sm:extBlockTag">1722 <xsl:for-each select="$vVisibleExtBlockTags"> 1709 1723 var vItem = pPopup.appendChild(document.createElementNS(dom.XULNS, "menuitem")); 1710 1724 vItem.setAttribute("label", "?uri=<xsl:value-of select="chaineProtegeJs(@name)"/>"); -
trunk/Xul_XedLib/content/scenariXedLib/libUiExtra/scRichText/textBase.xbl.xml
r14987 r15078 754 754 <method name="setInlineImgProps"> 755 755 <parameter name="pHtmlNode"/> 756 <parameter name="p PathUri"/>756 <parameter name="pRefUri"/> 757 757 <parameter name="pAltText"/> 758 758 <body><![CDATA[ 759 759 try{ 760 var vAttrs = {refUri : p PathUri, text : pAltText};760 var vAttrs = {refUri : pRefUri, text : pAltText}; 761 761 var vTrans = { fNode : pHtmlNode, 762 762 fXbl : this, 763 763 fOldUri : pHtmlNode.getAttribute("refUri"), 764 fNewUri : p PathUri,764 fNewUri : pRefUri, 765 765 merge : function(pTrans){return false;}, 766 766 isTransient : false … … 787 787 <method name="setULinkProps"> 788 788 <parameter name="pHtmlNode"/> 789 <parameter name="p PathUri"/>789 <parameter name="pRefUri"/> 790 790 <body><![CDATA[ 791 791 try{ 792 var vAttrs = {refUri : p PathUri};792 var vAttrs = {refUri : pRefUri}; 793 793 var vTrans = { fNode : pHtmlNode, 794 794 fXbl : this, 795 795 fOldUri : pHtmlNode.getAttribute("refUri"), 796 fNewUri : p PathUri,796 fNewUri : pRefUri, 797 797 merge : function(pTrans){return false;}, 798 798 isTransient : false … … 815 815 ]]></body> 816 816 </method> 817 817 818 818 <method name="setDefaultRole"> 819 819 <parameter name="pHtmlNode"/> … … 829 829 <method name="setObjectLeafProps"> 830 830 <parameter name="pHtmlNode"/> 831 <parameter name="p PathUri"/>831 <parameter name="pRefUri"/> 832 832 <body><![CDATA[ 833 833 try{ 834 var vAttrs = {refUri : p PathUri};834 var vAttrs = {refUri : pRefUri}; 835 835 var vTrans = { fNode : pHtmlNode, 836 836 fXbl : this, 837 837 fOldUri : pHtmlNode.getAttribute("refUri"), 838 fNewUri : p PathUri,838 fNewUri : pRefUri, 839 839 merge : function(pTrans){return false;}, 840 840 isTransient : false … … 970 970 <method name="setExtBlockProps"> 971 971 <parameter name="pHtmlNode"/> 972 <parameter name="p PathUri"/>972 <parameter name="pRefUri"/> 973 973 <body><![CDATA[ 974 974 try{ 975 var vAttrs = {refUri : p PathUri};975 var vAttrs = {refUri : pRefUri}; 976 976 var vTrans = { fNode : pHtmlNode, 977 977 fXbl : this, 978 978 fOldUri : pHtmlNode.getAttribute("refUri"), 979 fNewUri : p PathUri,979 fNewUri : pRefUri, 980 980 merge : function(pTrans){return false;}, 981 981 isTransient : false … … 1001 1001 ]]></body> 1002 1002 </method> 1003 1004 <!-- links editors --> 1005 <method name="linkEditor_uLinkRefItem"> 1006 <parameter name="pHtmlNode"/> 1007 <body> 1008 var vRole = pHtmlNode.getAttribute("role") || ""; 1009 var vUriObject = ut.searchUriObject(this); 1010 var vContext = { 1011 window : window, 1012 scWsp : vUriObject.getWsp(), 1013 //l'item sélectionné ou l'espace de l'item en cours d'édition. 1014 refUri : pHtmlNode.getAttribute("refUri") || src.getUriParent(vUriObject.getSrcUri()), 1015 regexpSgn : this.fClasses.ULINK.regexpSgn[vRole], 1016 //Pour la callback 1017 fHtmlNode : pHtmlNode 1018 } 1019 var vSvc = extPoints.getSvc(this.fCodeModel+"_ULinkRefItemEditor_"+vRole) || 1020 extPoints.getSvc("sm_textPrim_ULinkRefItemEditor") || 1021 extPoints.getSvc("itemSelector"); 1022 vSvc.selectItemAsynch(vContext, this.linkEditorCb_uLinkRefItem, this); 1023 </body> 1024 </method> 1025 <method name="linkEditorCb_uLinkRefItem"> 1026 <parameter name="pContext"/> 1027 <parameter name="pResult"/> 1028 <body> 1029 if(pResult.refUri != null) this.setULinkProps(pContext.fHtmlNode, pResult.refUri); 1030 </body> 1031 </method> 1032 <method name="linkEditor_uLinkUrl"> 1033 <parameter name="pHtmlNode"/> 1034 <body> 1035 this.openSubWindowEditor("chrome://scenariXedLib/content/libUiExtra/scRichText/uLinkUrlEditor.xul", pHtmlNode); 1036 </body> 1037 </method> 1038 <method name="linkEditor_extBlock"> 1039 <parameter name="pHtmlNode"/> 1040 <body> 1041 var vRole = pHtmlNode.getAttribute("role") || ""; 1042 var vUriObject = ut.searchUriObject(this); 1043 var vContext = { 1044 window : window, 1045 scWsp : vUriObject.getWsp(), 1046 //l'item sélectionné ou l'espace de l'item en cours d'édition. 1047 refUri : pHtmlNode.getAttribute("refUri") || src.getUriParent(vUriObject.getSrcUri()), 1048 regexpSgn : this.fClasses.EXTBLOCK.regexpSgn[vRole], 1049 //Pour la callback 1050 fHtmlNode : pHtmlNode 1051 } 1052 var vSvc = extPoints.getSvc(this.fCodeModel+"_ExtBlockEditor_"+vRole) || 1053 extPoints.getSvc("sm_textPrim_ExtBlockEditor") || 1054 extPoints.getSvc("itemSelector"); 1055 vSvc.selectItemAsynch(vContext, this.linkEditorCb_extBlock, this); 1056 </body> 1057 </method> 1058 <method name="linkEditorCb_extBlock"> 1059 <parameter name="pContext"/> 1060 <parameter name="pResult"/> 1061 <body> 1062 if(pResult.refUri != null) this.setExtBlockProps(pContext.fHtmlNode, pResult.refUri); 1063 </body> 1064 </method> 1065 1066 <method name="linkEditor_inlineImg"> 1067 <parameter name="pHtmlNode"/> 1068 <body> 1069 var vRole = pHtmlNode.getAttribute("role") || ""; 1070 var vUriObject = ut.searchUriObject(this); 1071 var vContext = { 1072 window : window, 1073 scWsp : vUriObject.getWsp(), 1074 //l'item sélectionné ou l'espace de l'item en cours d'édition. 1075 refUri : pHtmlNode.getAttribute("refUri") || src.getUriParent(vUriObject.getSrcUri()), 1076 regexpSgn : this.fClasses.IMG.regexpSgn[vRole], 1077 //Pour la callback 1078 fHtmlNode : pHtmlNode 1079 } 1080 var vAltTextTitle = this.fClasses.IMG.getAltTextTitle(pHtmlNode); 1081 if(vAltTextTitle) { 1082 vContext.fAltText = pHtmlNode.getAttribute("text"); 1083 vContext.fAltTextTitle = vAltTextTitle; 1084 vContext.extPoinUrls = ["javascript:extPoints.addToList('xmlOverlay:selItem.xul', 'AltText', 1, 'chrome://scenariXedLib/content/libUiExtra/scRichText/inlineImgLinkEditor.overlay.xul', 0)", 1085 "javascript:extPoints.addToList('event:load:selItem', 'AltText', 1, function(){document.getElementById('altTextInput').value = sContext.fAltText; log.info('sContext.fAltTextTitle::'+sContext.fAltTextTitle); document.getElementById('altTextLabel').value = sContext.fAltTextTitle;}, 0, true);"]; 1086 } 1087 var vSvc = extPoints.getSvc(this.fCodeModel+"_ExtBlockEditor_"+vRole) || 1088 extPoints.getSvc("sm_textPrim_ExtBlockEditor") || 1089 extPoints.getSvc("itemSelector"); 1090 vSvc.selectItemAsynch(vContext, this.linkEditorCb_inlineImg, this); 1091 </body> 1092 </method> 1093 <method name="linkEditorCb_inlineImg"> 1094 <parameter name="pContext"/> 1095 <parameter name="pResult"/> 1096 <body> 1097 if(pResult.refUri != null) this.setInlineImgProps(pContext.fHtmlNode, pResult.refUri, pResult.fAltText); 1098 </body> 1099 </method> 1100 <method name="linkEditor_objectLeaf"> 1101 <parameter name="pHtmlNode"/> 1102 <body> 1103 var vRole = pHtmlNode.getAttribute("role") || ""; 1104 var vUriObject = ut.searchUriObject(this); 1105 var vContext = { 1106 window : window, 1107 scWsp : vUriObject.getWsp(), 1108 //l'item sélectionné ou l'espace de l'item en cours d'édition. 1109 refUri : pHtmlNode.getAttribute("refUri") || src.getUriParent(vUriObject.getSrcUri()), 1110 regexpSgn : this.fClasses.OBJECTLEAF.regexpSgn[vRole], 1111 //Pour la callback 1112 fHtmlNode : pHtmlNode 1113 } 1114 var vSvc = extPoints.getSvc(this.fCodeModel+"_ExtBlockEditor_"+vRole) || 1115 extPoints.getSvc("sm_textPrim_ExtBlockEditor") || 1116 extPoints.getSvc("itemSelector"); 1117 vSvc.selectItemAsynch(vContext, this.linkEditorCb_objectLeaf, this); 1118 </body> 1119 </method> 1120 <method name="linkEditorCb_objectLeaf"> 1121 <parameter name="pContext"/> 1122 <parameter name="pResult"/> 1123 <body> 1124 if(pResult.refUri != null) this.setObjectLeafProps(pContext.fHtmlNode, pResult.refUri); 1125 </body> 1126 </method> 1127 1128 1003 1129 1004 1130 <!-- … … 1767 1893 try { 1768 1894 var vStructNode = pDesc.fZoneEditor.fClasses[pDesc.fNode.nodeName].getStructuralNodes(pDesc.fNode); 1769 pDesc.fZoneEditor.openSubWindowEditor(vStructNode.urlLinkEditor, pDesc.fNode); 1895 pDesc.fZoneEditor[vStructNode.linkEditorFunc](pDesc.fNode); 1896 //pDesc.fZoneEditor.openSubWindowEditor(vStructNode.urlLinkEditor, pDesc.fNode); 1770 1897 pNotif.close(); 1771 1898 }catch(e){xed.debug(e);} … … 2648 2775 var vStructNode = this.fClasses[vNewNode.nodeName].getStructuralNodes(vNewNode); 2649 2776 if(vStructNode.hasLinkEditor) { 2650 this .openSubWindowEditor(vStructNode.urlLinkEditor,vNewNode);2777 this[vStructNode.linkEditorFunc](vNewNode); 2651 2778 } else if(vStructNode.hasSubEditor) { 2652 2779 this.openSubWindowEditor(vStructNode.urlSubEditor, vNewNode); … … 3289 3416 var vStructNode = this.fClasses[vNewNode.nodeName].getStructuralNodes(vNewNode); 3290 3417 if(vStructNode.hasLinkEditor) { 3291 this .openSubWindowEditor(vStructNode.urlLinkEditor,vNewNode);3418 this[vStructNode.linkEditorFunc](vNewNode); 3292 3419 } else if(vStructNode.hasSubEditor) { 3293 3420 this.openSubWindowEditor(vStructNode.urlSubEditor, vNewNode); … … 3625 3752 var vStructNode = this.fClasses[vNewNode.nodeName].getStructuralNodes(vNewNode); 3626 3753 if(vStructNode.hasLinkEditor && !pUriItem) { 3627 this .openSubWindowEditor(vStructNode.urlLinkEditor,vNewNode);3754 this[vStructNode.linkEditorFunc](vNewNode); 3628 3755 } else if(vStructNode.hasSubEditor) { 3629 3756 this.openSubWindowEditor(vStructNode.urlSubEditor, vNewNode); … … 5368 5495 pEvent.stopPropagation(); 5369 5496 var vStructNode = pEvent.originalTarget.fStructNode; 5370 sXbl .openSubWindowEditor(vStructNode.urlLinkEditor,vStructNode._node);5497 sXbl[vStructNode.linkEditorFunc](vStructNode._node); 5371 5498 }catch(e){xed.debug("buildLinkPopup.open"+e);} 5372 5499 }, false); … … 7190 7317 <body> 7191 7318 try{ 7192 this .openSubWindowEditor(pStructNode.urlLinkEditor,pStructNode._node);7319 this[pStructNode.linkEditorFunc](pStructNode._node); 7193 7320 }catch(e){xed.debug("openLinkEditor::"+e);} 7194 7321 </body> … … 8208 8335 var vStructNode = this.fClasses[vObj.nodeName].getStructuralNodes(vObj); 8209 8336 if(vStructNode.hasLinkEditor) { 8210 this .openSubWindowEditor(vStructNode.urlLinkEditor,vObj);8337 this[vStructNode.linkEditorFunc](vObj); 8211 8338 } else if(vStructNode.hasSubEditor){ 8212 8339 this.openSubWindowEditor(vStructNode.urlSubEditor, vObj);
