form to the {} form
+of syntaxhighlighter, otherwise, the HTML that is generated has illegal class names
+that conflict with some content filters.
+
+-Code was added to dialog.htm to dynamically discover the tinyMCE popup javascript library using drupal
+helper properties
+
+-Code was added to dialog.htm to dynamically determine the proper language choices based on the Drupal
+syntaxhighlighter module settings.
+
diff --git a/plugins/syntaxhl/dialog.php b/plugins/syntaxhl/dialog.php
new file mode 100755
index 0000000..3ec7307
--- /dev/null
+++ b/plugins/syntaxhl/dialog.php
@@ -0,0 +1,52 @@
+
+
+
+ {#syntaxhl_dlg.title}
+
+
+";
+?>
+
+
+
+
+
+
+
diff --git a/plugins/syntaxhl/editor_plugin.js b/plugins/syntaxhl/editor_plugin.js
new file mode 100644
index 0000000..9e9b9fc
--- /dev/null
+++ b/plugins/syntaxhl/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.PluginManager.requireLangPack("syntaxhl");tinymce.create("tinymce.plugins.SyntaxHL",{init:function(a,b){var c=this;c.editor=a;c.url=b;function d(e){return/^(wysiwyg-syntaxhl)/.test(e.className)}a.addCommand("mceSyntaxHL",function(){a.windowManager.open({file:b+"/dialog.php?path="+escape(tinyMCE.baseURL)+"&random="+Math.random(),width:450+parseInt(a.getLang("syntaxhl.delta_width",0)),height:400+parseInt(a.getLang("syntaxhl.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("syntaxhl",{title:"syntaxhl.desc",cmd:"mceSyntaxHL",image:b+"/img/highlight.gif"});a.onNodeChange.add(function(f,e,h){var g=f.dom.getAttrib(h,"class");e.setActive("syntaxhl",h.nodeName=="PRE"&&g.match(/wysiwyg-syntaxhl/))});a.onInit.add(function(){if(a&&a.plugins.contextmenu){a.plugins.contextmenu.onContextMenu.add(function(h,f,i){var g=a.dom.getAttrib(i,"class");if(i.nodeName=="PRE"&&g.match(/wysiwyg-syntaxhl/)){f.add({title:"Edit Code",icon:"",cmd:"mceSyntax"})}})}});a.onBeforeSetContent.add(function(f,g){var e;if(tinymce.isIE){e="\r\n"}else{e="\n"}g.content=g.content.replace(/()?(
)?{syntaxhighlighter ([^}]*)}/g,'
');g.content=g.content.replace(/{\/syntaxhighlighter}(<\/p>)?(<\/P>)?/g,"")});a.onPostProcess.add(function(l,g){if(g.save){if(!tinymce.isIE){var j=l.dom.select("pre.wysiwyg-syntaxhl");for(var k=0;k element is selected
+ ed.onNodeChange.add(function(ed, cm, n) {
+ var style = ed.dom.getAttrib(n, 'class');
+ cm.setActive('syntaxhl', n.nodeName == 'PRE' && style.match(/wysiwyg-syntaxhl/));
+ });
+
+ // Fixme not all pre tags or even any pre tags
+ ed.onInit.add(function() {
+ if (ed && ed.plugins.contextmenu) {
+ ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {
+ var style = ed.dom.getAttrib(e, 'class');
+ if (e.nodeName == 'PRE' && style.match(/wysiwyg-syntaxhl/)) {
+ m.add({
+ title: 'Edit Code',
+ icon: '',
+ cmd: 'mceSyntax'
+ });
+ }
+ });
+ }
+ });
+
+ // convert any {}-macro tags to pre's
+ //ed.onBeforeSetContent.add(t._macroToPre, t);
+ ed.onBeforeSetContent.add(
+ function(ed, o) {
+ //console.log('before set');
+
+ var nlChar;
+ if (tinymce.isIE)
+ nlChar = '\r\n';
+ else
+ nlChar = '\n';
+
+ o.content = o.content.replace(/()?(
)?{syntaxhighlighter ([^}]*)}/g, '
');
+ o.content = o.content.replace(/{\/syntaxhighlighter}(<\/p>)?(<\/P>)?/g, '');
+ }
+ );
+
+ ed.onPostProcess.add(
+ function(ed, o) {
+ //console.log('doing postprocess');
+ if (o.save) {
+ if (!tinymce.isIE) {
+ // IE is collapsing newlines somewhere, so I only to the pre-to-macro
+ // conversion for non-ie browsers
+
+ // This basic regex works, but it would match every non syntaxhl element
+ //o.content = o.content.replace(//g,'{syntaxhighlighter $1}' );
+ //o.content = o.content.replace(/<\/pre>/g,'{/syntaxhighlighter}' );
+ // better to use dom utilities...
+ var syntaxElements = ed.dom.select('pre.wysiwyg-syntaxhl');
+ //console.log(syntaxElements);
+
+ for (var i = 0; i < syntaxElements.length; i++) {
+ //console.log('in loop');
+ //console.log('element:' + syntaxElements[i]);
+ //console.log(syntaxElements[i].toString());
+ //console.log(syntaxElements[i]);
+ //console.log(ed.dom.getOuterHTML(syntaxElements[i]));
+ //console.log('element text: '+ t._getText(syntaxElements[i]));
+ var style = ed.dom.getAttrib(syntaxElements[i], 'class');
+
+ matchString = ed.dom.getOuterHTML(syntaxElements[i]);
+ if (tinymce.isIE) {
+ //console.log('is ie');
+ matchString = matchString.replace(/^$/, 'pre>' );
+ }
+ //console.log('matchString: '+ matchString);
+ var start = o.content.indexOf(matchString);
+ //var start = o.content.indexOf(t._getText(syntaxElements[i]));
+ //console.log('match starts on: ' + start);
+
+ var length = ed.dom.getOuterHTML(syntaxElements[i]).length;
+ //var length = t._getText(syntaxElements[i]).length;
+ //console.log('length of match is: ' + length );
+
+ style = style.replace(/(wysiwyg-syntaxhl\s*)/g, '');
+
+ // always use the _getText function, because innerHTML causes ie to remove whitespace
+ var macroString = '{syntaxhighlighter ' + style + '}' + ed.dom.encode(t._getText(syntaxElements[i])) + '{/syntaxhighlighter}';
+ //console.log("macro:" + macroString);
+
+ var startString = o.content.substr(0, start);
+ var endString = o.content.substr(start+length);
+
+ if (start != -1) {
+ o.content = startString + macroString + endString;
+ }
+
+ // The below should be all I need, but it doesn't work, which is why I jump through all the hoops above.
+ // I suspect it is because at this point in the program flow, using the domutils form the tinyMCE
+ // library no longer update o.content, so whatever I need to do, I need to do directly to
+ // o.content
+ //ed.dom.setOuterHTML(syntaxElements[i], macroString);
+ }
+ }
+ }
+ }
+ );
+
+ //ed.onSaveContent.add(function(ed, o) {
+ // window.alert('on savecontent');
+ //});
+ },
+
+ /**
+ * Creates control instances based in the incomming name. This method is normally not
+ * needed since the addButton method of the tinymce.Editor class is a more easy way of adding buttons
+ * but you sometimes need to create more complex controls like listboxes, split buttons etc then this
+ * method can be used to create those.
+ *
+ * @param {String} n Name of the control to create.
+ * @param {tinymce.ControlManager} cm Control manager to use inorder to create new control.
+ * @return {tinymce.ui.Control} New control instance or null if no control was created.
+ */
+ createControl: function(n, cm) {
+ return null;
+ },
+
+ /**
+ * Returns information about the plugin as a name/value array.
+ * The current keys are longname, author, authorurl, infourl and version.
+ *
+ * @return {Object} Name/value array containing information about the plugin.
+ */
+ getInfo: function() {
+ return {
+ longname: 'Syntax Highlighter',
+ author: 'Clifford Meece',
+ authorurl: 'http://cliffordmeece.com',
+ infourl: 'http://drupal.org/project/wysiwyg_syntaxhl',
+ version: "1.0"
+ };
+ },
+
+ _getText: function(obj) {
+ // return the data of obj if its a text node
+ if (obj.nodeType == 3) return obj.nodeValue;
+ var txt = new Array(),
+ i = 0;
+ // loop over the children of obj and recursively pass them back to this function
+ while (obj.childNodes[i]) {
+ txt[txt.length] = this._getText(obj.childNodes[i]);
+ i++;
+ }
+ // return the array as a string
+ return txt.join("");
+ }
+ });
+
+ // Register plugin
+ tinymce.PluginManager.add('syntaxhl', tinymce.plugins.SyntaxHL);
+})();
\ No newline at end of file
diff --git a/plugins/syntaxhl/img/highlight.gif b/plugins/syntaxhl/img/highlight.gif
new file mode 100755
index 0000000..9e5ce04
Binary files /dev/null and b/plugins/syntaxhl/img/highlight.gif differ
diff --git a/plugins/syntaxhl/js/dialog.js b/plugins/syntaxhl/js/dialog.js
new file mode 100755
index 0000000..7480b54
--- /dev/null
+++ b/plugins/syntaxhl/js/dialog.js
@@ -0,0 +1,162 @@
+tinyMCEPopup.requireLangPack();
+var SyntaxHLDialog = {
+
+
+ init : function() {
+
+ var f = document.forms[0], textarea_output, options = '';
+ ed = tinyMCEPopup.editor;
+ n = ed.selection.getNode();
+ var languages;
+ if (ed && ed.plugins.inlinepopups) {
+ languages = parent.Drupal.settings.wysiwyg_syntaxhl.languages;
+ } else {
+ languages = window.opener.Drupal.settings.wysiwyg_syntaxhl.languages;
+ }
+
+ for (i=0; i < languages.length;++i){
+ var optn = document.createElement("OPTION");
+ optn.text = languages[i]['text'];
+ optn.value = languages[i]['value'];
+ document.syntaxhl.syntaxhl_language.options.add(optn);
+ }
+
+ if (n.nodeName == 'PRE') {
+ // remove placeholder class name and split remaining portion by ';'
+ var style = ed.dom.getAttrib(n, 'class');
+ style = style.replace(/wysiwyg-syntaxhl\s*/g,'')
+ var a = style.split(';');
+ for (var i = 0; i < a.length; i++) {
+ // Remove unnecessary whitespace
+ a[i] = a[i].replace(/\s+/g, '');
+ if (a[i] != '') {
+ // split name and value pairs
+ var b = a[i].split(':');
+ switch (b[0]) {
+ case "brush":
+ // loop through select box looking for proper place to put selected index
+ for (var j=0; j < f.syntaxhl_language.options.length; j++) {
+ if (f.syntaxhl_language.options[j].value == b[1]) {
+ f.syntaxhl_language.selectedIndex = j;
+ }
+ }
+ break;
+ case "first-line":
+ f.syntaxhl_firstline.value = b[1];
+ break;
+ case "fontsize":
+ f.syntaxhl_fontsize.value = b[1];
+ break;
+ case "gutter":
+ if (b[1] == 'true' ) {
+ f.syntaxhl_nogutter.checked = false;
+ } else if (b[1] == 'false' ) {
+ f.syntaxhl_nogutter.checked = true;
+ } else {f.syntaxhl_nogutter.checked = false;}
+ break;
+ case "light":
+ if (b[1] == 'true' ) {
+ f.syntaxhl_light.checked = true;
+ } else if (b[1] == 'false' ) {
+ f.syntaxhl_light.checked = false;
+ } else {f.syntaxhl_light.checked = false;}
+ break;
+ case "collapse":
+ if (b[1] == 'true' ) {
+ f.syntaxhl_collapse.checked = true;
+ } else if (b[1] == 'false' ) {
+ f.syntaxhl_collapse.checked = false;
+ } else {f.syntaxhl_collapse.checked = false;}
+ break;
+ case "highlight":
+ f.syntaxhl_highlight.value = b[1];
+ break;
+ }
+ }
+ }
+
+ // this is a total hack, but by running getContent, we force the
+ // preelementfix plugin to do it's cleanup routine
+ // which fixes any
or tabs that may be in our pre elements.
+ // The preelementfix plugin should probably do this work on the
+ // selection.getContent event as well, which would take care of it for us,
+ // but it doesn't so we have to grab the whole content, which incidentally, will
+ // clean all the pre's on the page, not just the one we are selecting
+ // the other option is we implement the
conversion ourselves, but
+ // I had a hell of time figuring out how to do that on just a selection
+ ed.getContent();
+ // FIXME, this may cause ie to modify the content when setting textarea value
+ // and screwing up whitespace
+ f.syntaxhl_code.value = ed.dom.decode(this._getText(n));
+
+
+ }// end if (fe.nodeName == 'PRE')
+
+ },
+
+ insert : function() {
+ var n, f = document.forms[0], textarea_output, options = '';
+
+ tinyMCEPopup.restoreSelection();
+ n = ed.selection.getNode();
+
+ if(f.syntaxhl_nogutter.checked) {
+ options += 'gutter: false; ';
+ }
+ if(f.syntaxhl_light.checked) {
+ options += 'light: true; ';
+ }
+ if(f.syntaxhl_collapse.checked) {
+ 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 += 'first-line: ' + linenumber + '; ';
+ }
+ if(f.syntaxhl_highlight.value != '') {
+ options += 'highlight: [' + f.syntaxhl_highlight.value + ']; ';
+ }
+
+ if (n != null && n.nodeName == 'PRE') {
+ style = 'wysiwyg-syntaxhl brush: ' + f.syntaxhl_language.value + ';' + options;
+ ed.dom.setOuterHTML(n,'' + ed.dom.encode(f.syntaxhl_code.value)+'
');
+ ed.dom.setAttrib(n,'class',style);
+ } else {
+ //If no code just return.
+ if(f.syntaxhl_code.value == '') {
+ tinyMCEPopup.close();
+ return false;
+ } else {
+ textarea_output = '';
+ textarea_output += tinyMCEPopup.editor.dom.encode(f.syntaxhl_code.value);
+ textarea_output += '
';
+ tinyMCEPopup.editor.execCommand('mceInsertContent', false, textarea_output);
+ }
+ }
+
+ tinyMCEPopup.close();
+
+ },
+
+ _getText : function(obj) {
+ // return the data of obj if its a text node
+ if (obj.nodeType == 3) return obj.nodeValue;
+ var txt = new Array(),i=0;
+ // loop over the children of obj and recursively pass them back to this function
+ while(obj.childNodes[i]) {
+ txt[txt.length] = this._getText(obj.childNodes[i]);
+ i++;
+ }
+ // return the array as a string
+ return txt.join("");
+ }
+
+
+};
+
+tinyMCEPopup.onInit.add(SyntaxHLDialog.init, SyntaxHLDialog);
diff --git a/plugins/syntaxhl/langs/en.js b/plugins/syntaxhl/langs/en.js
new file mode 100755
index 0000000..785f41e
--- /dev/null
+++ b/plugins/syntaxhl/langs/en.js
@@ -0,0 +1,3 @@
+tinyMCE.addI18n('en.syntaxhl',{
+ desc : 'Insert code using Syntaxhighlighter'
+});
diff --git a/plugins/syntaxhl/langs/en_dlg.js b/plugins/syntaxhl/langs/en_dlg.js
new file mode 100755
index 0000000..e3079b4
--- /dev/null
+++ b/plugins/syntaxhl/langs/en_dlg.js
@@ -0,0 +1,12 @@
+tinyMCE.addI18n('en.syntaxhl_dlg',{
+ title : 'Insert code using SyntaxHighlighter',
+ highlight_options : 'Highlighter Options',
+ paste : 'Paste Code',
+ choose_lang : 'Choose Language',
+ nogutter : 'No Gutter',
+ light : 'Light',
+ collapse : 'Collapse',
+ fontsize : 'Font size',
+ first_line : 'First line',
+ highlight : 'Highlight'
+});
diff --git a/plugins/syntaxhl/langs/zh.js b/plugins/syntaxhl/langs/zh.js
new file mode 100755
index 0000000..02af365
--- /dev/null
+++ b/plugins/syntaxhl/langs/zh.js
@@ -0,0 +1,3 @@
+tinyMCE.addI18n('zh.syntaxhl',{
+ desc : '用Syntaxhighlighter插入代码'
+});
diff --git a/plugins/syntaxhl/langs/zh_dlg.js b/plugins/syntaxhl/langs/zh_dlg.js
new file mode 100755
index 0000000..778164f
--- /dev/null
+++ b/plugins/syntaxhl/langs/zh_dlg.js
@@ -0,0 +1,12 @@
+tinyMCE.addI18n('zh.syntaxhl_dlg',{
+ title : '用SyntaxHighlighter插入代码',
+ highlight_options : '高亮选项',
+ paste : '粘贴代码',
+ choose_lang : '选择语言',
+ nogutter : '无装订线',
+ light : '精简模式',
+ collapse : '折叠代码',
+ fontsize : '字体大小',
+ first_line : '起始行的值',
+ highlight : '高亮行'
+});
diff --git a/tinymce/syntaxhl/README b/tinymce/syntaxhl/README
deleted file mode 100644
index 7ccd3d1..0000000
--- a/tinymce/syntaxhl/README
+++ /dev/null
@@ -1,39 +0,0 @@
-
-SyntaxHL is a plugin for the Tinymce (http://tinymce.moxiecode.com/) javascript WYSIWYG editor
-allowing you to insert highlighted code into the editor.
-The syntax highlighting is done using Syntax Highligher
-(http://code.google.com/p/syntaxhighlighter/)
-and the plugin simply produces the right syntax for this.
-
-================================================================================
-License
-
-Copyright (c) 2008 Richard Grundy.
-
-TinyMCE is released under the LGPL and therefore so is this plugin.
-
-http://www.opensource.org/licenses/lgpl-license.php
-
-Please feel free to modify the project and send pull requests with improvements, changes are welcome!
-
-If you have any problems at all contact me and I'll do the best I can to help.
-
-http://27smiles.com
-
-================================================================================
-
-Plugin modified in 2009 by Clifford Meece
-http://www.cliffordmeece.com
-
-Changes:
-
--Code was added to switch between the form to the {} form
-of syntaxhighlighter, otherwise, the HTML that is generated has illegal class names
-that conflict with some content filters.
-
--Code was added to dialog.htm to dynamically discover the tinyMCE popup javascript library using drupal
-helper properties
-
--Code was added to dialog.htm to dynamically determine the proper language choices based on the Drupal
-syntaxhighlighter module settings.
-
diff --git a/tinymce/syntaxhl/dialog.php b/tinymce/syntaxhl/dialog.php
deleted file mode 100755
index 3ec7307..0000000
--- a/tinymce/syntaxhl/dialog.php
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
- {#syntaxhl_dlg.title}
-
-
-";
-?>
-
-
-
-
-
-
-
diff --git a/tinymce/syntaxhl/editor_plugin.js b/tinymce/syntaxhl/editor_plugin.js
deleted file mode 100644
index 9e9b9fc..0000000
--- a/tinymce/syntaxhl/editor_plugin.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(){tinymce.PluginManager.requireLangPack("syntaxhl");tinymce.create("tinymce.plugins.SyntaxHL",{init:function(a,b){var c=this;c.editor=a;c.url=b;function d(e){return/^(wysiwyg-syntaxhl)/.test(e.className)}a.addCommand("mceSyntaxHL",function(){a.windowManager.open({file:b+"/dialog.php?path="+escape(tinyMCE.baseURL)+"&random="+Math.random(),width:450+parseInt(a.getLang("syntaxhl.delta_width",0)),height:400+parseInt(a.getLang("syntaxhl.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("syntaxhl",{title:"syntaxhl.desc",cmd:"mceSyntaxHL",image:b+"/img/highlight.gif"});a.onNodeChange.add(function(f,e,h){var g=f.dom.getAttrib(h,"class");e.setActive("syntaxhl",h.nodeName=="PRE"&&g.match(/wysiwyg-syntaxhl/))});a.onInit.add(function(){if(a&&a.plugins.contextmenu){a.plugins.contextmenu.onContextMenu.add(function(h,f,i){var g=a.dom.getAttrib(i,"class");if(i.nodeName=="PRE"&&g.match(/wysiwyg-syntaxhl/)){f.add({title:"Edit Code",icon:"",cmd:"mceSyntax"})}})}});a.onBeforeSetContent.add(function(f,g){var e;if(tinymce.isIE){e="\r\n"}else{e="\n"}g.content=g.content.replace(/()?(
)?{syntaxhighlighter ([^}]*)}/g,'
');g.content=g.content.replace(/{\/syntaxhighlighter}(<\/p>)?(<\/P>)?/g,"")});a.onPostProcess.add(function(l,g){if(g.save){if(!tinymce.isIE){var j=l.dom.select("pre.wysiwyg-syntaxhl");for(var k=0;k element is selected
- ed.onNodeChange.add(function(ed, cm, n) {
- var style = ed.dom.getAttrib(n, 'class');
- cm.setActive('syntaxhl', n.nodeName == 'PRE' && style.match(/wysiwyg-syntaxhl/));
- });
-
- // Fixme not all pre tags or even any pre tags
- ed.onInit.add(function() {
- if (ed && ed.plugins.contextmenu) {
- ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {
- var style = ed.dom.getAttrib(e, 'class');
- if (e.nodeName == 'PRE' && style.match(/wysiwyg-syntaxhl/)) {
- m.add({
- title: 'Edit Code',
- icon: '',
- cmd: 'mceSyntax'
- });
- }
- });
- }
- });
-
- // convert any {}-macro tags to pre's
- //ed.onBeforeSetContent.add(t._macroToPre, t);
- ed.onBeforeSetContent.add(
- function(ed, o) {
- //console.log('before set');
-
- var nlChar;
- if (tinymce.isIE)
- nlChar = '\r\n';
- else
- nlChar = '\n';
-
- o.content = o.content.replace(/()?(
)?{syntaxhighlighter ([^}]*)}/g, '
');
- o.content = o.content.replace(/{\/syntaxhighlighter}(<\/p>)?(<\/P>)?/g, '');
- }
- );
-
- ed.onPostProcess.add(
- function(ed, o) {
- //console.log('doing postprocess');
- if (o.save) {
- if (!tinymce.isIE) {
- // IE is collapsing newlines somewhere, so I only to the pre-to-macro
- // conversion for non-ie browsers
-
- // This basic regex works, but it would match every non syntaxhl element
- //o.content = o.content.replace(//g,'{syntaxhighlighter $1}' );
- //o.content = o.content.replace(/<\/pre>/g,'{/syntaxhighlighter}' );
- // better to use dom utilities...
- var syntaxElements = ed.dom.select('pre.wysiwyg-syntaxhl');
- //console.log(syntaxElements);
-
- for (var i = 0; i < syntaxElements.length; i++) {
- //console.log('in loop');
- //console.log('element:' + syntaxElements[i]);
- //console.log(syntaxElements[i].toString());
- //console.log(syntaxElements[i]);
- //console.log(ed.dom.getOuterHTML(syntaxElements[i]));
- //console.log('element text: '+ t._getText(syntaxElements[i]));
- var style = ed.dom.getAttrib(syntaxElements[i], 'class');
-
- matchString = ed.dom.getOuterHTML(syntaxElements[i]);
- if (tinymce.isIE) {
- //console.log('is ie');
- matchString = matchString.replace(/^$/, 'pre>' );
- }
- //console.log('matchString: '+ matchString);
- var start = o.content.indexOf(matchString);
- //var start = o.content.indexOf(t._getText(syntaxElements[i]));
- //console.log('match starts on: ' + start);
-
- var length = ed.dom.getOuterHTML(syntaxElements[i]).length;
- //var length = t._getText(syntaxElements[i]).length;
- //console.log('length of match is: ' + length );
-
- style = style.replace(/(wysiwyg-syntaxhl\s*)/g, '');
-
- // always use the _getText function, because innerHTML causes ie to remove whitespace
- var macroString = '{syntaxhighlighter ' + style + '}' + ed.dom.encode(t._getText(syntaxElements[i])) + '{/syntaxhighlighter}';
- //console.log("macro:" + macroString);
-
- var startString = o.content.substr(0, start);
- var endString = o.content.substr(start+length);
-
- if (start != -1) {
- o.content = startString + macroString + endString;
- }
-
- // The below should be all I need, but it doesn't work, which is why I jump through all the hoops above.
- // I suspect it is because at this point in the program flow, using the domutils form the tinyMCE
- // library no longer update o.content, so whatever I need to do, I need to do directly to
- // o.content
- //ed.dom.setOuterHTML(syntaxElements[i], macroString);
- }
- }
- }
- }
- );
-
- //ed.onSaveContent.add(function(ed, o) {
- // window.alert('on savecontent');
- //});
- },
-
- /**
- * Creates control instances based in the incomming name. This method is normally not
- * needed since the addButton method of the tinymce.Editor class is a more easy way of adding buttons
- * but you sometimes need to create more complex controls like listboxes, split buttons etc then this
- * method can be used to create those.
- *
- * @param {String} n Name of the control to create.
- * @param {tinymce.ControlManager} cm Control manager to use inorder to create new control.
- * @return {tinymce.ui.Control} New control instance or null if no control was created.
- */
- createControl: function(n, cm) {
- return null;
- },
-
- /**
- * Returns information about the plugin as a name/value array.
- * The current keys are longname, author, authorurl, infourl and version.
- *
- * @return {Object} Name/value array containing information about the plugin.
- */
- getInfo: function() {
- return {
- longname: 'Syntax Highlighter',
- author: 'Clifford Meece',
- authorurl: 'http://cliffordmeece.com',
- infourl: 'http://drupal.org/project/wysiwyg_syntaxhl',
- version: "1.0"
- };
- },
-
- _getText: function(obj) {
- // return the data of obj if its a text node
- if (obj.nodeType == 3) return obj.nodeValue;
- var txt = new Array(),
- i = 0;
- // loop over the children of obj and recursively pass them back to this function
- while (obj.childNodes[i]) {
- txt[txt.length] = this._getText(obj.childNodes[i]);
- i++;
- }
- // return the array as a string
- return txt.join("");
- }
- });
-
- // Register plugin
- tinymce.PluginManager.add('syntaxhl', tinymce.plugins.SyntaxHL);
-})();
\ No newline at end of file
diff --git a/tinymce/syntaxhl/img/highlight.gif b/tinymce/syntaxhl/img/highlight.gif
deleted file mode 100755
index 9e5ce04..0000000
Binary files a/tinymce/syntaxhl/img/highlight.gif and /dev/null differ
diff --git a/tinymce/syntaxhl/js/dialog.js b/tinymce/syntaxhl/js/dialog.js
deleted file mode 100755
index 7480b54..0000000
--- a/tinymce/syntaxhl/js/dialog.js
+++ /dev/null
@@ -1,162 +0,0 @@
-tinyMCEPopup.requireLangPack();
-var SyntaxHLDialog = {
-
-
- init : function() {
-
- var f = document.forms[0], textarea_output, options = '';
- ed = tinyMCEPopup.editor;
- n = ed.selection.getNode();
- var languages;
- if (ed && ed.plugins.inlinepopups) {
- languages = parent.Drupal.settings.wysiwyg_syntaxhl.languages;
- } else {
- languages = window.opener.Drupal.settings.wysiwyg_syntaxhl.languages;
- }
-
- for (i=0; i < languages.length;++i){
- var optn = document.createElement("OPTION");
- optn.text = languages[i]['text'];
- optn.value = languages[i]['value'];
- document.syntaxhl.syntaxhl_language.options.add(optn);
- }
-
- if (n.nodeName == 'PRE') {
- // remove placeholder class name and split remaining portion by ';'
- var style = ed.dom.getAttrib(n, 'class');
- style = style.replace(/wysiwyg-syntaxhl\s*/g,'')
- var a = style.split(';');
- for (var i = 0; i < a.length; i++) {
- // Remove unnecessary whitespace
- a[i] = a[i].replace(/\s+/g, '');
- if (a[i] != '') {
- // split name and value pairs
- var b = a[i].split(':');
- switch (b[0]) {
- case "brush":
- // loop through select box looking for proper place to put selected index
- for (var j=0; j < f.syntaxhl_language.options.length; j++) {
- if (f.syntaxhl_language.options[j].value == b[1]) {
- f.syntaxhl_language.selectedIndex = j;
- }
- }
- break;
- case "first-line":
- f.syntaxhl_firstline.value = b[1];
- break;
- case "fontsize":
- f.syntaxhl_fontsize.value = b[1];
- break;
- case "gutter":
- if (b[1] == 'true' ) {
- f.syntaxhl_nogutter.checked = false;
- } else if (b[1] == 'false' ) {
- f.syntaxhl_nogutter.checked = true;
- } else {f.syntaxhl_nogutter.checked = false;}
- break;
- case "light":
- if (b[1] == 'true' ) {
- f.syntaxhl_light.checked = true;
- } else if (b[1] == 'false' ) {
- f.syntaxhl_light.checked = false;
- } else {f.syntaxhl_light.checked = false;}
- break;
- case "collapse":
- if (b[1] == 'true' ) {
- f.syntaxhl_collapse.checked = true;
- } else if (b[1] == 'false' ) {
- f.syntaxhl_collapse.checked = false;
- } else {f.syntaxhl_collapse.checked = false;}
- break;
- case "highlight":
- f.syntaxhl_highlight.value = b[1];
- break;
- }
- }
- }
-
- // this is a total hack, but by running getContent, we force the
- // preelementfix plugin to do it's cleanup routine
- // which fixes any
or tabs that may be in our pre elements.
- // The preelementfix plugin should probably do this work on the
- // selection.getContent event as well, which would take care of it for us,
- // but it doesn't so we have to grab the whole content, which incidentally, will
- // clean all the pre's on the page, not just the one we are selecting
- // the other option is we implement the
conversion ourselves, but
- // I had a hell of time figuring out how to do that on just a selection
- ed.getContent();
- // FIXME, this may cause ie to modify the content when setting textarea value
- // and screwing up whitespace
- f.syntaxhl_code.value = ed.dom.decode(this._getText(n));
-
-
- }// end if (fe.nodeName == 'PRE')
-
- },
-
- insert : function() {
- var n, f = document.forms[0], textarea_output, options = '';
-
- tinyMCEPopup.restoreSelection();
- n = ed.selection.getNode();
-
- if(f.syntaxhl_nogutter.checked) {
- options += 'gutter: false; ';
- }
- if(f.syntaxhl_light.checked) {
- options += 'light: true; ';
- }
- if(f.syntaxhl_collapse.checked) {
- 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 += 'first-line: ' + linenumber + '; ';
- }
- if(f.syntaxhl_highlight.value != '') {
- options += 'highlight: [' + f.syntaxhl_highlight.value + ']; ';
- }
-
- if (n != null && n.nodeName == 'PRE') {
- style = 'wysiwyg-syntaxhl brush: ' + f.syntaxhl_language.value + ';' + options;
- ed.dom.setOuterHTML(n,'' + ed.dom.encode(f.syntaxhl_code.value)+'
');
- ed.dom.setAttrib(n,'class',style);
- } else {
- //If no code just return.
- if(f.syntaxhl_code.value == '') {
- tinyMCEPopup.close();
- return false;
- } else {
- textarea_output = '';
- textarea_output += tinyMCEPopup.editor.dom.encode(f.syntaxhl_code.value);
- textarea_output += '
';
- tinyMCEPopup.editor.execCommand('mceInsertContent', false, textarea_output);
- }
- }
-
- tinyMCEPopup.close();
-
- },
-
- _getText : function(obj) {
- // return the data of obj if its a text node
- if (obj.nodeType == 3) return obj.nodeValue;
- var txt = new Array(),i=0;
- // loop over the children of obj and recursively pass them back to this function
- while(obj.childNodes[i]) {
- txt[txt.length] = this._getText(obj.childNodes[i]);
- i++;
- }
- // return the array as a string
- return txt.join("");
- }
-
-
-};
-
-tinyMCEPopup.onInit.add(SyntaxHLDialog.init, SyntaxHLDialog);
diff --git a/tinymce/syntaxhl/langs/en.js b/tinymce/syntaxhl/langs/en.js
deleted file mode 100755
index 785f41e..0000000
--- a/tinymce/syntaxhl/langs/en.js
+++ /dev/null
@@ -1,3 +0,0 @@
-tinyMCE.addI18n('en.syntaxhl',{
- desc : 'Insert code using Syntaxhighlighter'
-});
diff --git a/tinymce/syntaxhl/langs/en_dlg.js b/tinymce/syntaxhl/langs/en_dlg.js
deleted file mode 100755
index e3079b4..0000000
--- a/tinymce/syntaxhl/langs/en_dlg.js
+++ /dev/null
@@ -1,12 +0,0 @@
-tinyMCE.addI18n('en.syntaxhl_dlg',{
- title : 'Insert code using SyntaxHighlighter',
- highlight_options : 'Highlighter Options',
- paste : 'Paste Code',
- choose_lang : 'Choose Language',
- nogutter : 'No Gutter',
- light : 'Light',
- collapse : 'Collapse',
- fontsize : 'Font size',
- first_line : 'First line',
- highlight : 'Highlight'
-});
diff --git a/tinymce/syntaxhl/langs/zh.js b/tinymce/syntaxhl/langs/zh.js
deleted file mode 100755
index 02af365..0000000
--- a/tinymce/syntaxhl/langs/zh.js
+++ /dev/null
@@ -1,3 +0,0 @@
-tinyMCE.addI18n('zh.syntaxhl',{
- desc : '用Syntaxhighlighter插入代码'
-});
diff --git a/tinymce/syntaxhl/langs/zh_dlg.js b/tinymce/syntaxhl/langs/zh_dlg.js
deleted file mode 100755
index 778164f..0000000
--- a/tinymce/syntaxhl/langs/zh_dlg.js
+++ /dev/null
@@ -1,12 +0,0 @@
-tinyMCE.addI18n('zh.syntaxhl_dlg',{
- title : '用SyntaxHighlighter插入代码',
- highlight_options : '高亮选项',
- paste : '粘贴代码',
- choose_lang : '选择语言',
- nogutter : '无装订线',
- light : '精简模式',
- collapse : '折叠代码',
- fontsize : '字体大小',
- first_line : '起始行的值',
- highlight : '高亮行'
-});
diff --git a/wysiwyg_syntaxhl.info b/wysiwyg_syntaxhl.info
index 7720886..3d818f0 100644
--- a/wysiwyg_syntaxhl.info
+++ b/wysiwyg_syntaxhl.info
@@ -1,7 +1,6 @@
name = "Wysiwyg SyntaxHighlighter Plugin"
description = "Wysiwyg editor plugin that integrates syntax highlighting into a normal <pre> element"
dependencies[] = wysiwyg
-;dependencies[] = wysiwyg_preelementfix
dependencies[] = syntaxhighlighter
package = "User interface"
-core = 6.x
+core = 7.x
\ No newline at end of file
diff --git a/wysiwyg_syntaxhl.module b/wysiwyg_syntaxhl.module
index 40bc7c9..966671d 100644
--- a/wysiwyg_syntaxhl.module
+++ b/wysiwyg_syntaxhl.module
@@ -19,34 +19,81 @@ function wysiwyg_syntaxhl_help($path, $arg) {
* Implementation of hook_wysiwyg_plugin().
*/
function wysiwyg_syntaxhl_wysiwyg_plugin($editor) {
- // The folowing variable is needed to make sure drupal_add_js isn't called twice
- // taken from the example in imce.module
- static $integrated;
+
+
switch ($editor) {
- case 'tinymce':
- if (!isset($integrated)) {
- $integrated = TRUE;
- $languages=array();
- foreach ( variable_get('syntaxhighlighter_enabled_languages', array('shBrushPhp.js')) as $ind=>$val) {
- if ($val) {
- $languages[]=array('value' => strtolower(substr(substr($ind, 7),0,-3)),
- 'text' => substr(substr($val, 7),0,-3)
- );
+ case 'tinymce':
+
+
+ $path = drupal_get_path('module', 'wysiwyg_syntaxhl') . '/plugins/syntaxhl';
+ if (file_exists("$path/editor_plugin.js")) {
+
+ static $js_added = FALSE;
+
+ if (!$js_added) {
+ $js_added = TRUE;
+
+ $libs = variable_get('syntaxhighlighter_enabled_languages', array('shBrushPhp.js'));
+ $libs = array_filter($libs);
+
+ foreach ($libs as $lib) {
+ $str = str_replace('shBrush', '', $lib);
+ $str = str_replace('.js', '', $str);
+
+ $langs[] = array(
+ 'value' => drupal_strtolower($str),
+ 'text' => $str,
+ );
}
+
+ if ($langs) {
+ $settings = array(
+ 'wysiwyg_syntaxhl' => array(
+ 'languages' => $langs,
+ ),
+ );
+
+ drupal_add_js($settings, 'setting');
+ }
+
}
- $settings = array(
- 'wysiwyg_syntaxhl' => array('languages' => $languages)
+
+ return array(
+ 'syntaxhl' => array(
+ 'path' => $path,
+ 'filename' => 'editor_plugin.js',
+ 'buttons' => array('syntaxhl' => t('SyntaxHighlighter')),
+ 'url' => 'http://drupal.org/project/wysiwyg_syntaxhl',
+ 'internal' => FALSE,
+ 'load' => TRUE,
+ ),
);
- drupal_add_js($settings, 'setting');
- }
- $path = drupal_get_path('module', 'wysiwyg_syntaxhl') . '/tinymce/syntaxhl/editor_plugin.js';
- return array(
- 'syntaxhl' => array(
- 'path' => $path,
- 'buttons' => array('syntaxhl' => t('SyntaxHighlighter')),
- 'url' => 'http://drupal.org/project/wysiwyg_syntaxhl',
- 'load' => TRUE,
- ),
- );
+ }
+
+
}
}
+
+function wysiwyg_syntaxhl_wysiwyg_include_directory($type) {
+
+ switch ($type) {
+ case 'plugins':
+ return $type;
+ }
+}
+
+
+function wysiwyg_syntaxhl_wysiwyg_editor_settings_alter(&$settings, $context) {
+
+
+ // Each editor has its own collection of native settings that may be extended
+ // or overridden. Please consult the respective official vendor documentation
+ // for details.
+ if ($context['profile']->editor == 'tinymce') {
+ // Supported values to JSON data types.
+ // $settings['cleanup_on_startup'] = TRUE;
+ }
+}
+
+
+