Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for 'noLegacyStyle' config flag: if set, removes legacy DOM-... #129

Merged
merged 1 commit into from Jan 23, 2013
Merged

Add support for 'noLegacyStyle' config flag: if set, removes legacy DOM-... #129

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 17 additions & 13 deletions js/core/webidl-oldschool.js
View file
Open in desktop
Expand Up @@ -619,7 +619,8 @@ define(
var $pre = $("<pre></pre>").attr(attr);
$pre.html(this.writeAsWebIDL(this.parent, -1));
$df.append($pre);
$df.append(this.writeAsHTML(this.parent));
if (!this.conf.noLegacyStyle) $df.append(this.writeAsHTML(this.parent));
this.mergeWebIDL(this.parent.children[0]);
return $df.children();
},

Expand Down Expand Up @@ -1025,18 +1026,6 @@ define(
var desc = sn.element("p", {}, div, [it.description]);
}
}
if (typeof obj.merge !== "undefined" && obj.merge.length > 0) {
// hackish: delay the execution until the DOM has been initialized, then merge
setTimeout(function () {
for (var i = 0; i < obj.merge.length; i++) {
var idlInterface = document.querySelector("#idl-def-" + obj.refId),
idlDictionary = document.querySelector("#idl-def-" + obj.merge[i]);
idlDictionary.parentNode.parentNode.removeChild(idlDictionary.parentNode);
idlInterface.appendChild(document.createElement("br"));
idlInterface.appendChild(idlDictionary);
}
}, 0);
}
return df;
}
},
Expand All @@ -1052,6 +1041,21 @@ define(
return sanitiseID(id);
},

mergeWebIDL: function (obj) {
if (typeof obj.merge === "undefined" || obj.merge.length === 0) return;
// queue for later execution
setTimeout(function () {
for (var i = 0; i < obj.merge.length; i++) {
var idlInterface = document.querySelector("#idl-def-" + obj.refId)
, idlInterfaceToMerge = document.querySelector("#idl-def-" + obj.merge[i]);
idlInterface.insertBefore(document.createElement("br"), idlInterface.firstChild);
idlInterface.insertBefore(document.createElement("br"), idlInterface.firstChild);
idlInterfaceToMerge.parentNode.parentNode.removeChild(idlInterfaceToMerge.parentNode);
idlInterface.insertBefore(idlInterfaceToMerge, idlInterface.firstChild);
}
}, 0);
},

writeAsWebIDL: function (obj, indent) {
indent++;
var opt = { indent: indent, obj: obj, proc: this };
Expand Down