Merge branch 'master' of github.com:developmentseed/mess.js

lib/mess/renderer.js

@@ -254,35 +254,16 @@ mess.Renderer = function Renderer(env) {
             // basically if 'this level' has
             // a filter, then keep going, otherwise
             // this is the final selector.
-            var winners = [];
-            var ancestors = [];
-            var belowThreshold = false;
-            var def;
 
-            while (def = definitions.shift()) {
+            for (var i = 0; i < definitions.length; i++) {
-                if (belowThreshold) {
+                for (var j = i + 1; j < definitions.length; j++) {
-                    ancestors.push(def);
+                    definitions[i].inheritFrom(definitions[j]);
-                } else if (def.selector.specificity()[2] > 0) {
-                    winners.push(def);
-                } else {
-                    winners.push(def);
-                    // nothing below this level will win
-                    belowThreshold = true;
-                }
-            }
-
-            for (var i = 0; i < winners.length; i++) {
-                for (var j = i + 1; j < winners.length; j++) {
-                    winners[i].inheritFrom(winners[j]);
-                }
-                for (var j = 0; j < ancestors.length; j++) {
-                    winners[i].inheritFrom(ancestors[j]);
                 }
             }
 
             if (env.debug) console.warn('Processing time: ' + ((new Date - processTime)) + 'ms');
 
-            return winners;
+            return definitions;
         },
 
         mergeSelectors: function(selectors) {