diff options
| author | Friendika <info@friendika.com> | 2011-10-21 12:58:52 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-10-21 12:58:52 -0700 |
| commit | 3783d8860c2ceabc846ef915ce8ae5e4784107b2 (patch) | |
| tree | fe4e80784ea8fbb3d0dea7ab8849a75b2bcb480a /library/tinymce | |
| parent | 1a784166312453575cf30d3ad7ec058febae2adf (diff) | |
| parent | a06c9768be418dc473f492c043ab6dfd1ae46f47 (diff) | |
| download | volse-hubzilla-3783d8860c2ceabc846ef915ce8ae5e4784107b2.tar.gz volse-hubzilla-3783d8860c2ceabc846ef915ce8ae5e4784107b2.tar.bz2 volse-hubzilla-3783d8860c2ceabc846ef915ce8ae5e4784107b2.zip | |
Merge branch 'pull'
Diffstat (limited to 'library/tinymce')
| -rw-r--r-- | library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js index 789e75c39..9e680e104 100644 --- a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js +++ b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js @@ -53,19 +53,24 @@ /* oembed */ function _h2b_cb(match) { - text = bin2hex(match); function s_h2b(data) { match = data; - } - $.ajax({ - url: 'oembed/h2b?text=' + text, + }
+ $.ajax({
+ type:"POST", + url: 'oembed/h2b',
+ data: {text: match}, async: false, success: s_h2b, dataType: 'html' }); return match; } - s = s.replace(/<span class=\"oembed(.*?)<\/span>/gi, _h2b_cb); + if (s.indexOf('class="oembed')>=0){
+ //alert("request oembed html2bbcode");
+ s = _h2b_cb(s);
+ }
+ /* /oembed */ @@ -154,4 +159,4 @@ // Register plugin
tinymce.PluginManager.add('bbcode', tinymce.plugins.BBCodePlugin);
-})();
\ No newline at end of file +})();
|