Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/300793
Change subject: Move mw.UploadWizardDetails.makeTitleInFileNS to
uw.TitleDetailsWidget
......................................................................
Move mw.UploadWizardDetails.makeTitleInFileNS to uw.TitleDetailsWidget
It is the only place where it's used.
Change-Id: I5d60a57bd3c6bed4c7c8aa524bf35a4498fd3571
---
M resources/details/uw.TitleDetailsWidget.js
M resources/mw.UploadWizardDetails.js
R tests/qunit/uw.TitleDetailsWidget.test.js
3 files changed, 24 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/93/300793/1
diff --git a/resources/details/uw.TitleDetailsWidget.js
b/resources/details/uw.TitleDetailsWidget.js
index bd7f5f3..9de3e37 100644
--- a/resources/details/uw.TitleDetailsWidget.js
+++ b/resources/details/uw.TitleDetailsWidget.js
@@ -1,5 +1,7 @@
( function ( mw, uw, $, OO ) {
+ var NS_FILE = mw.config.get( 'wgNamespaceIds' ).file;
+
/**
* A title field in UploadWizard's "Details" step form.
*
@@ -27,6 +29,24 @@
OO.inheritClass( uw.TitleDetailsWidget, uw.DetailsWidget );
/**
+ * Reliably turn input into a MediaWiki title that is located in the
File: namespace
+ *
+ * var title = uw.TitleDetailsWidget.static.makeTitleInFileNS(
'filename.ext' );
+ *
+ * @static
+ * @param {string} filename Desired file name; optionally with File:
namespace prefixed
+ * @return {mw.Title|null}
+ */
+ uw.TitleDetailsWidget.static.makeTitleInFileNS = function ( filename ) {
+ var mwTitle = mw.Title.newFromText( filename, NS_FILE );
+ if ( mwTitle && mwTitle.getNamespaceId() !== NS_FILE ) {
+ // Force file namespace
+ mwTitle = mw.Title.makeTitle( NS_FILE, filename );
+ }
+ return mwTitle;
+ };
+
+ /**
* @inheritdoc
*/
uw.TitleDetailsWidget.prototype.pushPending = function () {
@@ -53,7 +73,7 @@
}
extRegex = new RegExp( '\\.' + this.extension + '$', 'i' );
cleaned = value.replace( extRegex, '' ).replace( /\.+$/g, ''
).trim();
- title = mw.UploadWizardDetails.makeTitleInFileNS( cleaned + '.'
+ this.extension );
+ title = uw.TitleDetailsWidget.static.makeTitleInFileNS( cleaned
+ '.' + this.extension );
return title;
};
@@ -120,7 +140,7 @@
try {
titleString = result.unique.title || result.title;
- titleString = mw.UploadWizardDetails.makeTitleInFileNS(
titleString ).getPrefixedText();
+ titleString =
uw.TitleDetailsWidget.static.makeTitleInFileNS( titleString ).getPrefixedText();
} catch ( e ) {
// Unparseable result? This shouldn't happen, we
checked for that earlier...
errors.push( mw.message( 'mwe-upwiz-unparseable-title'
) );
diff --git a/resources/mw.UploadWizardDetails.js
b/resources/mw.UploadWizardDetails.js
index 9a59e32..10ec494 100644
--- a/resources/mw.UploadWizardDetails.js
+++ b/resources/mw.UploadWizardDetails.js
@@ -214,24 +214,6 @@
}
};
- /**
- * Reliably turn input into a MediaWiki title that is located in the
File: namespace
- *
- * var title = mw.UploadWizardDetails.makeTitleInFileNS(
'filename.ext' );
- *
- * @static
- * @param {string} filename Desired file name; optionally with File:
namespace prefixed
- * @return {mw.Title|null}
- */
- mw.UploadWizardDetails.makeTitleInFileNS = function ( filename ) {
- var mwTitle = mw.Title.newFromText( filename, NS_FILE );
- if ( mwTitle && mwTitle.getNamespaceId() !== NS_FILE ) {
- // Force file namespace
- mwTitle = mw.Title.makeTitle( NS_FILE, filename );
- }
- return mwTitle;
- };
-
mw.UploadWizardDetails.prototype = {
// Has this details object been attached to the DOM already?
diff --git a/tests/qunit/mw.UploadWizardDetails.test.js
b/tests/qunit/uw.TitleDetailsWidget.test.js
similarity index 86%
rename from tests/qunit/mw.UploadWizardDetails.test.js
rename to tests/qunit/uw.TitleDetailsWidget.test.js
index 1ef8ae5..4274b44 100644
--- a/tests/qunit/mw.UploadWizardDetails.test.js
+++ b/tests/qunit/uw.TitleDetailsWidget.test.js
@@ -27,9 +27,9 @@
desc: 'filename starting with file:'
} ];
- QUnit.module( 'ext.uploadWizard/mw.UploadWizardDetails.test.js',
QUnit.newMwEnvironment() );
+ QUnit.module( 'uw.TitleDetailsWidget', QUnit.newMwEnvironment() );
- QUnit.test( 'makeTitleInFileNS()', makeTitleInFileNSCases.length,
function () {
+ QUnit.test( '.static.makeTitleInFileNS()',
makeTitleInFileNSCases.length, function () {
var makeTitleInFileNS =
mw.UploadWizardDetails.makeTitleInFileNS;
$.each( makeTitleInFileNSCases, function ( i, test ) {
--
To view, visit https://gerrit.wikimedia.org/r/300793
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d60a57bd3c6bed4c7c8aa524bf35a4498fd3571
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
