Santhosh has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346500 )
Change subject: CX2: Consolidate the init methods of ui translation units
......................................................................
CX2: Consolidate the init methods of ui translation units
Change-Id: I5f98f2d5eacc85681de754ddea4beed78ef2688f
---
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.TranslationUnit.js
8 files changed, 18 insertions(+), 42 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/00/346500/1
diff --git a/modules/ui/mw.cx.ui.TranslationView.js
b/modules/ui/mw.cx.ui.TranslationView.js
index 051e4f6..e5868bc 100644
--- a/modules/ui/mw.cx.ui.TranslationView.js
+++ b/modules/ui/mw.cx.ui.TranslationView.js
@@ -97,7 +97,7 @@
);
// Initialize the translation unit
- translationUnit.render();
+ translationUnit.init();
// Make the sections visible
this.columns.sourceColumn.add(
translationUnit.getSourceSection(), i );
diff --git a/modules/ui/translationunits/mw.cx.ui.ImageTranslationUnit.js
b/modules/ui/translationunits/mw.cx.ui.ImageTranslationUnit.js
index 1693038..9b1dd22 100644
--- a/modules/ui/translationunits/mw.cx.ui.ImageTranslationUnit.js
+++ b/modules/ui/translationunits/mw.cx.ui.ImageTranslationUnit.js
@@ -23,16 +23,6 @@
mw.cx.ui.ImageTranslationUnit.static.highlightClass = 'cx-image-highlight';
mw.cx.ui.ImageTranslationUnit.static.tools = {};
-mw.cx.ui.ImageTranslationUnit.prototype.init = function () {
- if ( !this.model.sourceDocument.id ) {
- throw Error( '[CX] Invalid source document' );
- }
- this.$sourceSection = $( this.model.sourceDocument );
- this.$translationSection = this.getTranslationSection();
- this.adapt();
- this.listen();
-};
-
mw.cx.ui.ImageTranslationUnit.prototype.adapt = function () {
// Adapt in general will be asynchronous operation
this.model.adapt();
diff --git a/modules/ui/translationunits/mw.cx.ui.LinkTranslationUnit.js
b/modules/ui/translationunits/mw.cx.ui.LinkTranslationUnit.js
index f59a425..b54d681 100644
--- a/modules/ui/translationunits/mw.cx.ui.LinkTranslationUnit.js
+++ b/modules/ui/translationunits/mw.cx.ui.LinkTranslationUnit.js
@@ -34,16 +34,6 @@
return !!node.id;
};
-mw.cx.ui.LinkTranslationUnit.prototype.init = function () {
- if ( !this.model.sourceDocument.id ) {
- throw Error( '[CX] Invalid source document' );
- }
- this.$sourceSection = this.getSourceSection();
- this.$translationSection = this.getTranslationSection();
- this.adapt();
- this.listen();
-};
-
mw.cx.ui.LinkTranslationUnit.prototype.getPlaceholderSection = function () {
return $( '<section>' )
.addClass( 'cx-link-placeholder' );
diff --git a/modules/ui/translationunits/mw.cx.ui.PoemTranslationUnit.js
b/modules/ui/translationunits/mw.cx.ui.PoemTranslationUnit.js
index 8c46511..db83b02 100644
--- a/modules/ui/translationunits/mw.cx.ui.PoemTranslationUnit.js
+++ b/modules/ui/translationunits/mw.cx.ui.PoemTranslationUnit.js
@@ -20,15 +20,6 @@
mw.cx.ui.PoemTranslationUnit.static.highlightClass = 'cx-highlight--lightblue';
mw.cx.ui.PoemTranslationUnit.static.tools = {};
-mw.cx.ui.PoemTranslationUnit.prototype.init = function () {
- // XXX: Why does this need to be repeated in every subclass?
- this.$sourceSection = $( this.model.sourceDocument );
- this.$translationSection =
this.parentTranslationUnit.$translationSection.find( '#' +
this.model.sourceDocument.id );
-
- this.adapt();
- this.listen();
-};
-
mw.cx.ui.PoemTranslationUnit.prototype.adapt = function () {
this.model.adapt();
};
diff --git a/modules/ui/translationunits/mw.cx.ui.ReferenceTranslationUnit.js
b/modules/ui/translationunits/mw.cx.ui.ReferenceTranslationUnit.js
index d2278fb..9157b7d 100644
--- a/modules/ui/translationunits/mw.cx.ui.ReferenceTranslationUnit.js
+++ b/modules/ui/translationunits/mw.cx.ui.ReferenceTranslationUnit.js
@@ -27,7 +27,7 @@
if ( !this.model.sourceDocument.id ) {
throw Error( '[CX] Invalid source document' );
}
- this.$sourceSection = $( this.model.sourceDocument );
+ this.$sourceSection = this.getSourceSection();
this.$translationSection = this.getTranslationSection();
this.adapt();
this.listen();
diff --git a/modules/ui/translationunits/mw.cx.ui.SectionTranslationUnit.js
b/modules/ui/translationunits/mw.cx.ui.SectionTranslationUnit.js
index 83ddd8d..d69cd22 100644
--- a/modules/ui/translationunits/mw.cx.ui.SectionTranslationUnit.js
+++ b/modules/ui/translationunits/mw.cx.ui.SectionTranslationUnit.js
@@ -31,7 +31,10 @@
dictionary: [ 'select' ]
};
-mw.cx.ui.SectionTranslationUnit.prototype.render = function () {
+/**
+ * @inheritDoc
+ */
+mw.cx.ui.SectionTranslationUnit.prototype.init = function () {
// XXX: The model is not yet ready when the constructor is called
this.$sourceSection = this.createSourceSection( this.model );
this.$translationSection = this.createTranslationSection( this.model );
diff --git a/modules/ui/translationunits/mw.cx.ui.SentenceTranslationUnit.js
b/modules/ui/translationunits/mw.cx.ui.SentenceTranslationUnit.js
index e7b0087..9da1863 100644
--- a/modules/ui/translationunits/mw.cx.ui.SentenceTranslationUnit.js
+++ b/modules/ui/translationunits/mw.cx.ui.SentenceTranslationUnit.js
@@ -27,14 +27,4 @@
return node.className === 'cx-segment';
};
-mw.cx.ui.SentenceTranslationUnit.prototype.init = function () {
- var segmentId;
-
- this.$sourceSection = $( this.model.sourceDocument );
- segmentId = this.$sourceSection.data( 'segmentid' );
- this.$translationSection =
this.parentTranslationUnit.$translationSection
- .find( '[data-segmentid="' + segmentId + '"]' );
- this.listen();
-};
-
mw.cx.ui.translationUnitFactory.register( mw.cx.ui.SentenceTranslationUnit );
diff --git a/modules/ui/translationunits/mw.cx.ui.TranslationUnit.js
b/modules/ui/translationunits/mw.cx.ui.TranslationUnit.js
index a31e7d9..23acaa8 100644
--- a/modules/ui/translationunits/mw.cx.ui.TranslationUnit.js
+++ b/modules/ui/translationunits/mw.cx.ui.TranslationUnit.js
@@ -39,8 +39,20 @@
* this method will be called. All initialization code can go here.
*/
mw.cx.ui.TranslationUnit.prototype.init = function () {
+ if ( !this.model.getSectionId() ) {
+ throw Error( '[CX] Invalid source document' );
+ }
+ this.$sourceSection = this.getSourceSection();
+ this.$translationSection = this.getTranslationSection();
+ this.adapt();
+ this.listen();
};
+/**
+ * Adapt this translation unit to target langauge
+ */
+mw.cx.ui.TranslationUnit.prototype.adapt = function () {};
+
mw.cx.ui.TranslationUnit.prototype.getPlaceholderSection = function () {
return $( '<section>' )
.addClass( 'cx-placeholder' )
--
To view, visit https://gerrit.wikimedia.org/r/346500
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f98f2d5eacc85681de754ddea4beed78ef2688f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
