Commit ce50f301 authored by Martyn Smith's avatar Martyn Smith Committed by Martyn Smith
Browse files

Upstream sync

parent f7b3cf8f
......@@ -1145,24 +1145,25 @@ MochiKit.Base.update(MochiKit.Base, {
if (useArrays) {
for (var i = 0; i < pairs.length; i++) {
var pair = pairs[i].split("=");
if (pair.length !== 2) {
var name = decode(pair.shift());
if (!name) {
continue;
}
var name = decode(pair[0]);
var arr = o[name];
if (!(arr instanceof Array)) {
arr = [];
o[name] = arr;
}
arr.push(decode(pair[1]));
arr.push(decode(pair.join("=")));
}
} else {
for (i = 0; i < pairs.length; i++) {
pair = pairs[i].split("=");
if (pair.length !== 2) {
var name = pair.shift();
if (!name) {
continue;
}
o[decode(pair[0])] = decode(pair[1]);
o[decode(name)] = decode(pair.join("="));
}
}
return o;
......
......@@ -1139,7 +1139,9 @@ MochiKit.Base.update(MochiKit.DOM, {
"for": "htmlFor",
"readonly": "readOnly",
"colspan": "colSpan",
"bgcolor": "bgColor"
"bgcolor": "bgColor",
"cellspacing": "cellSpacing",
"cellpadding": "cellPadding"
};
} else {
attributeArray = function (node) {
......
......@@ -292,7 +292,7 @@ MochiKit.Selector.Selector.prototype = {
/** @id MochiKit.Selector.Selector.prototype.isUIElement */
isUIElement: function (element) {
return findValue(['input', 'button', 'select', 'option', 'textarea', 'object'],
return MochiKit.Base.findValue(['input', 'button', 'select', 'option', 'textarea', 'object'],
element.tagName.toLowerCase()) > -1;
},
......@@ -341,7 +341,7 @@ MochiKit.Selector.Selector.prototype = {
}
if (axis == "") {
scope = (scope || currentDocument()).getElementsByTagName(this.params.tagName || '*');
scope = (scope || MochiKit.DOM.currentDocument()).getElementsByTagName(this.params.tagName || '*');
} else if (axis == ">") {
if (!scope) {
throw "> combinator not allowed without preceeding expression";
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment