https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114948

Revision: 114948
Author:   catrope
Date:     2012-04-17 22:42:20 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
1.19wmf1: MFG https://gerrit.wikimedia.org/r/5209

Modified Paths:
--------------
    branches/wmf/1.19wmf1/extensions/WikiEditor/WikiEditor.hooks.php
    
branches/wmf/1.19wmf1/extensions/WikiEditor/modules/ext.wikiEditor.toolbar.js

Modified: branches/wmf/1.19wmf1/extensions/WikiEditor/WikiEditor.hooks.php
===================================================================
--- branches/wmf/1.19wmf1/extensions/WikiEditor/WikiEditor.hooks.php    
2012-04-17 21:26:46 UTC (rev 114947)
+++ branches/wmf/1.19wmf1/extensions/WikiEditor/WikiEditor.hooks.php    
2012-04-17 22:42:20 UTC (rev 114948)
@@ -226,7 +226,13 @@
         */
        public static function EditPageBeforeEditToolbar( &$toolbar ) {
                if ( self::isEnabled( 'toolbar' ) ) {
-                       $toolbar = '';
+                       $toolbar = Html::rawElement(
+                               'div', array(
+                                       'class' => 'wikiEditor-oldToolbar',
+                                       'style' => 'display:none;'
+                               ),
+                               $toolbar
+                       );
                }
                return true;
        }

Modified: 
branches/wmf/1.19wmf1/extensions/WikiEditor/modules/ext.wikiEditor.toolbar.js
===================================================================
--- 
branches/wmf/1.19wmf1/extensions/WikiEditor/modules/ext.wikiEditor.toolbar.js   
    2012-04-17 21:26:46 UTC (rev 114947)
+++ 
branches/wmf/1.19wmf1/extensions/WikiEditor/modules/ext.wikiEditor.toolbar.js   
    2012-04-17 22:42:20 UTC (rev 114948)
@@ -4,11 +4,14 @@
 
 $( document ).ready( function() {
        if ( !$.wikiEditor.isSupported( $.wikiEditor.modules.toolbar ) ) {
+               $( '.wikiEditor-oldToolbar' ).show();
                return;
        }
        // The old toolbar is still in place and needs to be removed so there 
aren't two toolbars
        $( '#toolbar' ).remove();
        // Add toolbar module
        // TODO: Implement .wikiEditor( 'remove' )
-       $( '#wpTextbox1' ).wikiEditor( 'addModule', 
$.wikiEditor.modules.toolbar.config.getDefaultConfig() );
+       $( '#wpTextbox1' ).wikiEditor(
+               'addModule', 
$.wikiEditor.modules.toolbar.config.getDefaultConfig()
+       );
 } );


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to