Merge branch 'Bootstrap' into 'master'

Bootstrap

See merge request nobody42/localcdn!1

core/files.js

@@ -66,6 +66,14 @@ var files = {
         'resources/backbone.js/1.2.2/backbone-min.jsm': true,
         'resources/backbone.js/1.2.3/backbone-min.jsm': true,
         
+        // Bootstrap.js
+        'resources/bootstrap.js/4.3.1/bootstrap.min.jsm': true,
+        'resources/bootstrap.js/4.4.1/bootstrap.min.jsm': true,
+
+        // Bootstrap.css
+        'resources/bootstrap.css/4.3.1/bootstrap.min.cssm': true,
+        'resources/bootstrap.css/4.4.1/bootstrap.min.cssm': true,
+
         // Dojo
         'resources/dojo/1.4.1/dojo/dojo.jsm': true,
         'resources/dojo/1.4.5/dojo/dojo.jsm': true,

core/mappings.js

@@ -289,6 +289,13 @@ var mappings = {
             'underscore.js/{version}/underscore-min.': resources.underscore,
             'webfont/{version}/webfontloader.': resources.webfont
         }
+    },
+    // StackPath BootstrapCDN
+    'stackpath.bootstrapcdn.com': {
+        '/bootstrap/': {
+            '{version}/js/bootstrap.min.js': resources.bootstrapJS,
+            '{version}/css/bootstrap.min.css': resources.bootstrapCSS
+        }
     }
 };
 

core/resources.js

@@ -29,6 +29,16 @@ var resources = {
         'path': 'resources/backbone.js/{version}/backbone-min.jsm',
         'type': 'application/javascript'
     },
+    // Bootstrap.js
+    'bootstrapJS': {
+        'path': 'resources/bootstrap.js/{version}/bootstrap.min.jsm',
+        'type': 'application/javascript'
+    },
+    // Bootstrap.css
+    'bootstrapCSS': {
+        'path': 'resources/bootstrap.css/{version}/bootstrap.min.cssm',
+        'type': 'text/css'
+    },
     // Dojo
     'dojo': {
         'path': 'resources/dojo/{version}/dojo/dojo.jsm',

manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "LocalCDN (fork from Decentraleyes)",
-  "version": "2.0.15",
+  "version": "2.0.16",
 
   "author": "nobody",
 

modules/internal/helpers.js

@@ -174,6 +174,8 @@ helpers.determineCdnName = function (domainName) {
         return 'Geekzu Public Service [Mirror]';
     case 'ajax.proxy.ustclug.org':
         return 'USTC Linux User Group [Mirror]';
+    case 'stackpath.bootstrapcdn.com':
+        return 'StackPath BootstrapCDN';
     default:
         return 'Unknown';
     }
@@ -211,6 +213,10 @@ helpers.determineResourceName = function (filename) {
         return 'Underscore.js';
     case 'webfont.jsm':
         return 'Web Font Loader';
+    case 'bootstrap.min.cssm':
+        return 'Bootstrap CSS';
+    case 'bootstrap.min.jsm':
+        return 'Bootstrap JS';
     default:
         return 'Unknown';
     }