Author: mflorea Date: 2008-09-26 12:48:14 +0200 (Fri, 26 Sep 2008) New Revision: 13009 Modified: platform/web/trunk/standard/src/main/webapp/templates/editwysiwygnew.vm Log: The teletype feature will be included in 1.7 so I removed it from the tool bar. I also changed the way the editor loads. Now it gets as input HTML and not wiki syntax. This way the editor loads faster.

Modified: platform/web/trunk/standard/src/main/webapp/templates/editwysiwygnew.vm =================================================================== --- platform/web/trunk/standard/src/main/webapp/templates/editwysiwygnew.vm 2008-09-26 10:45:11 UTC (rev 13008) +++ platform/web/trunk/standard/src/main/webapp/templates/editwysiwygnew.vm 2008-09-26 10:48:14 UTC (rev 13009) @@ -26,14 +26,14 @@ <link rel="stylesheet" href="${request.contextPath}/com.xpn.xwiki.wysiwyg.Wysiwyg/Wysiwyg.css" /> <script type="text/javascript" src="${request.contextPath}/com.xpn.xwiki.wysiwyg.Wysiwyg/com.xpn.xwiki.wysiwyg.Wysiwyg.nocache.js"></script> <iframe src="javascript:''" id="__gwt_historyFrame" style="width:0;height:0;border:0"></iframe> -$xwiki.getTextArea($tdoc.content) +$xwiki.getTextArea($xwiki.wysiwyg.toHTML($tdoc.content, $doc.syntaxId)) <script type="text/javascript"> //<![CDATA[ var Wysiwyg0 = { hookId: 'content', syntax: "$doc.syntaxId", plugins: 'separator text valign list indent undo format symbol', - toolbar: 'bold italic underline strikethrough teletype | subscript superscript | unorderedlist orderedlist | outdent indent | undo redo | format | hr symbol', + toolbar: 'bold italic underline strikethrough | subscript superscript | unorderedlist orderedlist | outdent indent | undo redo | format | hr symbol', debug: #if($request.debug)'true'#else'false'#end }; //]]>