@@ -32,24 +32,33 @@ authors: local.starSelectsComments = (testNode.getElementsByTagName('*').length > 0); // IE returns closed nodes (EG:"</foo>") for getElementsByTagName('*') - try{ testNode.innerHTML = 'foo</foo>'; local.starSelectsClosed = (testNode.getElementsByTagName('*')[0].nodeName.charAt(0) == '/'); }catch(e){}; - try{ testNode.innerHTML = 'foo</foo>'; local.starSelectsClosedQSA = (testNode.querySelectorAll('*')[0].nodeName.charAt(0) == '/'); }catch(e){}; + try { + testNode.innerHTML = 'foo</foo>'; + local.starSelectsClosed = (testNode.getElementsByTagName('*')[0].nodeName.charAt(0) == '/'); + } catch(e) {}; + try { + testNode.innerHTML = 'foo</foo>'; + local.starSelectsClosedQSA = (testNode.querySelectorAll('*')[0].nodeName.charAt(0) == '/'); + } catch(e) {}; // Safari 3.2 QSA doesnt work with mixedcase on quirksmode - try{ testNode.innerHTML = '<a class="MiXedCaSe"></a>'; local.brokenMixedCaseQSA = !testNode.querySelectorAll('.MiXedCaSe').length; }catch(e){}; + try { + testNode.innerHTML = '<a class="MiXedCaSe"></a>'; + local.brokenMixedCaseQSA = !testNode.querySelectorAll('.MiXedCaSe').length; + } catch(e) {}; - try{ + try { testNode.innerHTML = '<a class="f"></a><a class="b"></a>'; testNode.getElementsByClassName('b').length; testNode.firstChild.className = 'b'; local.cachedGetElementsByClassName = (testNode.getElementsByClassName('b').length != 2); - }catch(e){}; + } catch(e) {}; // getElementById selects name attribute? - try{ + try { testNode.innerHTML = '<a name=idgetsname>'; local.idGetsName = !!(testNode.ownerDocument.getElementById && testNode.ownerDocument.getElementById('idgetsname')); - }catch(e){} + } catch(e) {} root.removeChild(testNode); testNode = null; @@ -78,8 +87,10 @@ authors: } : (root.compareDocumentPosition) ? function(context, node){ return !!(context.compareDocumentPosition(node) & 16); } : function(context, node){ - if (node) while ((node = node.parentNode)){ - if (node === context) return true; + if (node) { + while ((node = node.parentNode)){ + if (node === context) return true; + } } return false; }; @@ -87,10 +98,9 @@ authors: local.collectionToArray = function(node){ return Array.prototype.slice.call(node); }; - try{ + try { local.collectionToArray(root.childNodes); - } - catch(e){ + } catch(e) { local.collectionToArray = function(node){ if (node instanceof Array) return node; var i = node.length, array = new Array(i); @@ -124,7 +134,6 @@ authors: case 'even': parsed = {a: 2, b: 1, special: 'n'}; break; default: parsed = {a: (a - 1), special: 'index'}; } - return (this.cacheNTH[argument] = parsed); }; @@ -242,9 +251,11 @@ authors: }, '>': function(node, tag, id, parts){ // direct children - if ((node = node.firstChild)) do { - if (node.nodeType == 1) this.push(node, tag, id, parts); - } while ((node = node.nextSibling)); + if ((node = node.firstChild)) { + do { + if (node.nodeType == 1) this.push(node, tag, id, parts); + } while ((node = node.nextSibling)); + } }, '!>': function(node, tag, id, parts){ // direct parent (one level) @@ -407,7 +418,7 @@ authors: var document = local.document = (context.ownerDocument || context); local.paranoid = local.document != document; - var parsed, found = append || []; + var i, j, parsed, found = append || []; if (expression == null){ return found; @@ -436,16 +447,21 @@ authors: // disable querySelectorAll for star tags if it's buggy if (local.starSelectsClosedQSA && parsed.simple && !isXML) { parsed.simple = true; - for (var i = 0; i < parsed.expressions.length; i++) - for (var j = 0; j < parsed.expressions[i].length; j++) + for (i = 0; i < parsed.expressions.length; i++) { + for (j = 0; j < parsed.expressions[i].length; j++) { if (parsed.expressions[i][j].tag == '*') parsed.simple = false; + } + } } // querySelectorAll for simple selectors if (parsed.simple && context.querySelectorAll && !isXML && !local.brokenMixedCaseQSA && !Slick.disableQSA){ var nodes; - try { nodes = context.querySelectorAll(expression); } - catch(error) { if (Slick.debug) Slick.debug('QSA Fail ' + expression, error); }; + try { + nodes = context.querySelectorAll(expression); + } catch(error) { + if (Slick.debug) Slick.debug('QSA Fail ' + expression, error); + }; if (nodes){ nodes = local.collectionToArray(nodes); if (!append) return nodes; @@ -460,11 +476,11 @@ authors: if (parsed.length == 1 && expressions[0].length == 1) local.push = local.pushArray; else local.push = local.pushUID; - for (var i = 0; i < expressions.length; i++){ + for (i = 0; i < expressions.length; i++){ var currentExpression = expressions[i]; - for (var j = 0; j < currentExpression.length; j++){ + for (j = 0; j < currentExpression.length; j++){ var currentBit = currentExpression[j]; var combinator = 'combinator:' + currentBit.combinator; @@ -490,10 +506,11 @@ authors: local[combinator](context, tag, id, parts, classes, attributes, pseudos, isXML); } else { var items = current; - if (local[combinator]) + if (local[combinator]) { for (var m = 0, n = items.length; m < n; m++) local[combinator](items[m], tag, id, parts, classes, attributes, pseudos, isXML); - else + } else { if (Slick.debug) Slick.debug("Tried calling non-existant combinator: '" + currentBit.combinator + "'", currentExpression); + } } current = local.found; slick.js f05309dd43cf63d4ef16b8e27f8ef2704da79665 Jan Kassens jan@kassens.net http://github.com/kassens/slick/commit/59ecd5e4fde13dd737198f7548b852788aded668 59ecd5e4fde13dd737198f7548b852788aded668 2009-11-07T07:18:41-08:00 2009-11-07T07:18:41-08:00 code style and jslint warnings fixed a5c47e7c00a4cba505ef11d4b0b4a0fd89298181 Jan Kassens jan@kassens.net