[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: ve.dm.CXLinkAnnotation: Use the adaptation info supplied by ...

2017-09-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/378659 )

Change subject: ve.dm.CXLinkAnnotation: Use the adaptation info supplied by 
cxserver
..


ve.dm.CXLinkAnnotation: Use the adaptation info supplied by cxserver

For now, just take the data-cx fom DOM and have it in model.
In follow up commits, we will start using the adaptation data in
inspectors.

Change-Id: I57a62d51ddd5151fb5fc5800954760db299bbe04
---
M modules/ve-cx/dm/ve.dm.CXLinkAnnotation.js
1 file changed, 10 insertions(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Nikerabbit: Looks good to me, approved



diff --git a/modules/ve-cx/dm/ve.dm.CXLinkAnnotation.js 
b/modules/ve-cx/dm/ve.dm.CXLinkAnnotation.js
index b36dde0..6e7df51 100644
--- a/modules/ve-cx/dm/ve.dm.CXLinkAnnotation.js
+++ b/modules/ve-cx/dm/ve.dm.CXLinkAnnotation.js
@@ -28,14 +28,23 @@
 };
 
 ve.dm.CXLinkAnnotation.static.toDataElement = function ( domElements, 
converter ) {
-   var dataElement = 
ve.dm.CXLinkAnnotation.super.static.toDataElement.call( this, domElements, 
converter );
+   var dataCX,
+   dataElement = 
ve.dm.CXLinkAnnotation.super.static.toDataElement.call( this, domElements, 
converter );
dataElement.attributes.linkid = domElements[ 0 ].getAttribute( 
'data-linkid' );
+
+   dataCX = domElements[ 0 ].getAttribute( 'data-cx' );
+   if ( dataCX ) {
+   dataElement.attributes.cx = JSON.parse( domElements[ 0 
].getAttribute( 'data-cx' ) );
+   }
return dataElement;
 };
 
 ve.dm.CXLinkAnnotation.static.toDomElements = function ( dataElement, doc ) {
var domElements = 
ve.dm.CXLinkAnnotation.super.static.toDomElements.call( this, dataElement, doc 
);
domElements[ 0 ].setAttribute( 'data-linkid', 
dataElement.attributes.linkid );
+   if ( dataElement.attributes.cx ) {
+   domElements[ 0 ].setAttribute( 'data-cx', JSON.stringify( 
dataElement.attributes.cx ) );
+   }
return domElements;
 };
 

-- 
To view, visit https://gerrit.wikimedia.org/r/378659
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I57a62d51ddd5151fb5fc5800954760db299bbe04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: ve.dm.CXLinkAnnotation: Use the adaptation info supplied by ...

2017-09-18 Thread Santhosh (Code Review) 
Santhosh has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/378659 )

Change subject: ve.dm.CXLinkAnnotation: Use the adaptation info supplied by 
cxserver
..

ve.dm.CXLinkAnnotation: Use the adaptation info supplied by cxserver

For now, just take the data-cx fom DOM and have it in model.
In follow up commits, we will start using the adaptation data in
inspectors.

Change-Id: I57a62d51ddd5151fb5fc5800954760db299bbe04
---
M modules/ve-cx/dm/ve.dm.CXLinkAnnotation.js
1 file changed, 10 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/59/378659/1

diff --git a/modules/ve-cx/dm/ve.dm.CXLinkAnnotation.js 
b/modules/ve-cx/dm/ve.dm.CXLinkAnnotation.js
index b36dde0..6e7df51 100644
--- a/modules/ve-cx/dm/ve.dm.CXLinkAnnotation.js
+++ b/modules/ve-cx/dm/ve.dm.CXLinkAnnotation.js
@@ -28,14 +28,23 @@
 };
 
 ve.dm.CXLinkAnnotation.static.toDataElement = function ( domElements, 
converter ) {
-   var dataElement = 
ve.dm.CXLinkAnnotation.super.static.toDataElement.call( this, domElements, 
converter );
+   var dataCX,
+   dataElement = 
ve.dm.CXLinkAnnotation.super.static.toDataElement.call( this, domElements, 
converter );
dataElement.attributes.linkid = domElements[ 0 ].getAttribute( 
'data-linkid' );
+
+   dataCX = domElements[ 0 ].getAttribute( 'data-cx' );
+   if ( dataCX ) {
+   dataElement.attributes.cx = JSON.parse( domElements[ 0 
].getAttribute( 'data-cx' ) );
+   }
return dataElement;
 };
 
 ve.dm.CXLinkAnnotation.static.toDomElements = function ( dataElement, doc ) {
var domElements = 
ve.dm.CXLinkAnnotation.super.static.toDomElements.call( this, dataElement, doc 
);
domElements[ 0 ].setAttribute( 'data-linkid', 
dataElement.attributes.linkid );
+   if ( dataElement.attributes.cx ) {
+   domElements[ 0 ].setAttribute( 'data-cx', JSON.stringify( 
dataElement.attributes.cx ) );
+   }
return domElements;
 };
 

-- 
To view, visit https://gerrit.wikimedia.org/r/378659
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I57a62d51ddd5151fb5fc5800954760db299bbe04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits