[MediaWiki-commits] [Gerrit] Clean up inconsistent variables in ReferenceNode/Transclusio... - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Clean up inconsistent variables in 
ReferenceNode/TransclusionNode
......................................................................


Clean up inconsistent variables in ReferenceNode/TransclusionNode

Made them match the local variable names in MWRefereneListNode.

Change-Id: Id314779323c3a7347cfcd6f40b0e2b63e4d9b0c5
---
M modules/ve/dm/nodes/ve.dm.MWReferenceNode.js
M modules/ve/dm/nodes/ve.dm.MWTransclusionNode.js
2 files changed, 21 insertions(+), 21 deletions(-)

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



diff --git a/modules/ve/dm/nodes/ve.dm.MWReferenceNode.js 
b/modules/ve/dm/nodes/ve.dm.MWReferenceNode.js
index b594c00..a90ee43 100644
--- a/modules/ve/dm/nodes/ve.dm.MWReferenceNode.js
+++ b/modules/ve/dm/nodes/ve.dm.MWReferenceNode.js
@@ -69,16 +69,16 @@
 };
 
 ve.dm.MWReferenceNode.static.toDomElements = function ( dataElement, doc, 
converter ) {
-       var itemNodeHtml, mwAttr, i, iLen, keyedNodes, setContents, origMw,
-               span = doc.createElement( 'span' ),
+       var itemNodeHtml, mwData, i, iLen, keyedNodes, setContents, origMw,
+               el = doc.createElement( 'span' ),
                itemNodeWrapper = doc.createElement( 'div' ),
                itemNode = converter.internalList.getItemNode( 
dataElement.attributes.listIndex ),
                itemNodeRange = itemNode.getRange();
 
-       span.setAttribute( 'about', dataElement.attributes.about );
-       span.setAttribute( 'typeof', 'mw:Extension/ref' );
+       el.setAttribute( 'about', dataElement.attributes.about );
+       el.setAttribute( 'typeof', 'mw:Extension/ref' );
 
-       mwAttr = ve.copyObject( dataElement.attributes.mw ) || {};
+       mwData = ve.copyObject( dataElement.attributes.mw ) || {};
 
        setContents = dataElement.attributes.contentsUsed ||
                dataElement.attributes.listKey === null;
@@ -109,32 +109,32 @@
                        itemNodeWrapper
                ),
                itemNodeHtml = $( itemNodeWrapper ).html();
-               ve.setProp( mwAttr, 'body', 'html', itemNodeHtml );
+               ve.setProp( mwData, 'body', 'html', itemNodeHtml );
        }
 
        // Set or clear key
        if ( dataElement.attributes.listKey !== null ) {
-               ve.setProp( mwAttr, 'attrs', 'name', 
dataElement.attributes.listKey );
-       } else if ( mwAttr.attrs ) {
-               delete mwAttr.attrs.listKey;
+               ve.setProp( mwData, 'attrs', 'name', 
dataElement.attributes.listKey );
+       } else if ( mwData.attrs ) {
+               delete mwData.attrs.listKey;
        }
        // Set or clear group
        if ( dataElement.attributes.refGroup !== '' ) {
-               ve.setProp( mwAttr, 'attrs', 'group', 
dataElement.attributes.refGroup );
-       } else if ( mwAttr.attrs ) {
-               delete mwAttr.attrs.refGroup;
+               ve.setProp( mwData, 'attrs', 'group', 
dataElement.attributes.refGroup );
+       } else if ( mwData.attrs ) {
+               delete mwData.attrs.refGroup;
        }
 
        // If mwAttr and origMw are the same, use origMw to prevent 
reserialization.
        // Reserialization has the potential to reorder keys and so change the 
DOM unnecessarily
        origMw = dataElement.attributes.origMw;
-       if ( origMw && ve.compare( mwAttr, JSON.parse( origMw ) ) ) {
-               span.setAttribute( 'data-mw', origMw );
+       if ( origMw && ve.compare( mwData, JSON.parse( origMw ) ) ) {
+               el.setAttribute( 'data-mw', origMw );
        } else {
-               span.setAttribute( 'data-mw', JSON.stringify( mwAttr ) );
+               el.setAttribute( 'data-mw', JSON.stringify( mwData ) );
        }
 
-       return [ span ];
+       return [ el ];
 };
 
 ve.dm.MWReferenceNode.static.remapInternalListIndexes = function ( 
dataElement, mapping ) {
diff --git a/modules/ve/dm/nodes/ve.dm.MWTransclusionNode.js 
b/modules/ve/dm/nodes/ve.dm.MWTransclusionNode.js
index e3b6746..6750060 100644
--- a/modules/ve/dm/nodes/ve.dm.MWTransclusionNode.js
+++ b/modules/ve/dm/nodes/ve.dm.MWTransclusionNode.js
@@ -80,7 +80,7 @@
 };
 
 ve.dm.MWTransclusionNode.static.toDomElements = function ( dataElement, doc, 
converter ) {
-       var span,
+       var el,
                index = converter.getStore().indexOfHash( ve.getHash( 
this.getHashObject( dataElement ) ) ),
                origMw = dataElement.attributes.origMw;
 
@@ -93,12 +93,12 @@
                // The object in the store is also used for CE rendering so 
return a copy
                return ve.copyDomElements( converter.getStore().value( index ), 
doc );
        } else {
-               span = doc.createElement( 'span' );
+               el = doc.createElement( 'span' );
                // All we need to send back to Parsoid is the original 
transclusion marker, with a
                // reconstructed data-mw property.
-               span.setAttribute( 'typeof', 'mw:Transclusion' );
-               span.setAttribute( 'data-mw', JSON.stringify( 
dataElement.attributes.mw ) );
-               return [ span ];
+               el.setAttribute( 'typeof', 'mw:Transclusion' );
+               el.setAttribute( 'data-mw', JSON.stringify( 
dataElement.attributes.mw ) );
+               return [ el ];
        }
 };
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id314779323c3a7347cfcd6f40b0e2b63e4d9b0c5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

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