[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Use jQuery 3 .catch( fn ) instead of .then( null, fn )

2018-01-23 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405988 )

Change subject: Use jQuery 3 .catch( fn ) instead of .then( null, fn )
..


Use jQuery 3 .catch( fn ) instead of .then( null, fn )

Change-Id: I676eec0acf25690c2b2dd0b9a414be5fee887395
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 1 insertion(+), 2 deletions(-)

Approvals:
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved



diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index d9f9d40..48ea296 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -207,8 +207,7 @@
mw.libs.ve.targetLoader.addPlugin( 
function () {
// Run 
VisualEditorPreloadModules, but if they fail, we still want to continue
// loading, so convert failure 
to success
-   return mw.loader.using( 
conf.preloadModules ).then(
-   null,
+   return mw.loader.using( 
conf.preloadModules ).catch(
function () {
return 
$.Deferred().resolve();
}

-- 
To view, visit https://gerrit.wikimedia.org/r/405988
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I676eec0acf25690c2b2dd0b9a414be5fee887395
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Use jQuery 3 .catch( fn ) instead of .then( null, fn )

2018-01-23 Thread Code Review 
Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405988 )

Change subject: Use jQuery 3 .catch( fn ) instead of .then( null, fn )
..

Use jQuery 3 .catch( fn ) instead of .then( null, fn )

Change-Id: I676eec0acf25690c2b2dd0b9a414be5fee887395
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/88/405988/1

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index d9f9d40..48ea296 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -207,8 +207,7 @@
mw.libs.ve.targetLoader.addPlugin( 
function () {
// Run 
VisualEditorPreloadModules, but if they fail, we still want to continue
// loading, so convert failure 
to success
-   return mw.loader.using( 
conf.preloadModules ).then(
-   null,
+   return mw.loader.using( 
conf.preloadModules ).catch(
function () {
return 
$.Deferred().resolve();
}

-- 
To view, visit https://gerrit.wikimedia.org/r/405988
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I676eec0acf25690c2b2dd0b9a414be5fee887395
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits