jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/373029 )
Change subject: Break global dependencies
......................................................................
Break global dependencies
Change-Id: I62dbfdfd955f26aa00ce602e9cce5fd2b1ca11eb
---
M resources/jquery.wikibase.lexemeformview.js
M resources/jquery.wikibase.senseview.js
M resources/widgets/GlossWidget.js
M resources/widgets/LemmaWidget.js
M resources/widgets/LemmaWidget.newLemmaWidget.js
M resources/widgets/RepresentationWidget.js
M tests/jasmine/GlossWidget.spec.js
M tests/jasmine/LemmaWidget.spec.js
M tests/jasmine/RepresentationWidget.spec.js
9 files changed, 35 insertions(+), 31 deletions(-)
Approvals:
WMDE-leszek: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/jquery.wikibase.lexemeformview.js
b/resources/jquery.wikibase.lexemeformview.js
index baa3495..c53ce72 100644
--- a/resources/jquery.wikibase.lexemeformview.js
+++ b/resources/jquery.wikibase.lexemeformview.js
@@ -193,7 +193,8 @@
'#representation-widget-vue-template',
function () {
this._trigger( 'change' );
- }.bind( this )
+ }.bind( this ),
+ mw
);
},
diff --git a/resources/jquery.wikibase.senseview.js
b/resources/jquery.wikibase.senseview.js
index b989b59..8cd05dd 100644
--- a/resources/jquery.wikibase.senseview.js
+++ b/resources/jquery.wikibase.senseview.js
@@ -80,7 +80,9 @@
convertGlossesToGlossWidgetModel(
this.value().getGlosses() ),
function () {
this._trigger( 'change' );
- }.bind( this )
+ }.bind( this ),
+ mw,
+ $.util.getDirectionality
);
},
diff --git a/resources/widgets/GlossWidget.js b/resources/widgets/GlossWidget.js
index 47d399e..82a95ae 100644
--- a/resources/widgets/GlossWidget.js
+++ b/resources/widgets/GlossWidget.js
@@ -1,17 +1,17 @@
-module.exports = ( function ( $, mw, require, Vue, Vuex ) {
+module.exports = ( function ( require, Vue ) {
'use strict';
function deepClone( object ) {
return JSON.parse( JSON.stringify( object ) );
}
- function applyGlossWidget( widgetElement, glosses, beforeUpdate ) {
+ function applyGlossWidget( widgetElement, glosses, beforeUpdate, mw,
getDirectionality ) {
var template = '#gloss-widget-vue-template';
- return new Vue( newGlossWidget( widgetElement, template,
glosses, beforeUpdate ) );
+ return new Vue( newGlossWidget( widgetElement, template,
glosses, beforeUpdate, mw, getDirectionality ) );
}
- function newGlossWidget( widgetElement, template, glosses, beforeUpdate
) {
+ function newGlossWidget( widgetElement, template, glosses,
beforeUpdate, mw, getDirectionality ) {
return {
el: widgetElement,
template: template,
@@ -48,7 +48,7 @@
return mw.messages.get( key );
},
directionality: function ( languageCode ) {
- return $.util.getDirectionality(
languageCode );
+ return getDirectionality( languageCode
);
}
}
};
@@ -59,4 +59,4 @@
newGlossWidget: newGlossWidget
};
-} )( jQuery, mediaWiki, require, Vue, Vuex );
+} )( require, Vue );
diff --git a/resources/widgets/LemmaWidget.js b/resources/widgets/LemmaWidget.js
index 0ed785c..50653ad 100644
--- a/resources/widgets/LemmaWidget.js
+++ b/resources/widgets/LemmaWidget.js
@@ -20,5 +20,5 @@
var store = new Vuex.Store( newLemmaWidgetStore( repoApi, lemmas,
entityId, baseRevId ) );
- var app = new Vue( newLemmaWidget( store, '#lemmas-widget',
'#lemma-widget-vue-template' ) );
+ var app = new Vue( newLemmaWidget( store, '#lemmas-widget',
'#lemma-widget-vue-template' ), mw.messages );
} )( jQuery, mediaWiki, require, wikibase, Vue, Vuex );
diff --git a/resources/widgets/LemmaWidget.newLemmaWidget.js
b/resources/widgets/LemmaWidget.newLemmaWidget.js
index 2b953d6..556bbc4 100644
--- a/resources/widgets/LemmaWidget.newLemmaWidget.js
+++ b/resources/widgets/LemmaWidget.newLemmaWidget.js
@@ -1,4 +1,4 @@
-module.exports = ( function ( mw ) {
+module.exports = ( function () {
'use strict';
var Lemma = require( 'wikibase.lexeme.datamodel.Lemma' );
@@ -19,7 +19,7 @@
* @param {string} element
* @param {string} template - template string or selector
*/
- return function ( store, element, template ) {
+ return function ( store, element, template, messages ) {
return {
el: element,
template: template,
@@ -56,9 +56,9 @@
},
filters: {
message: function ( key ) {
- return mw.messages.get( key );
+ return messages.get( key );
}
}
};
};
-} )( mediaWiki );
+} )();
diff --git a/resources/widgets/RepresentationWidget.js
b/resources/widgets/RepresentationWidget.js
index 208f372..c108f9c 100644
--- a/resources/widgets/RepresentationWidget.js
+++ b/resources/widgets/RepresentationWidget.js
@@ -1,4 +1,4 @@
-module.exports = ( function ( mw ) {
+module.exports = ( function () {
'use strict';
/**
@@ -11,7 +11,7 @@
*
* @return {object} Vue component object
*/
- function newComponent( representations, element, template, beforeUpdate
) {
+ function newComponent( representations, element, template,
beforeUpdate, mw ) {
return {
el: element,
template: template,
@@ -64,8 +64,8 @@
*
* @return {Vue} Initialized widget
*/
- function create( representations, element, template, beforeUpdate ) {
- return new Vue( newComponent( representations, element,
template, beforeUpdate ) );
+ function create( representations, element, template, beforeUpdate, mw )
{
+ return new Vue( newComponent( representations, element,
template, beforeUpdate, mw ) );
}
/**
@@ -75,4 +75,4 @@
create: create
};
-} )( mediaWiki );
+} )();
diff --git a/tests/jasmine/GlossWidget.spec.js
b/tests/jasmine/GlossWidget.spec.js
index 2276375..d175dff 100644
--- a/tests/jasmine/GlossWidget.spec.js
+++ b/tests/jasmine/GlossWidget.spec.js
@@ -1,7 +1,7 @@
describe( 'wikibase.lexeme.widgets.GlossWidget', function () {
require( 'jsdom-global' )();
- global.mediaWiki = {
+ var mediaWiki = {
messages: {
get: function ( message ) {
'use strict';
@@ -9,19 +9,14 @@
}
}
};
- global.jQuery = {
- util: {
- getDirectionality: function ( languageCode ) {
- 'use strict';
- return languageCode + '-dir';
- }
- }
+ var getDirectionality = function ( languageCode ) {
+ 'use strict';
+ return languageCode + '-dir';
};
var expect = require( 'unexpected' ).clone();
expect.installPlugin( require( 'unexpected-dom' ) );
var Vue = global.Vue = require( 'vue/dist/vue.js' );
- global.Vuex = {};
var GlossWidget = require( 'wikibase.lexeme.widgets.GlossWidget' );
it(
@@ -196,7 +191,9 @@
getTemplate(),
glosses,
function () {
- }
+ },
+ mediaWiki,
+ getDirectionality
) );
}
diff --git a/tests/jasmine/LemmaWidget.spec.js
b/tests/jasmine/LemmaWidget.spec.js
index 200be8d..044e3d8 100644
--- a/tests/jasmine/LemmaWidget.spec.js
+++ b/tests/jasmine/LemmaWidget.spec.js
@@ -85,8 +85,9 @@
} );
} );
+ var messages = { get: function ( key ) { return key; } };
function newWidget( initialLemmas ) {
- return newWidgetWithStore( newStore( initialLemmas ) );
+ return newWidgetWithStore( newStore( initialLemmas ), messages
);
}
function newStore( initialLemmas ) {
@@ -96,7 +97,7 @@
function newWidgetWithStore( store ) {
var element = document.createElement( 'div' );
- return new Vue( newLemmaWidget( store, element, getTemplate() )
);
+ return new Vue( newLemmaWidget( store, element, getTemplate(),
messages ) );
}
function assertWidget( widget ) {
diff --git a/tests/jasmine/RepresentationWidget.spec.js
b/tests/jasmine/RepresentationWidget.spec.js
index 3ed9e7b..fcf12c8 100644
--- a/tests/jasmine/RepresentationWidget.spec.js
+++ b/tests/jasmine/RepresentationWidget.spec.js
@@ -1,5 +1,7 @@
describe( 'wikibase.lexeme.widgets.RepresentationWidget', function () {
var expect = require( 'unexpected' ).clone();
+ var mediaWiki = { messages: {} };
+
var RepresentationWidget = require(
'wikibase.lexeme.widgets.RepresentationWidget' );
var EMPTY_REPRESENTATION = { language: '', value: '' };
@@ -90,7 +92,8 @@
document.createElement( 'div' ),
'<div id="dummy-template"></div>',
function () {
- }
+ },
+ mediaWiki
);
}
} );
--
To view, visit https://gerrit.wikimedia.org/r/373029
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I62dbfdfd955f26aa00ce602e9cce5fd2b1ca11eb
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/WikibaseLexeme
Gerrit-Branch: master
Gerrit-Owner: Chrisneuroth <[email protected]>
Gerrit-Reviewer: WMDE-leszek <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
