http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88553
Revision: 88553
Author: krinkle
Date: 2011-05-21 22:52:32 +0000 (Sat, 21 May 2011)
Log Message:
-----------
Adding user.tokens module and loading by default.
(ResourceLoaderUserTokensModule Class)
Modified Paths:
--------------
trunk/phase3/includes/AutoLoader.php
trunk/phase3/includes/OutputPage.php
trunk/phase3/resources/Resources.php
trunk/phase3/resources/mediawiki/mediawiki.user.js
Added Paths:
-----------
trunk/phase3/includes/resourceloader/ResourceLoaderUserTokensModule.php
Modified: trunk/phase3/includes/AutoLoader.php
===================================================================
--- trunk/phase3/includes/AutoLoader.php 2011-05-21 22:47:58 UTC (rev
88552)
+++ trunk/phase3/includes/AutoLoader.php 2011-05-21 22:52:32 UTC (rev
88553)
@@ -620,6 +620,7 @@
'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
Modified: trunk/phase3/includes/OutputPage.php
===================================================================
--- trunk/phase3/includes/OutputPage.php 2011-05-21 22:47:58 UTC (rev
88552)
+++ trunk/phase3/includes/OutputPage.php 2011-05-21 22:52:32 UTC (rev
88553)
@@ -2615,7 +2615,7 @@
// Legacy Scripts
$scripts .= "\n" . $this->mScripts;
- $userScripts = array( 'user.options' );
+ $userScripts = array( 'user.options', 'user.tokens' );
// Add site JS if enabled
if ( $wgUseSiteJs ) {
Added: trunk/phase3/includes/resourceloader/ResourceLoaderUserTokensModule.php
===================================================================
--- trunk/phase3/includes/resourceloader/ResourceLoaderUserTokensModule.php
(rev 0)
+++ trunk/phase3/includes/resourceloader/ResourceLoaderUserTokensModule.php
2011-05-21 22:52:32 UTC (rev 88553)
@@ -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';
+ }
+}
Property changes on:
trunk/phase3/includes/resourceloader/ResourceLoaderUserTokensModule.php
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/phase3/resources/Resources.php
===================================================================
--- trunk/phase3/resources/Resources.php 2011-05-21 22:47:58 UTC (rev
88552)
+++ trunk/phase3/resources/Resources.php 2011-05-21 22:52:32 UTC (rev
88553)
@@ -8,8 +8,9 @@
'noscript' => array( 'class' => 'ResourceLoaderNoscriptModule' ),
'startup' => array( 'class' => 'ResourceLoaderStartUpModule' ),
'user' => array( 'class' => 'ResourceLoaderUserModule' ),
+ 'user.groups' => array( 'class' => 'ResourceLoaderUserGroupsModule' ),
'user.options' => array( 'class' => 'ResourceLoaderUserOptionsModule' ),
- 'user.groups' => array( 'class' => 'ResourceLoaderUserGroupsModule' ),
+ 'user.tokens' => array( 'class' => 'ResourceLoaderUserTokensModule' ),
/* Skins */
Modified: trunk/phase3/resources/mediawiki/mediawiki.user.js
===================================================================
--- trunk/phase3/resources/mediawiki/mediawiki.user.js 2011-05-21 22:47:58 UTC
(rev 88552)
+++ trunk/phase3/resources/mediawiki/mediawiki.user.js 2011-05-21 22:52:32 UTC
(rev 88553)
@@ -17,6 +17,8 @@
this.options = new mw.Map();
+ this.tokens = new mw.Map();
+
/* Public Methods */
/**
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
