From: <rob...@us...> - 2011-09-02 21:34:52
|
Revision: 36834 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=36834&view=rev Author: robertplummer Date: 2011-09-02 21:34:45 +0000 (Fri, 02 Sep 2011) Log Message: ----------- [FIX] removed base from running as it runs from tiki already. Modified Paths: -------------- trunk/lib/codemirror_tiki/codemirror_tiki.js trunk/lib/wiki-plugins/wikiplugin_code.php Modified: trunk/lib/codemirror_tiki/codemirror_tiki.js =================================================================== --- trunk/lib/codemirror_tiki/codemirror_tiki.js 2011-09-02 21:00:25 UTC (rev 36833) +++ trunk/lib/codemirror_tiki/codemirror_tiki.js 2011-09-02 21:34:45 UTC (rev 36834) @@ -4,14 +4,8 @@ flexibleSyntaxHighlighter: function(settings) { settings = jQuery.extend({ mode: "tiki", - changeText: "Change Highlighter", - buttonText: { - update: "Update", - cancel: "Cancel" - }, parent: jQuery(this).parent(), lineNumbers: false, - textWrapping: true, readOnly: false, force: false, l: "lib/codemirror/mode/" @@ -227,7 +221,6 @@ } }, lineNumbers: settings.lineNumbers, - textWrapping: settings.textWrapping, readOnly: settings.readOnly, mode: modeDef.mime }); @@ -255,57 +248,62 @@ textarea.parents('form').submit(function() { textarea.val(editor.getValue()).change(); }); - + if (!settings.readOnly) { syntaxHighlighter.add(editor, textarea); var changeButton = jQuery('<div class="button">' + '<a>' + - settings.changeText + + tr("Change Highlighter") + '</a>' + '</div>').insertAfter(textarea.next()).click(function(){ var options = 'Modes: <br />'; options += "<select class='cm-mode'>"; - options += "<option value=''>Select a Mode</option>"; + options += "<option value=''>" + tr("Select a Mode") + "</option>"; for(mode in syntaxHighlighter.modes) { options += '<option value="' + mode + '">' + mode + '</option>'; } options += "</select><br />"; options += 'Options:<br />'; - options += '<input class="opt" type="checkbox" value="lineNumbers" ' + (settings.lineNumbers ? 'checked="true"' : '') + '/>Line Numbers<br />'; - options += '<input class="opt" type="checkbox" value="textWrapping" ' + (settings.textWrapping ? 'checked="true"' : '') + '/>Text Wrapping<br />'; - options += '<input class="opt" type="checkbox" value="dynamicHeight" ' + (settings.dynamicHeight ? 'checked="true"' : '') + '/>Dynamic Height<br />'; + options += '<input class="opt" type="checkbox" value="lineNumbers" ' + (settings.lineNumbers ? 'checked="true"' : '') + '/>' + tr("Line Numbers") + '<br />'; + options += '<input class="opt" type="checkbox" value="dynamicHeight" ' + (settings.dynamicHeight ? 'checked="true"' : '') + '/>' + tr("Dynamic Height") + '<br />'; var msg = jQuery('<div />') .html(options) .dialog({ title: settings.changeText, modal: true, - buttons: { - "Update": function(){ - var newSettings = {}; - - newSettings.mode = msg.find('.cm-mode').val(); - - msg.find('.opt').each(function(){ - var o = jQuery(this); - newSettings[o.val()] = o.is(':checked'); - }); - - changeButton.remove(); - editor.toTextArea(); - - textarea.data('syntax', newSettings.mode); - - textarea.flexibleSyntaxHighlighter(jQuery.extend(settings, newSettings)); - - msg.dialog("destroy"); + buttons: [ + { + text: tr("Update"), + click: function(){ + var newSettings = {}; + + newSettings.mode = msg.find('.cm-mode').val(); + + msg.find('.opt').each(function(){ + var o = jQuery(this); + newSettings[o.val()] = o.is(':checked'); + }); + + changeButton.remove(); + editor.toTextArea(); + + textarea.data('syntax', newSettings.mode); + + textarea.flexibleSyntaxHighlighter(jQuery.extend(settings, newSettings)); + + msg.dialog("destroy"); + } }, - "Cancel": function(){ - msg.dialog("destroy"); + { + text: tr("Cancel"), + click: function(){ + msg.dialog("destroy"); + } } - } + ] }); msg.find(".cm-mode").val(currentMode); Modified: trunk/lib/wiki-plugins/wikiplugin_code.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_code.php 2011-09-02 21:00:25 UTC (rev 36833) +++ trunk/lib/wiki-plugins/wikiplugin_code.php 2011-09-02 21:34:45 UTC (rev 36834) @@ -9,8 +9,6 @@ require_once('lib/codemirror_tiki/codemirror_tiki.php'); if ( $prefs['feature_syntax_highlighter'] == 'y' ) { - tiki_syntax_highlighter_base(); - $headerlib->add_jq_onready(" if (!syntaxHighlighter) return; if (!syntaxHighlighter.modes) return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |