Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/81705
Change subject: Use DOM4 naming convention for tokens.
......................................................................
Use DOM4 naming convention for tokens.
nodeName,nodeValue --> name,value
Change-Id: I6b5dc0ee6a6510e1dd4ada168505520f9c1e6ca8
---
M js/lib/html5/treebuilder.js
M js/lib/mediawiki.DOMPostProcessor.js
M js/lib/mediawiki.HTML5TreeBuilder.node.js
3 files changed, 11 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/05/81705/1
diff --git a/js/lib/html5/treebuilder.js b/js/lib/html5/treebuilder.js
index 2a65a1f..a59e0a6 100644
--- a/js/lib/html5/treebuilder.js
+++ b/js/lib/html5/treebuilder.js
@@ -22,25 +22,15 @@
at.namespace = attribute.namespace;
}
} else {
- var name, value, namespace;
try {
- if ('namespaceURI' in attribute) { // DOM 4
- name = attribute.name;
- value = attribute.value;
- namespace = attribute.namespaceURI;
- } else { // token
- name = attribute.nodeName;
- value = attribute.nodeValue;
- namespace = attribute.namespace;
- }
- if (namespace) {
- element.setAttributeNS(namespace, name, value);
+ if ('namespaceURI' in attribute) {
+ element.setAttributeNS(attribute.namespaceURI,
attribute.name, attribute.value);
} else {
- element.setAttribute(name, value);
+ element.setAttribute(attribute.name,
attribute.value);
}
} catch(e) {
HTML5.debug('treebuilder.copyAttributes',
- "Can't set attribute", name, value, e);
+ "Can't set attribute", attribute.name,
attribute.value, e);
}
}
}
diff --git a/js/lib/mediawiki.DOMPostProcessor.js
b/js/lib/mediawiki.DOMPostProcessor.js
index 66e83cd..61dcabb 100644
--- a/js/lib/mediawiki.DOMPostProcessor.js
+++ b/js/lib/mediawiki.DOMPostProcessor.js
@@ -105,7 +105,7 @@
if ( /^mw:/.test( type ) ) {
var meta = node.ownerDocument.createElement( "meta" );
data.attrs.forEach(function ( attr ) {
- meta.setAttribute( attr.nodeName,
attr.nodeValue );
+ meta.setAttribute( attr.name, attr.value );
});
node.parentNode.insertBefore( meta, node );
DU.deleteNode( node );
diff --git a/js/lib/mediawiki.HTML5TreeBuilder.node.js
b/js/lib/mediawiki.HTML5TreeBuilder.node.js
index 84e2fe9..83f2160 100644
--- a/js/lib/mediawiki.HTML5TreeBuilder.node.js
+++ b/js/lib/mediawiki.HTML5TreeBuilder.node.js
@@ -113,7 +113,7 @@
if ( maybeAttribs && $.isArray( maybeAttribs ) ) {
for(var i = 0, length = maybeAttribs.length; i < length; i++) {
var att = maybeAttribs[i];
- atts.push({nodeName: att.k, nodeValue: att.v});
+ atts.push({name: att.k, value: att.v});
}
}
return atts;
@@ -194,14 +194,14 @@
this.emit('token', {
type: 'StartTag',
name: 'meta',
- data: [ { nodeName: "typeof",
nodeValue: "mw:FosterBox" } ]
+ data: [ { name: "typeof", value:
"mw:FosterBox" } ]
});
}
this.emit('token', {type: 'StartTag', name: tName,
data: this._att(attribs)});
attrs = [];
if ( this.trace ) { console.warn('inserting shadow meta
for ' + tName); }
- attrs.push({nodeName: "typeof", nodeValue:
"mw:StartTag"});
- attrs.push({nodeName: "data-stag", nodeValue: tName +
':' + dataAttribs.tagId});
+ attrs.push({name: "typeof", value: "mw:StartTag"});
+ attrs.push({name: "data-stag", value: tName + ':' +
dataAttribs.tagId});
this.emit('token', { type: 'Comment', data:
JSON.stringify({
"@type": "mw:shadow",
attrs: attrs
@@ -239,8 +239,8 @@
if ( this.trace ) { console.warn('inserting shadow meta
for ' + tName); }
attrs = this._att(attribs);
- attrs.push({nodeName: "typeof", nodeValue:
"mw:EndTag"});
- attrs.push({nodeName: "data-etag", nodeValue: tName});
+ attrs.push({name: "typeof", value: "mw:EndTag"});
+ attrs.push({name: "data-etag", value: tName});
this.emit('token', {type: 'Comment', data:
JSON.stringify({
"@type": "mw:shadow",
attrs: attrs
--
To view, visit https://gerrit.wikimedia.org/r/81705
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b5dc0ee6a6510e1dd4ada168505520f9c1e6ca8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
