Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/300795
Change subject: Various minor cleanups
......................................................................
Various minor cleanups
* mw.UploadWizardUploadInterface: Remove check for C:\fakepath,
this no longer happens since we switched to the HTML5 File API.
* mw.ApiUploadFormDataHandler: Correct documentation.
* SpecialUploadWizard: Don't customize the value of 'wgIllegalFileChars',
we already add '#' in JS when using it.
Change-Id: Iaa84a352da943d83a6d115b3bbaa352876106e81
---
M includes/specials/SpecialUploadWizard.php
M resources/handlers/mw.ApiUploadFormDataHandler.js
M resources/mw.UploadWizardUploadInterface.js
3 files changed, 2 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/95/300795/1
diff --git a/includes/specials/SpecialUploadWizard.php
b/includes/specials/SpecialUploadWizard.php
index 5727446..fc20b9a 100644
--- a/includes/specials/SpecialUploadWizard.php
+++ b/includes/specials/SpecialUploadWizard.php
@@ -248,7 +248,7 @@
[
'UploadWizardConfig' => $config,
'wgFileCanRotate' =>
$bitmapHandler->canRotate(),
- 'wgIllegalFileChars' => $wgIllegalFileChars .
'#',
+ 'wgIllegalFileChars' => $wgIllegalFileChars,
]
);
}
diff --git a/resources/handlers/mw.ApiUploadFormDataHandler.js
b/resources/handlers/mw.ApiUploadFormDataHandler.js
index 9f75a56..aab1c2a 100644
--- a/resources/handlers/mw.ApiUploadFormDataHandler.js
+++ b/resources/handlers/mw.ApiUploadFormDataHandler.js
@@ -3,7 +3,7 @@
* Represents an object which configures an html5 FormData object to
upload.
* Large files are uploaded in chunks.
*
- * @param {mw.UploadWizardUploadInterface} upload
+ * @param {mw.UploadWizardUpload} upload
*/
mw.ApiUploadFormDataHandler = function ( upload, api ) {
var handler = this;
diff --git a/resources/mw.UploadWizardUploadInterface.js
b/resources/mw.UploadWizardUploadInterface.js
index f676b64..77313f8 100644
--- a/resources/mw.UploadWizardUploadInterface.js
+++ b/resources/mw.UploadWizardUploadInterface.js
@@ -350,8 +350,6 @@
mw.UploadWizardUploadInterface.prototype.updateFilename = function () {
var $div,
path = this.getFilename();
- // get basename of file; some browsers do this
C:\fakepath\something
- path = path.replace( /\w:.*\\(.*)$/, '$1' );
// visible filename
this.$form.find( '.mwe-upwiz-visible-file-filename-text' )
--
To view, visit https://gerrit.wikimedia.org/r/300795
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa84a352da943d83a6d115b3bbaa352876106e81
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
