From f3c5e2f410726e8e4e0ac257ae55e48ca1155691 Mon Sep 17 00:00:00 2001 From: Alex Monk Date: Wed, 13 Apr 2016 22:46:14 +0100 Subject: [PATCH] Set mw.libs.ve.EditingTabDialog.static.message instead of passing it to setup data Change-Id: I2bfb79e258253e00c9f856bbbb3c4efae55a128c --- .../init/targets/ve.init.mw.DesktopArticleTarget.init.js | 4 +--- modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js | 4 +--- modules/ve-mw/init/ve.init.MWEditingTabDialog.js | 2 ++ 3 files changed, 4 insertions(+), 6 deletions(-) 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 26d940b5e8..d76a8c8f9a 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 @@ -795,9 +795,7 @@ $( 'body' ).append( windowManager.$element ); editingTabDialog = new mw.libs.ve.EditingTabDialog(); windowManager.addWindows( [ editingTabDialog ] ); - windowManager.openWindow( editingTabDialog, { message: mw.msg( - 'visualeditor-editingtabdialog-body' - ) } ) + windowManager.openWindow( editingTabDialog ) .then( function ( opened ) { return opened; } ) .then( function ( closing ) { return closing; } ) .then( function ( data ) { diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js index 5d70b19161..60db89f74b 100644 --- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js +++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js @@ -265,9 +265,7 @@ ve.init.mw.DesktopArticleTarget.prototype.loadSuccess = function ( response ) { $( 'body' ).append( windowManager.$element ); this.editingTabDialog = new mw.libs.ve.EditingTabDialog(); windowManager.addWindows( [ this.editingTabDialog ] ); - windowManager.openWindow( this.editingTabDialog, { message: mw.msg( - 'visualeditor-editingtabdialog-body' - ) } ) + windowManager.openWindow( this.editingTabDialog ) .then( function ( opened ) { return opened; } ) .then( function ( closing ) { return closing; } ) .then( function ( data ) { diff --git a/modules/ve-mw/init/ve.init.MWEditingTabDialog.js b/modules/ve-mw/init/ve.init.MWEditingTabDialog.js index 5930070075..a6cc488a3a 100644 --- a/modules/ve-mw/init/ve.init.MWEditingTabDialog.js +++ b/modules/ve-mw/init/ve.init.MWEditingTabDialog.js @@ -34,6 +34,8 @@ mw.libs.ve.EditingTabDialog.static.verbose = true; mw.libs.ve.EditingTabDialog.static.title = mw.msg( 'visualeditor-editingtabdialog-title' ); +mw.libs.ve.EditingTabDialog.static.message = mw.msg( 'visualeditor-editingtabdialog-body' ); + mw.libs.ve.EditingTabDialog.static.actions = [ {