@@ -1,3 +1,5 @@
+* Fix issue where Opera gets confused by complex selectors in $$. [Paulo Pereira, Andrea Baron, jddalton]
+
* Fix for IE7 to access local files via Ajax.Request. Closes #8259. [hagen.seifert, jddalton]
* Ensure CSS files have loaded before firing the dom:loaded event. [Diego Perini, jddalton]
CHANGELOG
@@ -22,6 +22,10 @@ var Selector = Class.create({
if (!Prototype.BrowserFeatures.XPath) return false;
var e = this.expression;
+
+ // Opera's XPath engine breaks down when selectors are too complex
+ if (Prototype.Browser.Opera)
+ return false;
// Safari 3 chokes on :*-of-type and :empty
if (Prototype.Browser.WebKit &&
@@ -32,7 +36,7 @@ var Selector = Class.create({
// the "checked" property from DOM nodes
if ((/(\[[\w-]*?:|:checked)/).test(e))
return false;
-
+
return true;
},
@@ -461,9 +465,18 @@ Object.extend(Selector, {
id: function(nodes, root, id, combinator) {
var targetNode = $(id), h = Selector.handlers;
if (!targetNode) {
- // IE doesn't find elements by ID if they're not attached to the
- // document.
- if (Prototype.Browser.IE && (root.sourceIndex < 1 || root === document)) {
+ var needsToSearch = false;
+ // IE and Opera don't find elements by ID if they're not attached
+ // to the document.
+ if (Prototype.Browser.IE && (root.sourceIndex < 1 ||
+ root === document)) {
+ needsToSearch = true;
+ } else if (Prototype.Browser.Opera &&
+ (root.compareDocumentPosition(document) & 1) === 1) {
+ needsToSearch = true;
+ }
+
+ if (needsToSearch) {
var nodes = root.getElementsByTagName('*');
for (var i = 0, node; node = nodes[i]; i++) {
if (node.id === id) {
src/selector.js
@@ -379,8 +379,8 @@ new Test.Unit.Runner({
var wrapper = new Element("div");
wrapper.update("<table><tr><td id='myTD'></td></tr></table>");
new Selector('[id=myTD]').findElements(wrapper);
- this.assertNotNullOrUndefined(wrapper.select('[id=myTD]')[0]);
- this.assertNotNullOrUndefined(wrapper.select('td')[0]);
- this.assertNotNullOrUndefined(wrapper.select('#myTD')[0]);
+ this.assertNotNullOrUndefined(wrapper.select('[id=myTD]')[0], "[id=myTD]");
+ this.assertNotNullOrUndefined(wrapper.select('td')[0], "td");
+ this.assertNotNullOrUndefined(wrapper.select('#myTD')[0], "#myTD");
}
});
\ No newline at end of file
test/unit/selector_test.js
69a4e3f5c1f0b1d1656e6ba6ce8f3c4f0dc29e66
Andrew Dupont
prototype@andrewdupont.net
http://github.com/sstephenson/prototype/commit/6cdef71df792ae67ea1ecb4e69c64db5a3d03a0c
6cdef71df792ae67ea1ecb4e69c64db5a3d03a0c
2008-06-24T11:29:37-07:00
2008-06-24T11:29:37-07:00
Fix issue where Opera gets confused by complex selectors in $$. [#157 state:resolved]
168ebc912ee993ee1aa4d0605b9aa0654a6ae647
Andrew Dupont
prototype@andrewdupont.net