From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 27 May 2013 22:31:17 +0000 (-0700)
Subject: Merge pull request #1285 from SoftCreatR/cloudflareCDN
X-Git-Tag: 2.0.0_Beta_1~34^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c79978aeeada11deef021c5ce8bc5d091874f605;p=GitHub%2FWoltLab%2FWCF.git

Merge pull request #1285 from SoftCreatR/cloudflareCDN

Added Cloudflare as additional JQuery Source
---

c79978aeeada11deef021c5ce8bc5d091874f605
diff --cc com.woltlab.wcf/template/headInclude.tpl
index 199f089104,eb66b52add..542521b9cf
--- a/com.woltlab.wcf/template/headInclude.tpl
+++ b/com.woltlab.wcf/template/headInclude.tpl
@@@ -18,9 -18,12 +18,12 @@@
  {if JQUERY_SOURCE == 'google'}
  <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js"></script>
  <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.2/jquery-ui.min.js"></script>
 -{else if JQUERY_SOURCE == 'microsoft'}
 +{elseif JQUERY_SOURCE == 'microsoft'}
  <script type="text/javascript" src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-2.0.0.min.js"></script>
  <script type="text/javascript" src="//ajax.aspnetcdn.com/ajax/jquery.ui/1.10.2/jquery-ui.min.js"></script>
+ {elseif JQUERY_SOURCE == 'cloudflare'}
+ <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.0/jquery.min.js"></script>
+ <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.10.2/jquery-ui.min.js"></script>
  {else}
  <script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery.min.js"></script>
  <script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.min.js"></script>