@@ -17,39 +17,37 @@ </style> </head> <body> - <form onsubmit="SyntaxHLDialog.insert(); return false;" action="#"> <fieldset id="syntaxhl_options"> <legend>{#syntaxhl_dlg.highlight_options}</legend> - - <input type="checkbox" name="syntaxhl_nogutter" id="syntaxhl_nogutter" value="1" /><label for="syntaxhl_nogutter" >{#syntaxhl_dlg.nogutter}</label> - - <input type="checkbox" name="syntaxhl_nocontrols" id="syntaxhl_nocontrols" value="1" /><label for="syntaxhl_nocontrols">{#syntaxhl_dlg.nocontrols}</label> - - <input type="checkbox" name="syntaxhl_collapse" id="syntaxhl_collapse" value="1" /><label for="syntaxhl_collapse">{#syntaxhl_dlg.collapse}</label> - - <input type="checkbox" name="syntaxhl_showcolumns" id="syntaxhl_showcolumns" value="1" /><label for="syntaxhl_showcolumns">{#syntaxhl_dlg.showcolumns}</label><br /> - + <input type="checkbox" name="syntaxhl_nogutter" id="syntaxhl_nogutter" value="1" /><label for="syntaxhl_nogutter" >{#syntaxhl_dlg.nogutter}</label> + <input type="checkbox" name="syntaxhl_light" id="syntaxhl_light" value="1" /><label for="syntaxhl_light">{#syntaxhl_dlg.light}</label> + <input type="checkbox" name="syntaxhl_collapse" id="syntaxhl_collapse" value="1" /><label for="syntaxhl_collapse">{#syntaxhl_dlg.collapse}</label> + <label for="syntaxhl_highlight">{#syntaxhl_dlg.highlight}</label><input type="text" name="syntaxhl_highlight" id="syntaxhl_highlight" style="width:50px;" /><br /> <label for="syntaxhl_language">{#syntaxhl_dlg.choose_lang}:</label> - <select name="syntaxhl_language" id="syntaxhl_language"> + <select name="syntaxhl_language" id="syntaxhl_language"> + <option value="bash">Bash(Shell)</option> + <option value="csharp">C#</option> <option value="cpp">C++</option> - <option value="c-sharp">C#</option> <option value="css">CSS</option> - <option value="delphi">Delphi</option> - <option value="java">Java</option> - <option value="javascript">Javascript</option> - <option value="php">PHP</option> + <option value="delphi">Delphi</option> + <option value="diff">Diff</option> + <option value="groovy">Groovy</option> + <option value="jscript">Jscript</option> + <option value="java">Java</option> + <option value="perl">Perl</option> + <option value="php">PHP</option> + <option value="plain">Plain(Text)</option> <option value="python">Python</option> - <option value="ruby">Ruby</option> + <option value="ruby">Ruby</option> + <option value="scala">Scala</option> + <option value="sql">SQL</option> <option value="vb">VB</option> - <option value="xhtml">XML/XHTML</option> + <option value="xml">XML/XHTML</option> </select> - - <label for="syntaxhl_firstline" style="margin-left: 15px;">{#syntaxhl_dlg.first_line}:</label> - <input type="textfield" name="syntaxhl_firstline" id="syntaxhl_firstline" style="width:20px;" /> - + <label for="syntaxhl_firstline" style="margin-left: 15px;">{#syntaxhl_dlg.first_line}:</label><input type="textfield" name="syntaxhl_firstline" id="syntaxhl_firstline" value="1" style="width:20px;" /> + <label for="syntaxhl_fontsize">{#syntaxhl_dlg.fontsize}</label><input type="text" name="syntaxhl_fontsize" id="syntaxhl_fontsize" value="100" style="width:25px;" />% </fieldset> - <fieldset> <legend>{#syntaxhl_dlg.paste}</legend> <textarea name="syntaxhl_code" id="syntaxhl_code" rows="15" cols="100" style="width: 100%; height: 100%; font-family: 'Courier New',Courier,mono; font-size: 12px;" class="mceFocus"></textarea> @@ -58,12 +56,10 @@ <div style="float: left"> <input type="submit" id="insert" name="insert" value="{#insert}" /> </div> - <div style="float: right"> <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" /> </div> </div> </form> - </body> </html> dialog.htm editor_plugin.js editor_plugin_src.js img/highlight.gif @@ -14,30 +14,34 @@ var SyntaxHLDialog = { } if(f.syntaxhl_nogutter.checked) { - options += ':nogutter'; + options += 'gutter: false; '; } - if(f.syntaxhl_nocontrols.checked) { - options += ':nocontrols'; + if(f.syntaxhl_light.checked) { + options += 'light: true; '; } if(f.syntaxhl_collapse.checked) { - options += ':collapse'; - } - if(f.syntaxhl_showcolumns.checked) { - options += ':showcolumns'; + options += 'collapse: true; '; + } + if(f.syntaxhl_fontsize.value != '') { + var fontsize=parseInt(f.syntaxhl_fontsize.value); + options += 'fontsize: ' + fontsize + '; '; } if(f.syntaxhl_firstline.value != '') { var linenumber = parseInt(f.syntaxhl_firstline.value); - options += ':firstline[' + linenumber + ']'; + options += 'first-line: ' + linenumber + '; '; + } + if(f.syntaxhl_highlight.value != '') { + options += 'highlight: [' + f.syntaxhl_highlight.value + ']; '; } - textarea_output = '<textarea name="code" '; - textarea_output += 'class="' + f.syntaxhl_language.value + options + '" cols="50" rows="15">'; + textarea_output = '<pre class="brush: '; + textarea_output += f.syntaxhl_language.value + ';' + options + '">'; textarea_output += f.syntaxhl_code.value; - textarea_output += '</textarea> '; /* note space at the end, had a bug it was inserting twice? */ + textarea_output += '</pre> '; /* note space at the end, had a bug it was inserting twice? */ tinyMCEPopup.editor.execCommand('mceInsertContent', false, textarea_output); tinyMCEPopup.close(); } }; -tinyMCEPopup.onInit.add(SyntaxHLDialog.init, SyntaxHLDialog); \ No newline at end of file +tinyMCEPopup.onInit.add(SyntaxHLDialog.init, SyntaxHLDialog); js/dialog.js langs/en.js @@ -4,8 +4,9 @@ tinyMCE.addI18n('en.syntaxhl_dlg',{ paste : 'Paste Code', choose_lang : 'Choose Language', nogutter : 'No Gutter', - nocontrols : 'No Controls', - collapse : 'Collapse', - showcolumns : 'Show Columns', - first_line : 'First line (default blank)' + light : 'Light', + collapse : 'Collapse', + fontsize : 'Font size', + first_line : 'First line', + highlight ： 'Highlight' }); langs/en_dlg.js d8295f66c6c9c06076ce5af5ced99ec96dc64423 qubic qubicllj@gmail.com http://github.com/RichGuk/syntaxhl/commit/e945e10c8b8918b305fa8a369927df075a7514dd e945e10c8b8918b305fa8a369927df075a7514dd

2009-03-02T05:07:31-08:00

add support to SyntaxHighlighter-2.0.296 b7ab6c16f997c62941362e361c02b170e2822d0e qubic qubicllj@gmail.com