Adding user.tokens module and loading by default. (ResourceLoaderUserTokensModule...

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 64b2e02..a26fb8f 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -620,6 +620,7 @@ $wgAutoloadLocalClasses = array(
        'ResourceLoaderUserGroupsModule' => 'includes/resourceloader/ResourceLoaderUserGroupsModule.php',
        'ResourceLoaderUserModule' => 'includes/resourceloader/ResourceLoaderUserModule.php',
        'ResourceLoaderUserOptionsModule' => 'includes/resourceloader/ResourceLoaderUserOptionsModule.php',
+       'ResourceLoaderUserTokensModule' => 'includes/resourceloader/ResourceLoaderUserTokensModule.php',
        'ResourceLoaderWikiModule' => 'includes/resourceloader/ResourceLoaderWikiModule.php',
 
        # includes/revisiondelete

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 3f4cc9a..64c4947 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2615,7 +2615,7 @@ class OutputPage {
                // Legacy Scripts
                $scripts .= "\n" . $this->mScripts;
 
-               $userScripts = array( 'user.options' );
+               $userScripts = array( 'user.options', 'user.tokens' );
 
                // Add site JS if enabled
                if ( $wgUseSiteJs ) {

diff --git a/includes/resourceloader/ResourceLoaderUserTokensModule.php b/includes/resourceloader/ResourceLoaderUserTokensModule.php
new file mode 100644 (file)
index 0000000..7122cdd
--- /dev/null
+++ b/includes/resourceloader/ResourceLoaderUserTokensModule.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @author Krinkle
+ */
+
+/**
+ * Module for user tokens
+ */
+class ResourceLoaderUserTokensModule extends ResourceLoaderModule {
+
+       /* Protected Members */
+
+       protected $origin = self::ORIGIN_CORE_INDIVIDUAL;
+
+       /* Methods */
+
+       /**
+        * Fetch the tokens for the current user.
+        * 
+        * @param $context ResourceLoaderContext: Context object
+        * @return Array: List of tokens keyed by token type
+        */
+       protected function contextUserTokens( ResourceLoaderContext $context ) {
+               global $wgUser;
+
+               return array(
+                       'editToken' => $wgUser->edittoken(),
+               );
+       }
+
+       /**
+        * @param $context ResourceLoaderContext
+        * @return string
+        */
+       public function getScript( ResourceLoaderContext $context ) {
+               return Xml::encodeJsCall( 'mw.user.tokens.set', 
+                       array( $this->contextUserTokens( $context ) ) );
+       }
+
+       /**
+        * @return string
+        */
+       public function getGroup() {
+               return 'private';
+       }
+}

diff --git a/resources/Resources.php b/resources/Resources.php
index 84d918a..d566ee8 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -8,8 +8,9 @@ return array(
        'noscript' => array( 'class' => 'ResourceLoaderNoscriptModule' ),
        'startup' => array( 'class' => 'ResourceLoaderStartUpModule' ),
        'user' => array( 'class' => 'ResourceLoaderUserModule' ),
-       'user.options' => array( 'class' => 'ResourceLoaderUserOptionsModule' ),
        'user.groups' => array( 'class' => 'ResourceLoaderUserGroupsModule' ),
+       'user.options' => array( 'class' => 'ResourceLoaderUserOptionsModule' ),
+       'user.tokens' => array( 'class' => 'ResourceLoaderUserTokensModule' ),
 
        /* Skins */
 

diff --git a/resources/mediawiki/mediawiki.user.js b/resources/mediawiki/mediawiki.user.js
index 8c44aaa..fef9bf5 100644 (file)
--- a/resources/mediawiki/mediawiki.user.js
+++ b/resources/mediawiki/mediawiki.user.js
@@ -17,6 +17,8 @@
 
                this.options = new mw.Map();
 
+               this.tokens = new mw.Map();
+
                /* Public Methods */
 
                /**