Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51824
Change subject: Remove generateId (unused) and use mw.Title for full title.
......................................................................
Remove generateId (unused) and use mw.Title for full title.
Change-Id: I23b657279895cad9b342a31900d465295771242e
---
M GettingStarted.php
M resources/ext.gettingstarted.openTask.js
2 files changed, 7 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GettingStarted
refs/changes/24/51824/1
diff --git a/GettingStarted.php b/GettingStarted.php
index 9395036..b91b047 100644
--- a/GettingStarted.php
+++ b/GettingStarted.php
@@ -58,6 +58,7 @@
'dependencies' => array(
'jquery.cookie',
'jquery.json',
+ 'mediawiki.Title',
'mediawiki.user',
'ext.Experiments.lib',
'ext.postEdit',
diff --git a/resources/ext.gettingstarted.openTask.js
b/resources/ext.gettingstarted.openTask.js
index e653692..5e5684a 100644
--- a/resources/ext.gettingstarted.openTask.js
+++ b/resources/ext.gettingstarted.openTask.js
@@ -11,9 +11,9 @@
( function ( window, document, mw, $ ) {
'use strict';
var cfg = mw.config.get( [
- 'wgAction', 'wgTitle', 'wgCanonicalSpecialPageName',
+ 'wgAction', 'wgPageName', 'wgTitle',
'wgCanonicalSpecialPageName',
'wgArticleId', 'wgCurRevisionId',
- 'wgNamespaceNumber', 'wgFormattedNamespaces',
+ 'wgNamespaceNumber',
// Wiki server variables we supply:
'wgIsWelcomeCreation', 'wgUserId',
// Wiki server variable supplied by Extension:PostEdit:
@@ -33,19 +33,6 @@
};
mw.eventLog.setDefaults( schema, defaults );
- }
-
-
- // FIXME Verbatim copypasta from mediawiki.user.js, which doesn't
export it.
- function generateId() {
- var i, r,
- id = '',
- seed =
'0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
- for ( i = 0; i < 32; i++ ) {
- r = Math.floor( Math.random() * seed.length );
- id += seed.substring( r, r + 1 );
- }
- return id;
}
/**
@@ -132,7 +119,7 @@
* @return {void}
*/
function checkProgress() {
- var action, pageTitle, pageNamespace, task,
+ var action, fullPageTitle, pageNamespace, task,
schema, event, isEditable,
loggedActions = {
view : 'page-impression',
@@ -149,14 +136,10 @@
return;
}
- // The task title stored in the cookie may include a namespace.
- pageTitle = cfg.wgTitle;
- pageNamespace = cfg.wgFormattedNamespaces[
cfg.wgNamespaceNumber ];
- if ( pageNamespace ) {
- pageTitle = pageNamespace + ':' + pageTitle;
- }
+ // The task title stored in the cookie may include a namespace
in this format.
+ fullPageTitle = new mw.Title( cfg.wgPageName
).getPrefixedText();
- task = getTasks()[ pageTitle ];
+ task = getTasks()[ fullPageTitle ];
if ( task ) {
schema = getSchemaForTask( task );
--
To view, visit https://gerrit.wikimedia.org/r/51824
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I23b657279895cad9b342a31900d465295771242e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: feature/gettingstartedv2
Gerrit-Owner: Mattflaschen <mflasc...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
