Removing duplicates resources when filtering by context, giving prece…

…dence to duplicates with lower indeces.
YahooArchive · Mar 13, 2014 · 44f8646 · 44f8646
1 parent 46edd6a
commit 44f8646
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/resources.js b/lib/resources.js
@@ -664,13 +664,15 @@ ShakerResources.prototype = {
             if (!bySelector[res.selector]) {
                 bySelector[res.selector] = {};
             }
-            bySelector[res.selector][res.id] = res;
+            // duplicates that come first have higher precedence
+            bySelector[res.selector][res.id] = bySelector[res.selector][res.id] || res;
         }
         for (s = posl.length; s > 0; s -= 1) {
             selector = posl[s - 1];
             for (r in bySelector[selector]) {
                 if (bySelector[selector].hasOwnProperty(r)) {
-                    out[r] = bySelector[selector][r];
+                    // duplicates that come first have higher precedence
+                    out[r] = out[r] || bySelector[selector][r];
                 }
             }
         }
@@ -892,7 +894,7 @@ ShakerResources.prototype = {
             if ((rawResource.source.pkg.name === 'mojito' || rawResource.source.pkg.name === 'mojito-shaker') &&
                     (rawResource.affinity.affinity === 'common' || rawResource.affinity.affinity === 'client') &&
                     rawResource.source.fs.ext === '.js') {
-                self._mojitoResources[rawResource.name] = rawResource;
+                self._mojitoResources[rawResource.name] = self._mojitoResources[rawResource.name] || rawResource;
             }
         }