wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TinyMCE: only apply HTML parsing if we actually got into JS and poked the editor widget. With JS off, we'll take plaintext as usual.

Browse Source
This commit is contained in:
Brion Vibber 2010-08-11 14:50:59 -07:00
parent 527561cd93
commit 3c28464dab
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/TinyMCE/TinyMCEPlugin.php
View File

@ -117,9 +117,11 @@ class TinyMCEPlugin extends Plugin
*/ */
function onStartSaveNewNoticeWeb($action, $user, &$content, &$options) function onStartSaveNewNoticeWeb($action, $user, &$content, &$options)
{ {
$html = $this->sanitizeHtml($action->arg('status_textarea')); if ($action->arg('richedit')) {
$options['rendered'] = $html; $html = $this->sanitizeHtml($content);
$content = $this->stripHtml($html); $options['rendered'] = $html;
$content = $this->stripHtml($html);
}
return true; return true;
} }
@ -145,8 +147,11 @@ class TinyMCEPlugin extends Plugin
theme_advanced_resizing : true, theme_advanced_resizing : true,
tabfocus_elements: ":prev,:next" tabfocus_elements: ":prev,:next"
}); });
$('#form_notice').append('<input type="hidden" name="richedit" value="1">');
$('#notice_action-submit').click(function() { $('#notice_action-submit').click(function() {
tinymce.triggerSave(); if (typeof tinymce != "undefined") {
tinymce.triggerSave();
}
}); });
}); });
END_OF_SCRIPT; END_OF_SCRIPT;