1 files changed, 11 insertions, 5 deletions

diff --git a/frontend/gamma/js/MochiKit/Selector.js b/frontend/gamma/js/MochiKit/Selector.js
index 6aec892..3187fe9 100644
--- a/frontend/gamma/js/MochiKit/Selector.js
+++ b/frontend/gamma/js/MochiKit/Selector.js
@@ -1,23 +1,23 @@
 /***
 
 MochiKit.Selector 1.5
 
 See <http://mochikit.com/> for documentation, downloads, license, etc.
 
 (c) 2005 Bob Ippolito and others.  All rights Reserved.
 
 ***/
 
-MochiKit.Base._module('Selector', '1.5', ['Base', 'DOM', 'Iter']);
+MochiKit.Base.module(MochiKit, 'Selector', '1.5', ['Base', 'DOM', 'Iter']);
 
 MochiKit.Selector.Selector = function (expression) {
     this.params = {classNames: [], pseudoClassNames: []};
     this.expression = expression.toString().replace(/(^\s+|\s+$)/g, '');
     this.parseExpression();
     this.compileMatcher();
 };
 
 MochiKit.Selector.Selector.prototype = {
     /***
 
     Selector class: convenient object to make CSS selections.
@@ -118,26 +118,26 @@ MochiKit.Selector.Selector.prototype = {
                         match = pseudoClassArgument.match(/^((?:(\d+)n\+)?(\d+)|odd|even)$/);
                         if (!match) {
                             throw "Invalid argument to pseudo element nth-child: " + pseudoClassArgument;
                         }
                         var a, b;
                         if (match[0] == 'odd') {
                             a = 2;
                             b = 1;
                         } else if (match[0] == 'even') {
                             a = 2;
                             b = 0;
                         } else {
-                            a = match[2] && parseInt(match) || null;
-                            b = parseInt(match[3]);
+                            a = match[2] && parseInt(match, 10) || null;
+                            b = parseInt(match[3], 10);
                         }
                         conditions.push('this.nthChild(element,' + a + ',' + b
                                         + ',' + !!pseudoClass.match('^nth-last')    // Reverse
                                         + ',' + !!pseudoClass.match('of-type$')     // Restrict to same tagName
                                         + ')');
                         break;
                     case 'first-child':
                         conditions.push('this.nthChild(element, null, 1)');
                         break;
                     case 'last-child':
                         conditions.push('this.nthChild(element, null, 1, true)');
                         break;
@@ -158,35 +158,35 @@ MochiKit.Selector.Selector.prototype = {
                         break;
                     case 'enabled':
                         conditions.push('(this.isUIElement(element) && element.disabled === false)');
                         break;
                     case 'disabled':
                         conditions.push('(this.isUIElement(element) && element.disabled === true)');
                         break;
                     case 'checked':
                         conditions.push('(this.isUIElement(element) && element.checked === true)');
                         break;
                     case 'not':
                         var subselector = new MochiKit.Selector.Selector(pseudoClassArgument);
-                        conditions.push('!( ' + subselector.buildMatchExpression() + ')')
+                        conditions.push('!( ' + subselector.buildMatchExpression() + ')');
                         break;
                 }
             }
         }
         if (clause = params.attributes) {
             MochiKit.Base.map(function (attribute) {
                 var value = 'MochiKit.DOM.getNodeAttribute(element, ' + repr(attribute.name) + ')';
                 var splitValueBy = function (delimiter) {
                     return value + '.split(' + repr(delimiter) + ')';
-                }
+                };
                 conditions.push(value + ' != null');
                 switch (attribute.operator) {
                     case '=':
                         conditions.push(value + ' == ' + repr(attribute.value));
                         break;
                     case '~=':
                         conditions.push('MochiKit.Base.findValue(' + splitValueBy(' ') + ', ' + repr(attribute.value) + ') > -1');
                         break;
                     case '^=':
                         conditions.push(value + '.substring(0, ' + attribute.value.length + ') == ' + repr(attribute.value));
                         break;
                     case '$=':
@@ -343,24 +343,30 @@ MochiKit.Base.update(MochiKit.Selector, {
     findChildElements: function (element, expressions) {
         element = MochiKit.DOM.getElement(element);
         var uniq = function(arr) {
             var res = [];
             for (var i = 0; i < arr.length; i++) {
                 if (MochiKit.Base.findIdentical(res, arr[i]) < 0) {
                     res.push(arr[i]);
                 }
             }
             return res;
         };
         return MochiKit.Base.flattenArray(MochiKit.Base.map(function (expression) {
+            try {
+                var res = element.querySelectorAll(expression);
+                return Array.prototype.slice.call(res, 0);
+            } catch (ignore) {
+                // No querySelectorAll or extended expression syntax used
+            }
             var nextScope = "";
             var reducer = function (results, expr) {
                 var match = expr.match(/^[>+~]$/);
                 if (match) {
                     nextScope = match[0];
                     return results;
                 } else {
                     var selector = new MochiKit.Selector.Selector(expr);
                     var elements = MochiKit.Iter.reduce(function (elements, result) {
                         return MochiKit.Base.extend(elements, selector.findElements(result || element, nextScope));
                     }, results, []);
                     nextScope = "";