wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-24 22:35:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Minor: trace output tweak + code refactoring"

Browse source
This commit is contained in:
GWicke 2012-07-26 22:45:49 +00:00 committed by Gerrit Code Review
parent cd6f8ecbbe 1d46cdae08
commit 96c9d4cb67
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/parser/ext.core.Sanitizer.js
View file

@ -334,16 +334,17 @@ Sanitizer.prototype.onAny = function ( token ) {
if ( token.attribs && token.attribs.length ) { if ( token.attribs && token.attribs.length ) {
var attribs = token.attribs.slice(); var attribs = token.attribs.slice();
var newToken = $.extend( {}, token ); var newToken = $.extend( {}, token );
var env = this.manager.env;
for ( var i = 0, l = attribs.length; i < l; i++ ) { for ( var i = 0, l = attribs.length; i < l; i++ ) {
var kv = attribs[i], var kv = attribs[i],
k = kv.k, k = kv.k,
v = kv.v; v = kv.v;
if ( k.constructor === Array ) { if ( k.constructor === Array ) {
k = this.manager.env.tokensToString ( k ); k = env.tokensToString ( k );
} }
if ( v.constructor === Array ) { if ( v.constructor === Array ) {
v = this.manager.env.tokensToString ( v ); v = env.tokensToString ( v );
} }
if ( k === 'style' ) { if ( k === 'style' ) {
v = this.checkCss(v); v = this.checkCss(v);

13
modules/parser/mediawiki.parser.defines.js
View file

@ -94,9 +94,18 @@ TagTk.prototype.tagToStringFns = {
} }
}; };
TagTk.prototype.toString = function() { TagTk.prototype.toString = function(compact) {
if (this.dataAttribs.stx && this.dataAttribs.stx === "html") { if (this.dataAttribs.stx && this.dataAttribs.stx === "html") {
return "<HTML:" + this.name + ">"; if (compact) {
return "<HTML:" + this.name + ">";
} else {
var buf = [];
for (var i = 0, n = this.attribs.length; i < n; i++) {
var a = this.attribs[i];
buf.push(Util.toStringTokens(a.k).join('') + "=" + Util.toStringTokens(a.v).join(''));
}
return "<HTML:" + this.name + " " + buf.join(' ') + ">";
}
} else { } else {
var f = this.tagToStringFns[this.name]; var f = this.tagToStringFns[this.name];
return f ? f.bind(this)() : this.defaultToString(); return f ? f.bind(this)() : this.defaultToString();