Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/213544
Change subject: Remove i18n shim ...................................................................... Remove i18n shim Change-Id: I79d2099b3502dfaa1786306689fdd79b41cfa47b --- D UploadWizard.i18n.php M resources/controller/uw.controller.Deed.js M resources/mw.UploadWizardDeed.js 3 files changed, 6 insertions(+), 42 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard refs/changes/44/213544/1 diff --git a/UploadWizard.i18n.php b/UploadWizard.i18n.php deleted file mode 100644 index e98a90a..0000000 --- a/UploadWizard.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -<?php -/** - * This is a backwards-compatibility shim, generated by: - * https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = array(); -if ( !function_exists( 'wfJsonI18nShim68b2bbac0fb2582b' ) ) { - function wfJsonI18nShim68b2bbac0fb2582b( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim68b2bbac0fb2582b'; -} diff --git a/resources/controller/uw.controller.Deed.js b/resources/controller/uw.controller.Deed.js index 4dd6536..bb9a00f 100644 --- a/resources/controller/uw.controller.Deed.js +++ b/resources/controller/uw.controller.Deed.js @@ -28,10 +28,7 @@ uw.controller.Step.call( this, - new uw.ui.Deed() - .connect( this, { - 'next-step': 'validate' - } ), + new uw.ui.Deed(), config ); @@ -42,11 +39,12 @@ DP = Deed.prototype; - DP.validate = function () { + DP.moveFrom = function () { + var valid = this.deedChooser.valid(); // validate has the side effect of notifying the user of problems, or removing existing notifications. // if returns false, you can assume there are notifications in the interface. - if ( this.deedChooser.valid() ) { - this.emit( 'next-step' ); + if ( valid ) { + uw.controller.Step.prototype.moveFrom.call( this ); } }; diff --git a/resources/mw.UploadWizardDeed.js b/resources/mw.UploadWizardDeed.js index 1e42ba9..c616a66 100644 --- a/resources/mw.UploadWizardDeed.js +++ b/resources/mw.UploadWizardDeed.js @@ -430,6 +430,7 @@ // do not short-circuit. var formValid = this.$form.valid(), licenseInputValid = this.licenseInput.valid(); + return formValid && licenseInputValid; } } ); -- To view, visit https://gerrit.wikimedia.org/r/213544 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I79d2099b3502dfaa1786306689fdd79b41cfa47b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UploadWizard Gerrit-Branch: master Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
