jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/345154 )
Change subject: Finish removing dependency on TranslationView from translation
unit uis
......................................................................
Finish removing dependency on TranslationView from translation unit uis
Made it so that view listens on change events from the translation unit us.
While at it:
* Use consistent, unique naming pattern for constructor functions
* User super.call instead of parent.call (parent is only needed for IE8)
Change-Id: I71efadd4ae64cf37e10e4d5f32d5c67c86f2a1d9
---
M modules/ui/mw.cx.ui.TranslationView.js
M modules/ui/translationunits/mw.cx.ui.ImageTranslationUnit.js
M modules/ui/translationunits/mw.cx.ui.LinkTranslationUnit.js
M modules/ui/translationunits/mw.cx.ui.PoemTranslationUnit.js
M modules/ui/translationunits/mw.cx.ui.ReferenceTranslationUnit.js
M modules/ui/translationunits/mw.cx.ui.SectionTranslationUnit.js
M modules/ui/translationunits/mw.cx.ui.SentenceTranslationUnit.js
M modules/ui/translationunits/mw.cx.ui.TemplateTranslationUnit.js
M modules/ui/translationunits/mw.cx.ui.TranslationUnit.js
M modules/ui/translationunits/mw.cx.ui.TranslationUnitFactory.js
10 files changed, 22 insertions(+), 28 deletions(-)
Approvals:
jenkins-bot: Verified
Santhosh: Looks good to me, approved
diff --git a/modules/ui/mw.cx.ui.TranslationView.js
b/modules/ui/mw.cx.ui.TranslationView.js
index fa7a8c0..6047a45 100644
--- a/modules/ui/mw.cx.ui.TranslationView.js
+++ b/modules/ui/mw.cx.ui.TranslationView.js
@@ -96,7 +96,6 @@
translationUnit = mw.cx.ui.translationUnitFactory.create(
translationUnits[ i ].constructor.static.name,
translationUnits[ i ],
- this,
toolFactory,
this.config
);
@@ -120,6 +119,7 @@
mw.cx.ui.TranslationView.prototype.setTranslationUnitListeners = function (
unit ) {
unit.connect( this, {
activate: 'setActiveTranslationUnit',
+ change: 'onChange',
showTool: 'showTranslationTool',
subunit: 'setTranslationUnitListeners'
} );
@@ -170,6 +170,9 @@
} );
};
+/**
+ * Call this whenever something changes in the translation that requires
saving.
+ */
mw.cx.ui.TranslationView.prototype.onChange = function () {
this.publishButton.setDisabled( false );
};
@@ -208,6 +211,8 @@
this.columns.sourceColumn.titleWidget.$element,
this.columns.translationColumn.titleWidget.$element
);
+ // Translation title change is a change trigger for translation.
+ this.onChange();
};
/**
diff --git a/modules/ui/translationunits/mw.cx.ui.ImageTranslationUnit.js
b/modules/ui/translationunits/mw.cx.ui.ImageTranslationUnit.js
index 752a329..1693038 100644
--- a/modules/ui/translationunits/mw.cx.ui.ImageTranslationUnit.js
+++ b/modules/ui/translationunits/mw.cx.ui.ImageTranslationUnit.js
@@ -5,12 +5,11 @@
*
* @class
* @param {mw.cx.dm.TranslationUnit} model
- * @param {mw.cx.ui.TranslationView} view
* @param {mw.cx.tools.TranslationToolFactory} toolFactory
* @param {Object} config
*/
-mw.cx.ui.ImageTranslationUnit = function CXImageTranslationUnit( model, view,
toolFactory, config ) {
- mw.cx.ui.ImageTranslationUnit.parent.call( this, model, view,
toolFactory, config );
+mw.cx.ui.ImageTranslationUnit = function MwCxUiImageTranslationUnit( model,
toolFactory, config ) {
+ mw.cx.ui.ImageTranslationUnit.super.call( this, model, toolFactory,
config );
mw.cx.ui.mixin.AlignableTranslationUnit.call( this );
};
diff --git a/modules/ui/translationunits/mw.cx.ui.LinkTranslationUnit.js
b/modules/ui/translationunits/mw.cx.ui.LinkTranslationUnit.js
index 11f9816..09e1483 100644
--- a/modules/ui/translationunits/mw.cx.ui.LinkTranslationUnit.js
+++ b/modules/ui/translationunits/mw.cx.ui.LinkTranslationUnit.js
@@ -5,12 +5,11 @@
*
* @class
* @param {mw.cx.dm.TranslationUnit} model
- * @param {mw.cx.ui.TranslationView} view
* @param {mw.cx.tools.TranslationToolFactory} toolFactory
* @param {Object} config
*/
-mw.cx.ui.LinkTranslationUnit = function LinkTranslationUnit( model, view,
toolFactory, config ) {
- mw.cx.ui.LinkTranslationUnit.parent.call( this, model, view,
toolFactory, config );
+mw.cx.ui.LinkTranslationUnit = function MwCxUiLinkTranslationUnit( model,
toolFactory, config ) {
+ mw.cx.ui.LinkTranslationUnit.super.call( this, model, toolFactory,
config );
// Properties
this.adapted = false;
diff --git a/modules/ui/translationunits/mw.cx.ui.PoemTranslationUnit.js
b/modules/ui/translationunits/mw.cx.ui.PoemTranslationUnit.js
index 92f76d2..8c46511 100644
--- a/modules/ui/translationunits/mw.cx.ui.PoemTranslationUnit.js
+++ b/modules/ui/translationunits/mw.cx.ui.PoemTranslationUnit.js
@@ -5,12 +5,11 @@
*
* @class
* @param {mw.cx.dm.TranslationUnit} model
- * @param {mw.cx.ui.TranslationView} view
* @param {mw.cx.tools.TranslationToolFactory} toolFactory
* @param {Object} config
*/
-mw.cx.ui.PoemTranslationUnit = function PoemTranslationUnit( model, view,
toolFactory, config ) {
- mw.cx.ui.PoemTranslationUnit.parent.call( this, model, view,
toolFactory, config );
+mw.cx.ui.PoemTranslationUnit = function MwCxUiPoemTranslationUnit( model,
toolFactory, config ) {
+ mw.cx.ui.PoemTranslationUnit.super.call( this, model, toolFactory,
config );
};
/* Setup */
diff --git a/modules/ui/translationunits/mw.cx.ui.ReferenceTranslationUnit.js
b/modules/ui/translationunits/mw.cx.ui.ReferenceTranslationUnit.js
index 02c7858..b816dfc 100644
--- a/modules/ui/translationunits/mw.cx.ui.ReferenceTranslationUnit.js
+++ b/modules/ui/translationunits/mw.cx.ui.ReferenceTranslationUnit.js
@@ -5,12 +5,11 @@
*
* @class
* @param {mw.cx.dm.TranslationUnit} model
- * @param {mw.cx.ui.TranslationView} view
* @param {mw.cx.tools.TranslationToolFactory} toolFactory
* @param {Object} config
*/
-mw.cx.ui.ReferenceTranslationUnit = function ReferenceTranslationUnit( model,
view, toolFactory, config ) {
- mw.cx.ui.ReferenceTranslationUnit.parent.call( this, model, view,
toolFactory, config );
+mw.cx.ui.ReferenceTranslationUnit = function MwCxUiReferenceTranslationUnit(
model, toolFactory, config ) {
+ mw.cx.ui.ReferenceTranslationUnit.super.call( this, model, toolFactory,
config );
};
/* Setup */
diff --git a/modules/ui/translationunits/mw.cx.ui.SectionTranslationUnit.js
b/modules/ui/translationunits/mw.cx.ui.SectionTranslationUnit.js
index 848ccad..00f1f5e 100644
--- a/modules/ui/translationunits/mw.cx.ui.SectionTranslationUnit.js
+++ b/modules/ui/translationunits/mw.cx.ui.SectionTranslationUnit.js
@@ -5,12 +5,11 @@
*
* @class
* @param {mw.cx.dm.TranslationUnit} model
- * @param {mw.cx.ui.TranslationView} view
* @param {mw.cx.tools.TranslationToolFactory} toolFactory
* @param {Object} config
*/
-mw.cx.ui.SectionTranslationUnit = function SectionTranslationUnit( model,
view, toolFactory, config ) {
- mw.cx.ui.SectionTranslationUnit.parent.call( this, model, view,
toolFactory, config );
+mw.cx.ui.SectionTranslationUnit = function MwCxUiSectionTranslationUnit(
model, toolFactory, config ) {
+ mw.cx.ui.SectionTranslationUnit.super.call( this, model, toolFactory,
config );
mw.cx.ui.mixin.AlignableTranslationUnit.call( this );
this.connect( this, {
diff --git a/modules/ui/translationunits/mw.cx.ui.SentenceTranslationUnit.js
b/modules/ui/translationunits/mw.cx.ui.SentenceTranslationUnit.js
index 7ce114b..03c8484 100644
--- a/modules/ui/translationunits/mw.cx.ui.SentenceTranslationUnit.js
+++ b/modules/ui/translationunits/mw.cx.ui.SentenceTranslationUnit.js
@@ -5,12 +5,11 @@
*
* @class
* @param {mw.cx.dm.TranslationUnit} model
- * @param {mw.cx.ui.TranslationView} view
* @param {mw.cx.tools.TranslationToolFactory} toolFactory
* @param {Object} config
*/
-mw.cx.ui.SentenceTranslationUnit = function SentenceTranslationUnit( model,
view, toolFactory, config ) {
- mw.cx.ui.SentenceTranslationUnit.parent.call( this, model, view,
toolFactory, config );
+mw.cx.ui.SentenceTranslationUnit = function MwCxUiSentenceTranslationUnit(
model, toolFactory, config ) {
+ mw.cx.ui.SentenceTranslationUnit.super.call( this, model, toolFactory,
config );
};
/* Setup */
diff --git a/modules/ui/translationunits/mw.cx.ui.TemplateTranslationUnit.js
b/modules/ui/translationunits/mw.cx.ui.TemplateTranslationUnit.js
index fc22d88..8946d7c 100644
--- a/modules/ui/translationunits/mw.cx.ui.TemplateTranslationUnit.js
+++ b/modules/ui/translationunits/mw.cx.ui.TemplateTranslationUnit.js
@@ -5,12 +5,11 @@
*
* @class
* @param {mw.cx.dm.TranslationUnit} model
- * @param {mw.cx.ui.TranslationView} view
* @param {mw.cx.tools.TranslationToolFactory} toolFactory
* @param {Object} config
*/
-mw.cx.ui.TemplateTranslationUnit = function CXTemplateTranslationUnit( model,
view, toolFactory, config ) {
- mw.cx.ui.TemplateTranslationUnit.parent.call( this, model, view,
toolFactory, config );
+mw.cx.ui.TemplateTranslationUnit = function MwCxUiTemplateTranslationUnit(
model, toolFactory, config ) {
+ mw.cx.ui.TemplateTranslationUnit.super.call( this, model, toolFactory,
config );
mw.cx.ui.mixin.AlignableTranslationUnit.call( this );
};
diff --git a/modules/ui/translationunits/mw.cx.ui.TranslationUnit.js
b/modules/ui/translationunits/mw.cx.ui.TranslationUnit.js
index a7e9e7b..9200292 100644
--- a/modules/ui/translationunits/mw.cx.ui.TranslationUnit.js
+++ b/modules/ui/translationunits/mw.cx.ui.TranslationUnit.js
@@ -5,18 +5,16 @@
*
* @class
* @param {mw.cx.dm.TranslationUnit} model
- * @param {mw.cx.ui.TranslationView} view
* @param {mw.cx.tools.TranslationToolFactory} toolFactory
* @param {Object} config
*/
-mw.cx.ui.TranslationUnit = function TranslationUnit( model, view, toolFactory,
config ) {
+mw.cx.ui.TranslationUnit = function MwCxUiTranslationUnit( model, toolFactory,
config ) {
// Mixin constructor
OO.EventEmitter.call( this );
this.siteMapper = config.siteMapper;
this.config = config;
// Configuration initialization
- this.view = view;
this.translated = false;
this.translationUnits = [];
this.model = model;
@@ -168,7 +166,6 @@
mw.cx.ui.TranslationUnit.prototype.onChange = function () {
this.model.emit( 'change' );
- this.view.emit( 'change' );
this.buildSubTranslationUnits( this.model );
};
@@ -214,7 +211,6 @@
translationUnit = mw.cx.ui.translationUnitFactory.create(
name,
submodels[ i ],
- this.view,
this.toolFactory,
this.config
);
diff --git a/modules/ui/translationunits/mw.cx.ui.TranslationUnitFactory.js
b/modules/ui/translationunits/mw.cx.ui.TranslationUnitFactory.js
index 2a21a3c..046293b 100644
--- a/modules/ui/translationunits/mw.cx.ui.TranslationUnitFactory.js
+++ b/modules/ui/translationunits/mw.cx.ui.TranslationUnitFactory.js
@@ -6,7 +6,7 @@
* @extends OO.Factory
* @constructor
*/
-mw.cx.ui.TranslationUnitFactory = function CXTranslationUnitFactory() {
+mw.cx.ui.TranslationUnitFactory = function MwCxUiTranslationUnitFactory() {
// Parent constructor
mw.cx.ui.TranslationUnitFactory.super.call( this );
};
--
To view, visit https://gerrit.wikimedia.org/r/345154
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I71efadd4ae64cf37e10e4d5f32d5c67c86f2a1d9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
Gerrit-Reviewer: Santhosh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
