jenkins-bot has submitted this change and it was merged. Change subject: build: Bump devDependencies to latest ......................................................................
build: Bump devDependencies to latest Updates: * grunt-contrib-csslint 0.3.1 -> 0.4.0 * grunt-contrib-jslint 0.10.0 -> 0.11.0 * grunt-jscs 0.8.1 -> 1.2.0 For jscs, leaving requireSpacesInsideArrayBrackets to avoid headaches for now. Change-Id: I62d34444edbba65c8bd22d2fa5e50e16cabb0042 --- M modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js M modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js M modules/ve-mw/dm/nodes/ve.dm.MWReferencesListNode.js M modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js M modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js M modules/ve-mw/init/ve.init.mw.ApiResponseCache.js M modules/ve-mw/init/ve.init.mw.ImageInfoCache.js M modules/ve-mw/init/ve.init.mw.LinkCache.js M modules/ve-mw/init/ve.init.mw.Target.js M modules/ve-mw/tests/dm/ve.dm.mwExample.js M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js M modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js M modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js M modules/ve-mw/ui/pages/ve.ui.MWParameterPage.js M modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js M modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js M modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js M modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js M modules/ve-mw/ui/widgets/ve.ui.MWReferenceSearchWidget.js M modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js M package.json 23 files changed, 67 insertions(+), 39 deletions(-) Approvals: Mooeypoo: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js index 9839271..453a2fc 100644 --- a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js +++ b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js @@ -79,7 +79,8 @@ * @param {Object} response Response data */ ve.ce.MWExtensionNode.prototype.onParseSuccess = function ( deferred, response ) { - var data = response.visualeditor, contentNodes = this.$( data.content ).get(); + var data = response.visualeditor, + contentNodes = this.$( data.content ).get(); deferred.resolve( contentNodes ); }; diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js b/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js index ff21dc0..030f4fd 100644 --- a/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js +++ b/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js @@ -139,9 +139,9 @@ this.storeGeneratedContents( dataElement, dataElement.attributes.src, converter.getStore() ); if ( caption ) { - return [ dataElement ]. - concat( converter.getDataFromDomClean( caption, { type: 'mwImageCaption' } ) ). - concat( [ { type: '/' + this.name } ] ); + return [ dataElement ] + .concat( converter.getDataFromDomClean( caption, { type: 'mwImageCaption' } ) ) + .concat( [ { type: '/' + this.name } ] ); } else { return [ dataElement, diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWReferencesListNode.js b/modules/ve-mw/dm/nodes/ve.dm.MWReferencesListNode.js index 484bc06..3dc06a2 100644 --- a/modules/ve-mw/dm/nodes/ve.dm.MWReferencesListNode.js +++ b/modules/ve-mw/dm/nodes/ve.dm.MWReferencesListNode.js @@ -63,9 +63,9 @@ contentsDiv = domElements[0].ownerDocument.createElement( 'div' ); contentsDiv.innerHTML = mwData.body.html; contentsData = converter.getDataFromDomClean( contentsDiv ); - return [ referencesListData ]. - concat( contentsData ). - concat( [ { type: '/' + this.name } ] ); + return [ referencesListData ] + .concat( contentsData ) + .concat( [ { type: '/' + this.name } ] ); } else { return referencesListData; } diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js index 875275d..0247908 100644 --- a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js +++ b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js @@ -158,8 +158,13 @@ * @returns {string} Escaped parameter value */ ve.dm.MWTransclusionNode.static.escapeParameter = function ( param ) { - var match, needsNowiki, input = param, output = '', - inNowiki = false, bracketStack = 0, linkStack = 0; + var match, needsNowiki, + input = param, + output = '', + inNowiki = false, + bracketStack = 0, + linkStack = 0; + while ( input.length > 0 ) { match = input.match( /(?:\[\[)|(?:\]\])|(?:\{\{)|(?:\}\})|\|+|<\/?nowiki>|<nowiki\s*\/>/ ); if ( !match ) { diff --git a/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js b/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js index 17c6706..d43fe9b 100644 --- a/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js +++ b/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js @@ -107,7 +107,8 @@ * @inheritdoc */ ve.init.mw.MobileViewTarget.prototype.scrollToHeading = function ( headingNode ) { - var target = this, position; + var position, + target = this; setTimeout( function () { if ( target.isIos ) { diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js index 04f4409..85ff087 100644 --- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js +++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js @@ -655,7 +655,8 @@ * @param {Object} editApi */ ve.init.mw.ViewPageTarget.prototype.onSaveErrorCaptcha = function ( editApi ) { - var $captchaDiv = $( '<div>' ), $captchaParagraph = $( '<p>' ); + var $captchaDiv = $( '<div>' ), + $captchaParagraph = $( '<p>' ); this.captcha = { input: new OO.ui.TextInputWidget(), @@ -974,7 +975,7 @@ var $this = $( this ); // We can't just use $this.val() because .val() always returns the value attribute of // a checkbox even when it's unchecked - if ( $this.prop ( 'name' ) && ( $this.prop( 'type' ) !== 'checkbox' || $this.prop( 'checked' ) ) ) { + if ( $this.prop( 'name' ) && ( $this.prop( 'type' ) !== 'checkbox' || $this.prop( 'checked' ) ) ) { fields[$this.prop( 'name' )] = $this.val(); } } ); @@ -1503,7 +1504,8 @@ ve.init.mw.ViewPageTarget.prototype.replacePageContent = function ( html, categoriesHtml, displayTitle, lastModified, contentSub ) { - var $content = $( $.parseHTML( html ) ), $editableContent; + var $editableContent, + $content = $( $.parseHTML( html ) ); if ( lastModified ) { // If we were not viewing the most recent revision before (a requirement diff --git a/modules/ve-mw/init/ve.init.mw.ApiResponseCache.js b/modules/ve-mw/init/ve.init.mw.ApiResponseCache.js index ac045eb..1951945 100644 --- a/modules/ve-mw/init/ve.init.mw.ApiResponseCache.js +++ b/modules/ve-mw/init/ve.init.mw.ApiResponseCache.js @@ -169,4 +169,4 @@ .then( rejectSubqueue.bind( null, subqueue ) ); } }; -} () ); +}() ); diff --git a/modules/ve-mw/init/ve.init.mw.ImageInfoCache.js b/modules/ve-mw/init/ve.init.mw.ImageInfoCache.js index 35dcb94..ee3b524 100644 --- a/modules/ve-mw/init/ve.init.mw.ImageInfoCache.js +++ b/modules/ve-mw/init/ve.init.mw.ImageInfoCache.js @@ -39,4 +39,4 @@ ve.init.mw.ImageInfoCache.prototype.processPage = function ( page ) { return page.imageinfo[0]; }; -} () ); +}() ); diff --git a/modules/ve-mw/init/ve.init.mw.LinkCache.js b/modules/ve-mw/init/ve.init.mw.LinkCache.js index db3b64d..98a619d 100644 --- a/modules/ve-mw/init/ve.init.mw.LinkCache.js +++ b/modules/ve-mw/init/ve.init.mw.LinkCache.js @@ -70,4 +70,4 @@ disambiguation: page.pageprops && page.pageprops.disambiguation !== undefined }; }; -} () ); +}() ); diff --git a/modules/ve-mw/init/ve.init.mw.Target.js b/modules/ve-mw/init/ve.init.mw.Target.js index f0f3ba5..6cc1ffc 100644 --- a/modules/ve-mw/init/ve.init.mw.Target.js +++ b/modules/ve-mw/init/ve.init.mw.Target.js @@ -1084,7 +1084,10 @@ * @returns {jQuery.Promise} Abortable promise, resolved with the cache key. */ ve.init.mw.Target.prototype.prepareCacheKey = function ( doc ) { - var xhr, html, start = ve.now(), deferred = $.Deferred(), target = this; + var xhr, html, + start = ve.now(), + deferred = $.Deferred(), + target = this; if ( this.preparedCacheKeyPromise && this.preparedCacheKeyPromise.doc === doc ) { return this.preparedCacheKeyPromise; @@ -1163,7 +1166,10 @@ * @returns {jQuery.Promise} */ ve.init.mw.Target.prototype.tryWithPreparedCacheKey = function ( doc, options, eventName ) { - var data, preparedCacheKey = this.getPreparedCacheKey( doc ), target = this; + var data, + preparedCacheKey = this.getPreparedCacheKey( doc ), + target = this; + data = ve.extendObject( {}, options, { format: 'json' } ); function ajaxRequest( cachekey ) { @@ -1461,7 +1467,7 @@ // If we detect no roundtrip errors, // don't emphasize "review changes" to the user. target.sanityCheckVerified = true; - }) + } ) .always( function () { target.sanityCheckFinished = true; target.emit( 'sanityCheckComplete' ); diff --git a/modules/ve-mw/tests/dm/ve.dm.mwExample.js b/modules/ve-mw/tests/dm/ve.dm.mwExample.js index 33b90f9..f313d86 100644 --- a/modules/ve-mw/tests/dm/ve.dm.mwExample.js +++ b/modules/ve-mw/tests/dm/ve.dm.mwExample.js @@ -739,7 +739,7 @@ attrs: {} }, originalMw: '{"name":"references","attrs":{}"}', - //domElements: HTML, + // domElements: HTML, listGroup: 'mwReference/', refGroup: '' } diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js index 4192ac7..63bfc22 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js @@ -102,7 +102,7 @@ var toolbarGroups = ve.copy( ve.init.mw.Target.static.toolbarGroups ); toolbarGroups[4].include[0].group = 'cite-transclusion'; return toolbarGroups; -} () ); +}() ); /** * Get the import rules for the surface widget in the dialog diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js index c34a743..1f1e9a0 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js @@ -255,7 +255,7 @@ } $message = this.$( '<div class="ve-ui-mwSaveDialog-message"></div>' ); if ( options.wrap !== false ) { - $message.append( this.$( '<p>').append( + $message.append( this.$( '<p>' ).append( // visualeditor-savedialog-label-error // visualeditor-savedialog-label-warning this.$( '<strong>' ).text( mw.msg( 'visualeditor-savedialog-label-' + options.wrap ) ), diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js index 8d8e354..c9af2a7 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js @@ -351,7 +351,8 @@ * @returns {jQuery.Deferred} */ ve.ui.MWTemplateDialog.prototype.checkRequiredParameters = function () { - var blankRequired = [], deferred = $.Deferred(); + var blankRequired = [], + deferred = $.Deferred(); $.each( this.bookletLayout.pages, function () { if ( !( this instanceof ve.ui.MWParameterPage ) ) { return true; diff --git a/modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js b/modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js index 6a7761c..1028353 100644 --- a/modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js +++ b/modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js @@ -57,7 +57,9 @@ }; ve.ui.MWLanguagesPage.prototype.onLoadLanguageData = function ( languages ) { - var i, $languagesTable = this.$( '<table>' ), languageslength = languages.length; + var i, + $languagesTable = this.$( '<table>' ), + languageslength = languages.length; $languagesTable .addClass( 've-ui-mwLanguagesPage-languages-table' ) diff --git a/modules/ve-mw/ui/pages/ve.ui.MWParameterPage.js b/modules/ve-mw/ui/pages/ve.ui.MWParameterPage.js index 23d5800..c0c6055 100644 --- a/modules/ve-mw/ui/pages/ve.ui.MWParameterPage.js +++ b/modules/ve-mw/ui/pages/ve.ui.MWParameterPage.js @@ -17,7 +17,8 @@ * @param {Object} [config] Configuration options */ ve.ui.MWParameterPage = function VeUiMWParameterPage( parameter, name, config ) { - var paramName = parameter.getName(), page = this; + var paramName = parameter.getName(), + page = this; // Configuration initialization config = ve.extendObject( { diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js index 6360c17..e009a39 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js @@ -62,7 +62,9 @@ * @inheritdoc */ ve.ui.MWCategoryInputWidget.prototype.getLookupCacheDataFromResponse = function ( data ) { - var result = [], linkCacheUpdate = {}, query = data.query || {}; + var result = [], + linkCacheUpdate = {}, + query = data.query || {}; $.each( query.pages || [], function ( pageId, categoryPage ) { result.push( mw.Title.newFromText( categoryPage.title ).getMainText() ); @@ -99,8 +101,10 @@ var widget = this, exactMatch = false, itemWidgets = [], - existingCategoryItems = [], matchingCategoryItems = [], - hiddenCategoryItems = [], newCategoryItems = [], + existingCategoryItems = [], + matchingCategoryItems = [], + hiddenCategoryItems = [], + newCategoryItems = [], existingCategories = this.categoryWidget.getCategories(), linkCacheUpdate = {}, canonicalQueryValue = mw.Title.newFromText( this.value ), diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js index ad9e4bb..74c2c26 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js @@ -37,7 +37,7 @@ this.sortKeyField = new OO.ui.FieldLayout( this.sortKeyInput, { $: this.$, align: 'top', - label: ve.msg ( 'visualeditor-dialog-meta-categories-sortkey-label' ) + label: ve.msg( 'visualeditor-dialog-meta-categories-sortkey-label' ) } ); this.$sortKeyForm = this.$( '<form>' ).addClass( 've-ui-mwCategoryPopupWidget-sortKeyForm' ) .append( this.sortKeyField.$element ); diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js index a6adecb..1824dfa 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js @@ -215,7 +215,8 @@ * @return {jQuery.Promise} */ ve.ui.MWCategoryWidget.prototype.queryCategoryStatus = function ( categoryNames ) { - var categoryWidget = this, categoryNamesToQuery = []; + var categoryWidget = this, + categoryNamesToQuery = []; // Get rid of any we already know the hidden status of. categoryNamesToQuery = $.grep( categoryNames, function ( categoryTitle ) { var cacheEntry = ve.init.platform.linkCache.getCached( categoryTitle ); @@ -233,7 +234,8 @@ ppprop: 'hiddencat', redirects: '' } ).then( function ( result ) { - var linkCacheUpdate = {}, normalisedTitles = {}; + var linkCacheUpdate = {}, + normalisedTitles = {}; if ( result && result.query && result.query.pages ) { $.each( result.query.pages, function ( index, pageInfo ) { linkCacheUpdate[pageInfo.title] = { @@ -357,7 +359,7 @@ var gap, min, $lastItem, $input = this.input.$element; - if ( !$input.is( ':visible') ) { + if ( !$input.is( ':visible' ) ) { return; } diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js index 9cd4b5b..477edca 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js @@ -109,9 +109,11 @@ * @returns {jqXHR} AJAX object without success or fail handlers attached */ ve.ui.MWLinkTargetInputWidget.prototype.getLookupRequest = function () { - var widget = this, promiseAbortObject = { abort: function () { + var req, + widget = this, + promiseAbortObject = { abort: function () { // Do nothing. This is just so OOUI doesn't break due to abort being undefined. - } }, req; + } }; if ( mw.Title.newFromText( this.value ) ) { return this.interwikiPrefixesPromise.then( function () { diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWReferenceSearchWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWReferenceSearchWidget.js index affd013..a2c8fc1 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWReferenceSearchWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWReferenceSearchWidget.js @@ -120,7 +120,8 @@ * @param {string[]} groupsChanged A list of groups which have changed in this transaction */ ve.ui.MWReferenceSearchWidget.prototype.onInternalListUpdate = function ( groupsChanged ) { - for ( var i = 0, len = groupsChanged.length; i < len; i++ ) { + var i, len; + for ( i = 0, len = groupsChanged.length; i < len; i++ ) { if ( groupsChanged[i].indexOf( 'mwReference/' ) === 0 ) { this.built = false; break; diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js index 088c0b5..dfe7c73 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js @@ -123,7 +123,7 @@ */ ve.ui.MWTitleInputWidget.prototype.getTitle = function () { var title = this.getValue(), - //mw.Title doesn't handle null well + // mw.Title doesn't handle null well titleObj = mw.Title.newFromText( title, this.namespace !== null ? this.namespace : undefined ); return titleObj; diff --git a/package.json b/package.json index 554ff70..68f3397 100644 --- a/package.json +++ b/package.json @@ -9,9 +9,9 @@ "devDependencies": { "grunt": "0.4.5", "grunt-banana-checker": "0.2.0", - "grunt-contrib-csslint": "0.3.1", - "grunt-contrib-jshint": "0.10.0", + "grunt-contrib-csslint": "0.4.0", + "grunt-contrib-jshint": "0.11.0", "grunt-contrib-watch": "0.6.1", - "grunt-jscs": "0.8.1" + "grunt-jscs": "1.2.0" } } -- To view, visit https://gerrit.wikimedia.org/r/187841 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I62d34444edbba65c8bd22d2fa5e50e16cabb0042 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: Mooeypoo <mor...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits