Yuki Takei 6 лет назад
Родитель
Сommit
426ca7d807
2 измененных файлов с 7 добавлено и 7 удалено
  1. 6 6
      src/lib/service/cdn-resources-service.js
  2. 1 1
      src/server/util/swigFunctions.js

+ 6 - 6
src/lib/service/cdn-resources-service.js

@@ -19,15 +19,15 @@ class CdnResourcesService {
     this.loadManifests();
   }
 
+  get noCdn() {
+    return envUtils.toBoolean(process.env.NO_CDN);
+  }
+
   loadManifests() {
     this.cdnManifests = require('@root/resource/cdn-manifests');
     this.logger.debug('manifest data loaded : ', this.cdnManifests);
   }
 
-  noCdn() {
-    return envUtils.toBoolean(process.env.NO_CDN);
-  }
-
   getScriptManifestByName(name) {
     const manifests = this.cdnManifests.js
       .filter((manifest) => { return manifest.name === name });
@@ -91,7 +91,7 @@ class CdnResourcesService {
 
     // TODO process integrity
 
-    const url = this.noCdn()
+    const url = this.noCdn
       ? `${urljoin(cdnLocalScriptWebRoot, manifest.name)}.js`
       : manifest.url;
     return `<script src="${url}" ${attrs.join(' ')}></script>`;
@@ -130,7 +130,7 @@ class CdnResourcesService {
 
     // TODO process integrity
 
-    const url = this.noCdn()
+    const url = this.noCdn
       ? `${urljoin(cdnLocalStyleWebRoot, manifest.name)}.css`
       : manifest.url;
 

+ 1 - 1
src/server/util/swigFunctions.js

@@ -73,7 +73,7 @@ module.exports = function(crowi, app, req, locals) {
   locals.pathUtils = pathUtils;
 
   locals.noCdn = function() {
-    return cdnResourcesService.noCdn();
+    return cdnResourcesService.noCdn;
   };
 
   locals.cdnScriptTag = function(name) {