* Make Live Preview an user preference, still controllable by the global variable

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a276998..c9c977c 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -650,6 +650,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * (bug 4974) Don't follow redirected talk page on "new messages" link
 * (bug 4970) Make category paging limits configurable
 * (bug 4535) Warn user when editing CSS or JS subpage of a skin that doesn't exist
+* Make Live Preview an user preference, still controllable by the global variable
 
 === Caveats ===
 

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 47f5311..46d9e8d 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -930,7 +930,7 @@ class EditPage {
                $buttons['diff'] = wfElement('input', $temp, '');
 
                global $wgLivePreview;
-               if ( $wgLivePreview ) {
+               if ( $wgLivePreview && $wgUser->getOption( 'uselivepreview' ) ) {
                        $temp = array(
                                'id'        => 'wpPreview',
                                'name'      => 'wpPreview',

diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index 5d229e7..872d16c 100644 (file)
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -813,7 +813,8 @@ class PreferencesForm {
                                'watchdefault',
                                'minordefault',
                                'externaleditor',
-                               'externaldiff' )
+                               'externaldiff',
+                               'uselivepreview', )
                        ) . '</fieldset>'
                );
 

diff --git a/languages/Language.php b/languages/Language.php
index 1df20e6..96753f0 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -83,6 +83,7 @@ if(isset($wgExtraNamespaces)) {
        'externaldiff'          => 0,
        'showjumplinks'         => 1,
        'numberheadings'        => 0,
+       'uselivepreview'        => 0,
 );
 
 /* private */ $wgQuickbarSettingsEn = array(
@@ -156,6 +157,7 @@ $wgDateFormatsEn = array(
        'externaleditor',
        'externaldiff',
        'showjumplinks',
+       'uselivepreview',
 );
 
 /* private */ $wgBookstoreListEn = array(

diff --git a/languages/Messages.php b/languages/Messages.php
index ca7d097..a20cf33 100644 (file)
--- a/languages/Messages.php
+++ b/languages/Messages.php
@@ -59,6 +59,7 @@ parent class in order maintain consistency across languages.
 'tog-externaleditor' => 'Use external editor by default',
 'tog-externaldiff' => 'Use external diff by default',
 'tog-showjumplinks' => 'Enable "jump to" accessibility links',
+'tog-uselivepreview' => 'Use live preview (JavaScript) (Experimental)',
 
 'underline-always' => 'Always',
 'underline-never' => 'Never',