Changeset 3973

Timestamp:

05/24/09 08:35:12 (3 years ago)

Author:

CrawfordCurrie

Message:

Item1205: add support for global NOWYSIWYG flag, and update change history to include Michael's recent fixes

Location:

trunk/TinyMCEPlugin

Files:

• data/System/TinyMCEPlugin.txt (modified) (2 diffs, 1 prop)
• lib/Foswiki/Plugins/TinyMCEPlugin.pm (modified) (1 diff)

trunk/TinyMCEPlugin/data/System/TinyMCEPlugin.txt

@@ -107 +107 @@
 <verbatim>   * Set TINYMCEPLUGIN_DISABLE = 1
 </verbatim>
+The plugin also respects the global =NOWYSIWYG= setting, which affects all
+WYSIWYG editors.
 
 Some browsers don't support Tiny MCE. You can prevent the editor from
@@ -131 +133 @@
 |  Plugin Version: | %$VERSION% |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
+|  24 May 2009 | Foswikitask:Item1205: add support for global NOWYSIWYG flag Foswikitask:Item1341: keep TML lettered & roman numeral lists (Michael Tempest) Foswikitask:Item1534: fix typewriter text (Michael Tempest) |
 |  10 Apr 2009 | Foswikitask:Item1394: fixed colour handling Foswikitask:Item8108: added safari,inlinepopups,fullscreen plugins, fixed some minor bugs on IE |
 |  3 Apr 2009 | Foswikitask:Item1383: Optimised the preferences Foswikitask:Item8094: fixed the pickaxe |

trunk/TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin.pm

@@ -120 +120 @@
 
 sub _notAvailable {
-    return
-      "Disabled by preference '"
-      . Foswiki::Func::getPreferencesValue('TINYMCEPLUGIN_DISABLE') . "'"
-      if Foswiki::Func::getPreferencesFlag('TINYMCEPLUGIN_DISABLE');
+    for my $c qw(TINYMCEPLUGIN_DISABLE NOWYSIWYG) {
+        return
+          "Disabled by * Set $c = " . Foswiki::Func::getPreferencesValue($c)
+            if Foswiki::Func::getPreferencesFlag($c);
+    }
 
     # Disable TinyMCE if we are on a specialised edit skin