http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94218

Revision: 94218
Author:   neilk
Date:     2011-08-11 01:45:27 +0000 (Thu, 11 Aug 2011)
Log Message:
-----------
Making a branch of the extensions directory for realtime experiments (chat, 
etherpad).
We will be hacking in new experimental extensions and modifying WikiEditor

Modified Paths:
--------------
    branches/extensions-realtime/WikiEditor/WikiEditor.hooks.php
    branches/extensions-realtime/WikiEditor/WikiEditor.php

Added Paths:
-----------
    branches/extensions-realtime/

Modified: branches/extensions-realtime/WikiEditor/WikiEditor.hooks.php
===================================================================
--- trunk/extensions/WikiEditor/WikiEditor.hooks.php    2011-08-10 18:59:35 UTC 
(rev 94186)
+++ branches/extensions-realtime/WikiEditor/WikiEditor.hooks.php        
2011-08-11 01:45:27 UTC (rev 94218)
@@ -144,7 +144,7 @@
                'toc' => array(
                        'preferences' => array(
                                // Ideally this key would be 'wikieditor-toc'
-                               'usenavigabletoc' => array(
+                               'usenavigabletoc' => array(
                                        'type' => 'toggle',
                                        'label-message' => 
'wikieditor-toc-preference',
                                        'section' => 'editing/labs',
@@ -157,6 +157,13 @@
                                'ext.wikiEditor.toc',
                        ),
                ),
+
+               /* experimental "remote" editor (such as Etherpad) */
+               'remote' => array(
+                       'preferences' => array(),
+                       'requirements' => array(),
+                       'modules' => 'ext.wikiEditor.remote'
+               )
        );
        
        /* Static Methods */

Modified: branches/extensions-realtime/WikiEditor/WikiEditor.php
===================================================================
--- trunk/extensions/WikiEditor/WikiEditor.php  2011-08-10 18:59:35 UTC (rev 
94186)
+++ branches/extensions-realtime/WikiEditor/WikiEditor.php      2011-08-11 
01:45:27 UTC (rev 94218)
@@ -44,6 +44,9 @@
        // Bare-bones (probably broken) template collapsing
        'templates' => array( 'global' => false, 'user' => false ),
 
+       // remote editor (may be incompatible with the above)
+       'remote' => array( 'global' => false, 'user' => 'true' ),
+
 );
 
 /* Setup */
@@ -508,4 +511,12 @@
                        'ext.wikiEditor.toolbar',
                )
        ),
+       'ext.wikiEditor.remote' => $wikiEditorTpl + array(
+               'scripts' => '',
+               'dependencies' => array(
+                       'ext.wikiEditor',
+                       'ext.wikiEditor.toolbar',
+                       // JSON?
+               )
+       ),
 );


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

Reply via email to