Merge branch 'master' of gitorious.org:social/mainline

[quix0rs-gnu-social.git] / plugins / TinyMCE / TinyMCEPlugin.php

diff --git a/plugins/TinyMCE/TinyMCEPlugin.php b/plugins/TinyMCE/TinyMCEPlugin.php
index 49bbdf90db1159b236093299a0f73ae22f71259f..08da1048fc12f282fee1cac7988c904bd13b6836 100644 (file)
--- a/plugins/TinyMCE/TinyMCEPlugin.php
+++ b/plugins/TinyMCE/TinyMCEPlugin.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2010, StatusNet, Inc.
@@ -38,7 +37,7 @@ if (!defined('STATUSNET')) {
  * Use TinyMCE library to allow rich text editing in the browser
  *
  * Converts the notice form in browser to a rich-text editor.
- * 
+ *
  * FIXME: this plugin DOES NOT load its static files from the configured
  * plugin server if one exists. There are cross-server permissions errors
  * if you try to do that (something about window.tinymce).
@@ -80,10 +79,11 @@ class TinyMCEPlugin extends Plugin
     function onPluginVersion(&$versions)
     {
         $versions[] = array('name' => 'TinyMCE',
-            'version' => STATUSNET_VERSION,
+            'version' => GNUSOCIAL_VERSION,
             'author' => 'Evan Prodromou',
             'homepage' => 'http://status.net/wiki/Plugin:TinyMCE',
             'rawdescription' =>
+            // TRANS: Plugin description.
             _m('Use TinyMCE library to allow rich text editing in the browser.'));
         return true;
     }
@@ -104,17 +104,6 @@ class TinyMCEPlugin extends Plugin
         return htmLawed($raw, $config);
     }
 
-    /**
-     * Strip HTML to plaintext string
-     *
-     * @param string $html HTML
-     * @return string plaintext, single line
-     */
-    private function stripHtml($html)
-    {
-        return str_replace("\n", " ", html_entity_decode(strip_tags($html), ENT_QUOTES, 'UTF-8'));
-    }
-
     /**
      * Hook for new-notice form processing to take our HTML goodies;
      * won't affect API posting etc.
@@ -130,7 +119,7 @@ class TinyMCEPlugin extends Plugin
         if ($action->arg('richedit') && $this->isAllowedRichEdit()) {
             $html = $this->sanitizeHtml($content);
             $options['rendered'] = $html;
-            $content = $this->stripHtml($html);
+            $content = common_strip_html($html);
         }
         return true;
     }
@@ -290,9 +279,14 @@ class TinyMCEPlugin extends Plugin
         // our AJAX form submission. Manually moving it to trigger
         // on our send button click.
         $scr = <<<END_OF_SCRIPT
-        $().ready(function() {
-            var noticeForm = $('#form_notice');
-            $('textarea#notice_data-text').tinymce({
+        (function() {
+        var origInit = SN.Init.NoticeFormSetup;
+        SN.Init.NoticeFormSetup = function(form) {
+            origInit(form);
+            var noticeForm = form;
+            var textarea = form.find('.notice_data-text');
+            if (textarea.length == 0) return;
+            textarea.tinymce({
                 script_url : '{$path}',
                 // General options
                 theme : "advanced",
@@ -306,7 +300,7 @@ class TinyMCEPlugin extends Plugin
                 setup: function(ed) {
                     noticeForm.append('<input type="hidden" name="richedit" value="1">');
 
-                    $('#notice_action-submit').click(function() {
+                    form.find('.submit:first').click(function() {
                         tinymce.triggerSave();
                     });
 
@@ -319,14 +313,15 @@ class TinyMCEPlugin extends Plugin
                         SN.U.Counter(noticeForm);
                     });
 
-                    $('#'+SN.C.S.NoticeDataAttach).change(function() {
+                    form.find('input[type=file]').change(function() {
                         var img = '<img src="{$placeholder}" class="placeholder" width="320" height="240">';
                         var html = tinyMCE.activeEditor.getContent();
                         ed.setContent(html + img);
                     });
                 }
             });
-        });
+        };
+        })();
 END_OF_SCRIPT;
 
         return $scr;