Changeset 1155

Timestamp:

10/08/06 09:18:22 (2 years ago)

Author:

therve@gmail.com

Message:

Syntax cleaning

Files:

• mochikit/branches/selector/MochiKit/Selector.js (modified) (11 diffs)

mochikit/branches/selector/MochiKit/Selector.js

@@ -24 +24 @@
-    this.expression = expression.toString().replace(/(^\s+|\s+$)/g, '');
-    this.parseExpression();
-    
+
-};
-
-MochiKit.Selector.Selector.prototype = {
-
+
-    __class__: MochiKit.Selector.Selector,
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-        var params = this.params, expr = this.expression, match, modifier, clause, rest;
@@ -43 +47 @@
-        }
-
-
+
+
+
-
-        while (match = expr.match(/^([^a-z0-9_-])?([a-z0-9_-]+(?:\([^)]*\))?)(.*)/i)) {
-            modifier = match[1], clause = match[2], rest = match[3];
-            switch (modifier) {
-
-
-
+
+
+
+
+
+
+
+
+
-                case '':
-
-
+
+
+
+
+
-            }
-            expr = rest;
-        }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        function childElements(element) {
-
-
-
-
+ 
+
+
+ {
-            conditions.push('true');
-
+
+
-            conditions.push('element.id == ' + repr(clause));
-
+
+
-            conditions.push('element.tagName.toUpperCase() == ' + repr(clause));
-
-
+
+
+
-                conditions.push('hasElementClass(element, ' + repr(clause[i]) + ')');
-
+
+
+
-            for (var i = 0; i < clause.length; i++) {
-                var match = clause[i].match(/^([^(]+)(?:\((.*)\))?$/);
-
+
+
-                switch (pseudoClass) {
-                    case 'root':
@@ -89 +114 @@
-                    case 'nth-last-of-type':
-                        match = pseudoClassArgument.match(/^((?:(\d+)n\+)?(\d+)|odd|even)$/);
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        break;
-                    case 'first-child':
@@ -135 +169 @@
-                }
-            }
+        }
-        if (clause = params.attributes) {
-
+ 
-                var value = 'element.getAttribute(' + repr(attribute.name) + ')';
-
+ 
-                    return value + ' && ' + value + '.split(' + repr(delimiter) + ')';
-                }
-
-                switch (attribute.operator) {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    case '':
-
-
+
+
+
+
+
-                }
-            }, clause);
@@ -161 +213 @@
-        return conditions.join(' && ');
-    },
-
-
+
+ 
-        this.match = new Function('element', 'if (!element.tagName) return false; \
-                return ' + this.buildMatchExpression());
-    },
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if (a) {
-
+MochiKit.Base.
-            return ((actualIndex + 1 - b) / a) % 1 == 0;
-        } else {
-
-
-
-
-
+MochiKit.Base.
+
+
+
+ 
-        var element;
-
-
-
+
+
+
+
+
-        function inScope(element, scope) {
-
+ {
-                return MochiKit.DOM.isChildNode(element, scope);
-else if (axis == ">")
+} else if (axis == ">") {
-                return element.parentNode == scope;
-else if (axis == "+")
+} else if (axis == "+") {
-                return element.previousSibling == scope;
-
+} 
-                while (element.previousSibling) {
-                    if (element.previousSibling == scope) return true;
@@ -202 +264 @@
-        }
-
-
-
-
+ {
+ {
+ {
-                    return [element];
+                }
+            }
+        }
-
-        function nextSiblingElement(node) {
-            node = node.nextSibling;
-
+ {
-                node = node.nextSibling;
+            }
-            return node;
-        }
@@ -217 +283 @@
-            scope = (scope || document).getElementsByTagName(this.params.tagName || '*');
-        } else if (axis == ">") {
-
-
+
+
+
+
+
+
-        } else if (axis == "+") {
-
+
+
+
-            scope = nextSiblingElement(scope) && [nextSiblingElement(scope)];
-        } else if (axis == "~") {
-
+
+
+
-            var newscope = new Array();
-            while (nextSiblingElement(scope)) {
@@ -231 +305 @@
-            scope = newscope;
-        }
-
-
+
+
+
+
-
-        var results = [];
-
-
+ {
+ {
-                results.push(element);
+            }
+        }
-
-        return results;
-    },
-
-
+ 
-        return this.expression;
-    }
-
+
-};
-
-MochiKit.Base.update(MochiKit.Selector, {
-
+ 
-        var selector = new Selector(expression);
-        return elements.select(selector.match.bind(selector)).collect(Element.extend);
-    },
-
-
-
+
+
+
+
+
+
-        return Selector.matchElements(elements, expression || '*')[index || 0];
-    },
-
-
-(expression)
+
+ 
+ (expression) 
-            var nextScope = "";
-(results, expr)
+ (results, expr) 
-                if (match = expr.match(/^[>+~]$/)) {
-                    nextScope = match[0];
@@ -268 +349 @@
-                } else {
-                    var selector = new MochiKit.Selector.Selector(expr);
-(elements, result)
+ (elements, result) 
-                        return extend(elements, selector.findElements(result || element, nextScope));
-                    }, results, []);
@@ -277 +358 @@
-        }, expressions));
-    }
-
+
-});
-
@@ -283 +364 @@
-    return MochiKit.Selector.findChildElements(document, arguments);
-}
+