gorhill#14 that's a horrible diff

geoffdutton · Dec 10, 2017 · 127ff13 · 127ff13
1 parent 7a32942
commit 127ff13
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/js/storage.js b/src/js/storage.js
@@ -879,17 +879,25 @@
         }
         onDone();
     };
-
-    var onResourcesLoaded = function(details) {
+
+    // Patch 2017-12-09: Add nano-resources
+    var onNanoResourcesLoaded = function(details) {
         if ( details.content !== '' ) {
-            content = details.content;
+            content += '\n\n' + details.content;
         }
         if ( µb.hiddenSettings.userResourcesLocation === 'unset' ) {
             return onDone();
         }
         µb.assets.fetchText(µb.hiddenSettings.userResourcesLocation, onUserResourcesLoaded);
     };
 
+    var onResourcesLoaded = function(details) {
+        if ( details.content !== '' ) {
+            content = details.content;
+        }
+        nano.assets.get('nano-resources', onNanoResourcesLoaded);
+    };
+
     this.assets.get('ublock-resources', onResourcesLoaded);
 };