浏览代码

Merge pull request #198 from javiertury/fix-undefined-cdn

Fix #197 tarteaucitronForceCDN always defined
Amauri CHAMPEAUX 6 年之前
父节点
当前提交
0d92b06c2f
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      tarteaucitron.js

+ 2 - 1
tarteaucitron.js

@@ -3,7 +3,8 @@
 // define correct path for files inclusion
 // define correct path for files inclusion
 var scripts = document.getElementsByTagName('script'),
 var scripts = document.getElementsByTagName('script'),
     path = scripts[scripts.length - 1].src.split('?')[0],
     path = scripts[scripts.length - 1].src.split('?')[0],
-    cdn = (tarteaucitronForceCDN === undefined) ? path.split('/').slice(0, -1).join('/') + '/' : tarteaucitronForceCDN,
+    tarteaucitronForceCDN = (tarteaucitronForceCDN === undefined) ? '' : tarteaucitronForceCDN,
+    cdn = (tarteaucitronForceCDN === '') ? path.split('/').slice(0, -1).join('/') + '/' : tarteaucitronForceCDN,
     alreadyLaunch = (alreadyLaunch === undefined) ? 0 : alreadyLaunch,
     alreadyLaunch = (alreadyLaunch === undefined) ? 0 : alreadyLaunch,
     tarteaucitronForceLanguage = (tarteaucitronForceLanguage === undefined) ? '' : tarteaucitronForceLanguage,
     tarteaucitronForceLanguage = (tarteaucitronForceLanguage === undefined) ? '' : tarteaucitronForceLanguage,
     tarteaucitronForceExpire = (tarteaucitronForceExpire === undefined) ? '' : tarteaucitronForceExpire,
     tarteaucitronForceExpire = (tarteaucitronForceExpire === undefined) ? '' : tarteaucitronForceExpire,