Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/135013
Change subject: Used registered target, instead of ve.init.Target.
......................................................................
Used registered target, instead of ve.init.Target.
Depends on I468d4eb4 in core.
Change-Id: If4611307d5d7aaee4af84f86ef82faf9078043b6
---
M modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
M modules/ve-mw/ce/nodes/ve.ce.MWImageNode.js
M modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
M modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
M modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
M modules/ve-mw/init/ve.init.mw.LinkCache.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaInsertDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
M modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
16 files changed, 21 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/13/135013/1
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
index 2825c20..c215e9d 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
@@ -65,7 +65,7 @@
$( xmlDoc.documentElement ).attr( attrs ).text( extsrc
)[0]
);
- xhr = ve.init.mw.Target.static.apiRequest( {
+ xhr = ve.init.target.constructor.static.apiRequest( {
'action': 'visualeditor',
'paction': 'parsefragment',
'page': mw.config.get( 'wgRelevantPageName' ),
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWImageNode.js
b/modules/ve-mw/ce/nodes/ve.ce.MWImageNode.js
index ae6423d..2a48636 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWImageNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWImageNode.js
@@ -82,7 +82,7 @@
ve.ce.MWImageNode.prototype.generateContents = function () {
var xhr, deferred = $.Deferred();
- xhr = ve.init.mw.Target.static.apiRequest( {
+ xhr = ve.init.target.constructor.static.apiRequest( {
'action': 'query',
'prop': 'imageinfo',
'iiprop': 'url',
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
b/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
index 7c3f75e..2b8c73c 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
@@ -60,7 +60,7 @@
/** */
ve.ce.MWTransclusionNode.prototype.generateContents = function ( config ) {
var xhr, deferred = $.Deferred();
- xhr = ve.init.mw.Target.static.apiRequest( {
+ xhr = ve.init.target.constructor.static.apiRequest( {
'action': 'visualeditor',
'paction': 'parsefragment',
'page': mw.config.get( 'wgRelevantPageName' ),
diff --git a/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
b/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
index 6b16894..256fa0c 100644
--- a/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
+++ b/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
@@ -228,7 +228,7 @@
}
// Request template specs from server
- request = ve.init.mw.Target.static.apiRequest( {
+ request = ve.init.target.constructor.static.apiRequest( {
'action': 'templatedata',
'titles': titles.join( '|' ),
'lang': mw.config.get( 'wgUserLanguage' )
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
index 952c08e..440cc2e 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
@@ -170,7 +170,7 @@
// On the first call set off an async call to update the scalable's
// original dimensions from the API.
if ( !this.scalablePromise ) {
- this.scalablePromise = ve.init.mw.Target.static.apiRequest(
+ this.scalablePromise =
ve.init.target.constructor.static.apiRequest(
{
'action': 'query',
'prop': 'imageinfo',
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
index 1b4b032..65522b6 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
@@ -33,8 +33,8 @@
getTargetDeferred = $.Deferred();
loadTargetDeferred = $.Deferred()
.done( function () {
- var debugBar, target = new
ve.init.mw.ViewPageTarget();
- ve.init.mw.targets.push( target );
+ var debugBar,
+ target = new
ve.init.mw.ViewPageTarget();
if ( ve.debug ) {
debugBar = new
ve.init.DebugBar();
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 fb9efa8..1fca262 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -1639,7 +1639,7 @@
}
if ( prefSaysShow ) {
- ve.init.mw.Target.static.apiRequest( {
+ ve.init.target.constructor.static.apiRequest( {
'action': 'options',
'token': mw.user.tokens.get( 'editToken' ),
'change': 'visualeditor-hidebetawelcome=1'
diff --git a/modules/ve-mw/init/ve.init.mw.LinkCache.js
b/modules/ve-mw/init/ve.init.mw.LinkCache.js
index 2119af9..969395a 100644
--- a/modules/ve-mw/init/ve.init.mw.LinkCache.js
+++ b/modules/ve-mw/init/ve.init.mw.LinkCache.js
@@ -117,7 +117,7 @@
this.queue = [];
while ( queue.length ) {
subqueue = queue.splice( 0, 50 ).map( normalizeTitle );
- ve.init.mw.Target.static.apiRequest( {
+ ve.init.target.constructor.static.apiRequest( {
'action': 'query',
'prop': 'info',
'titles': subqueue.join( '|' )
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
index 9c93638..06b62b0 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
@@ -111,11 +111,11 @@
];
ve.ui.MWMediaEditDialog.static.pasteRules = ve.extendObject(
- ve.copy( ve.init.mw.Target.static.pasteRules ),
+ ve.copy( ve.init.target.constructor.static.pasteRules ),
{
'all': {
'blacklist': OO.simpleArrayUnion(
- ve.getProp(
ve.init.mw.Target.static.pasteRules, 'all', 'blacklist' ) || [],
+ ve.getProp(
ve.init.target.constructor.static.pasteRules, 'all', 'blacklist' ) || [],
[
// Tables (but not lists) are possible
in wikitext with a leading
// line break but we prevent creating
these with the UI
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaInsertDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaInsertDialog.js
index 6d6ea01..dc0dbc3 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaInsertDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaInsertDialog.js
@@ -111,7 +111,7 @@
// The decision whether to take 'url' or 'apiurl' per each
repository is made
// in the MWMediaSearchWidget depending on whether it is local
and has apiurl
// defined at all.
- ve.init.mw.Target.static.apiRequest( {
+ ve.init.target.constructor.static.apiRequest( {
'action': 'query',
'meta': 'filerepoinfo'
} )
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
index 090db16..0298b79 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
@@ -107,11 +107,11 @@
];
ve.ui.MWReferenceDialog.static.pasteRules = ve.extendObject(
- ve.copy( ve.init.mw.Target.static.pasteRules ),
+ ve.copy( ve.init.target.constructor.static.pasteRules ),
{
'all': {
'blacklist': OO.simpleArrayUnion(
- ve.getProp(
ve.init.mw.Target.static.pasteRules, 'all', 'blacklist' ) || [],
+ ve.getProp(
ve.init.target.constructor.static.pasteRules, 'all', 'blacklist' ) || [],
[
// Nested references are impossible
'mwReference', 'mwReferenceList',
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js
index 5ead31f..2161b5b 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js
@@ -163,7 +163,7 @@
ve.ui.MWLanguagesPage.prototype.getAllLanguageItems = function () {
var deferred = $.Deferred();
// TODO: Detect paging token if results exceed limit
- ve.init.mw.Target.static.apiRequest( {
+ ve.init.target.constructor.static.apiRequest( {
'action': 'visualeditor',
'paction': 'getlanglinks',
'page': mw.config.get( 'wgPageName' )
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js
index 380123f..2fa011d 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js
@@ -57,14 +57,14 @@
*/
ve.ui.MWCategoryInputWidget.prototype.getLookupRequest = function () {
var propsJqXhr,
- searchJqXhr = ve.init.mw.Target.static.apiRequest( {
+ searchJqXhr = ve.init.target.constructor.static.apiRequest( {
'action': 'opensearch',
'search': this.categoryPrefix + this.value,
'suggest': ''
} );
return searchJqXhr.then( function ( data ) {
- propsJqXhr = ve.init.mw.Target.static.apiRequest( {
+ propsJqXhr = ve.init.target.constructor.static.apiRequest( {
'action': 'query',
'prop': 'pageprops',
'titles': ( data[1] || [] ).join( '|' ),
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
index 0b2fcd5..42999fc 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
@@ -70,7 +70,7 @@
*/
ve.ui.MWLinkTargetInputWidget.prototype.getLookupRequest = function () {
var propsJqXhr,
- searchJqXhr = ve.init.mw.Target.static.apiRequest( {
+ searchJqXhr = ve.init.target.constructor.static.apiRequest( {
'action': 'opensearch',
'search': this.value,
'namespace': 0,
@@ -78,7 +78,7 @@
} );
return searchJqXhr.then( function ( data ) {
- propsJqXhr = ve.init.mw.Target.static.apiRequest( {
+ propsJqXhr = ve.init.target.constructor.static.apiRequest( {
'action': 'query',
'prop': 'info|pageprops',
'titles': ( data[1] || [] ).join( '|' ),
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
index 7d2147d..4290d93 100755
--- a/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
@@ -133,7 +133,7 @@
url = source.apiurl || ( source.scriptDirUrl +
'/api.php' );
}
this.query.pushPending();
- source.request = ve.init.mw.Target.static.apiRequest( {
+ source.request =
ve.init.target.constructor.static.apiRequest( {
'action': 'query',
'generator': 'search',
'gsrsearch': value,
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
index 58f8ebb..137e7ed 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
@@ -78,7 +78,7 @@
value = value.substr( 1 );
}
- return ve.init.mw.Target.static.apiRequest( {
+ return ve.init.target.constructor.static.apiRequest( {
'action': 'opensearch',
'search': value,
'suggest': ''
--
To view, visit https://gerrit.wikimedia.org/r/135013
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If4611307d5d7aaee4af84f86ef82faf9078043b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
