De-conflict asset bundles

asset-bundles.json

@@ -2,59 +2,61 @@
     "bundle": {
         "js/admin": {
             "scripts": [
-                "vendor/moment/moment.js",
-                "userfrosting/js/handlebars-helpers.js",
-                "vendor/tablesorter/dist/js/jquery.tablesorter.js",
-                "vendor/tablesorter/dist/js/jquery.tablesorter.widgets.js",
-                "userfrosting/js/tablesorter/widget-sort2Hash.js",
-                "vendor/tablesorter/dist/js/widgets/widget-columnSelector.min.js",
-                "vendor/tablesorter/dist/js/widgets/widget-reflow.min.js",
-                "vendor/tablesorter/dist/js/widgets/widget-pager.min.js",
-                "userfrosting/js/query-string.js",
-                "userfrosting/js/uf-table.js",
-                "avsdev/js/sidebar.js"
-            ]
+                "organisations/js/sidebar.js"
+            ],
+            "options": {
+                "sprinkle": {
+                    "onCollision": "merge"
+                }
+            }
         },
         "js/pages/organisation": {
             "scripts": [
                 "userfrosting/js/widgets/users.js",
-                "avsdev/js/widgets/users.js",
-                "avsdev/js/widgets/organisations.js",
-                "avsdev/js/widgets/members.js",
-                "avsdev/js/pages/organisation.js"
+                "organisations/js/widgets/users.js",
+                "organisations/js/widgets/organisations.js",
+                "organisations/js/widgets/members.js",
+                "organisations/js/pages/organisation.js"
             ]
         },
         "js/pages/organisations": {
             "scripts": [
-                "avsdev/js/widgets/organisations.js",
-                "avsdev/js/pages/organisations.js"
+                "organisations/js/widgets/organisations.js",
+                "organisations/js/pages/organisations.js"
             ]
         },
         "js/pages/user": {
             "scripts": [
-                "userfrosting/js/widgets/users.js",
-                "userfrosting/js/pages/user.js",
-                "avsdev/js/widgets/users.js",
-                "avsdev/js/pages/user.js"
-            ]
+                "organisations/js/widgets/users.js",
+                "organisations/js/pages/user.js"
+            ],
+            "options": {
+                "sprinkle": {
+                    "onCollision": "merge"
+                }
+            }
         },
         "js/pages/users": {
             "scripts": [
-                "userfrosting/js/widgets/users.js",
-                "userfrosting/js/pages/users.js",
-                "avsdev/js/widgets/users.js",
-                "avsdev/js/pages/users.js"
-            ]
+                "organisations/js/widgets/users.js",
+                "organisations/js/pages/users.js",
+                "organisations/js/pages/users.js"
+            ],
+            "options": {
+                "sprinkle": {
+                    "onCollision": "merge"
+                }
+            }
         },
         "css/admin": {
             "styles": [
-                "font-starcraft/css/font-starcraft.css",
-                "vendor/tablesorter/dist/css/theme.bootstrap.min.css",
-                "vendor/tablesorter/dist/css/jquery.tablesorter.pager.min.css",
-                "userfrosting/css/tablesorter-reflow.css",
-                "userfrosting/css/tablesorter-custom.css",
-                "avsdev/css/organisations.css"
-            ]
+                "organisations/css/organisations.css"
+            ],
+            "options": {
+                "sprinkle": {
+                    "onCollision": "merge"
+                }
+            }
         }
     }
 }