From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 1 Apr 2018 09:33:49 +0000 (+0200)
Subject: Removed jQuery CDN
X-Git-Tag: 2.1.21~14
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=93702b3d0763e9acb27725ae1ef9dcecc6b3ed72;p=GitHub%2FWoltLab%2FWCF.git

Removed jQuery CDN
---

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 1798966edf..a459e600db 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -683,12 +683,9 @@ imagick:wcf.acp.option.image_adapter_type.imagick]]>
 			<!-- general.system.jquery -->
 			<option name="jquery_source">
 				<categoryname>general.system.jquery</categoryname>
-				<optiontype>radioButton</optiontype>
-				<defaultvalue>google</defaultvalue>
-				<selectoptions>local:wcf.acp.option.jquery_source.local
-google:wcf.acp.option.jquery_source.google
-microsoft:wcf.acp.option.jquery_source.microsoft
-cloudflare:wcf.acp.option.jquery_source.cloudflare</selectoptions>
+				<optiontype>text</optiontype>
+				<defaultvalue>local</defaultvalue>
+				<hidden>1</hidden>
 			</option>
 			<!-- /general.system.jquery -->
 			
diff --git a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
index dacb6f49e7..4def956d5f 100644
--- a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
+++ b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
@@ -12,29 +12,8 @@
 	var URL_LEGACY_MODE = {if URL_LEGACY_MODE}true{else}false{/if};
 	//]]>
 </script>
-{if JQUERY_SOURCE == 'google'}
-<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
-<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
-{elseif JQUERY_SOURCE == 'microsoft'}
-<script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-2.1.3{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
-<script src="//ajax.aspnetcdn.com/ajax/jquery.ui/1.11.2/jquery-ui{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
-{elseif JQUERY_SOURCE == 'cloudflare'}
-<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.2/jquery-ui{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
-{else}
 <script src="{@$__wcf->getPath()}js/3rdParty/jquery{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@LAST_UPDATE_TIME}"></script>
 <script src="{@$__wcf->getPath()}js/3rdParty/jquery-ui{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@LAST_UPDATE_TIME}"></script>
-{/if}
-{if JQUERY_SOURCE != 'local'}
-<script>
-	//<![CDATA[
-	if (!window.jQuery) {
-		document.write('<script src="{@$__wcf->getPath()}js/3rdParty/jquery.min.js?v={@LAST_UPDATE_TIME}"><\/script>');
-		document.write('<script src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.min.js?v={@LAST_UPDATE_TIME}"><\/script>');
-	}
-	//]]>
-</script>
-{/if}
 
 {if ENABLE_DEBUG_MODE}
 <script src="{@$__wcf->getPath()}js/3rdParty/jquery.ui.touch-punch{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@LAST_UPDATE_TIME}"></script>
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index f32c0e0070..7a7b39c182 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -821,11 +821,6 @@
 		<item name="wcf.acp.option.external_link_rel_nofollow.description"><![CDATA[Das Attribut „rel="nofollow"“ weist Suchmaschinen an, einen bestimmten Link auf einer Seite zu ignorieren.]]></item>
 		<item name="wcf.acp.option.external_link_target_blank"><![CDATA[Externe Links in neuem Fenster öffnen]]></item>
 		<item name="wcf.acp.option.external_link_target_blank.description"><![CDATA[Setzt das Attribut „target="_blank"“ auf externe Links und weist den Browser dadurch an, einen aufgerufenen Link in einem neuen Browser-Fenster zu öffnen.]]></item>
-		<item name="wcf.acp.option.jquery_source"><![CDATA[jQuery-Quelle]]></item>
-		<item name="wcf.acp.option.jquery_source.local"><![CDATA[lokale Version]]></item>
-		<item name="wcf.acp.option.jquery_source.google"><![CDATA[Google Hosted Libraries CDN]]></item>
-		<item name="wcf.acp.option.jquery_source.microsoft"><![CDATA[Microsoft Ajax CDN]]></item>
-		<item name="wcf.acp.option.jquery_source.cloudflare"><![CDATA[CloudFlare CDN]]></item>
 		<item name="wcf.acp.option.enable_benchmark"><![CDATA[Benchmark aktivieren]]></item>
 		<item name="wcf.acp.option.enable_benchmark.description"><![CDATA[Diese Option sollte im Live-Betrieb abgeschaltet werden.]]></item>
 		<item name="wcf.acp.option.category.general.system.packageServer"><![CDATA[Update-Server]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 4aa2cb3b78..2805cf23f6 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -819,11 +819,6 @@
 		<item name="wcf.acp.option.external_link_rel_nofollow.description"><![CDATA[The attribute “rel="nofollow"” tells search engines to disregard external links.]]></item>
 		<item name="wcf.acp.option.external_link_target_blank"><![CDATA[Open external links in a new window]]></item>
 		<item name="wcf.acp.option.external_link_target_blank.description"><![CDATA[Appends the attribute “target="_blank"” to external links, causing the user’s browser to open the link in a new window.]]></item>
-		<item name="wcf.acp.option.jquery_source"><![CDATA[jQuery Source]]></item>
-		<item name="wcf.acp.option.jquery_source.local"><![CDATA[Use Local Version]]></item>
-		<item name="wcf.acp.option.jquery_source.google"><![CDATA[Use Google Hosted Libraries CDN]]></item>
-		<item name="wcf.acp.option.jquery_source.microsoft"><![CDATA[Use Microsoft Ajax CDN]]></item>
-		<item name="wcf.acp.option.jquery_source.cloudflare"><![CDATA[Use CloudFlare CDN]]></item>
 		<item name="wcf.acp.option.enable_benchmark"><![CDATA[Enable benchmark]]></item>
 		<item name="wcf.acp.option.enable_benchmark.description"><![CDATA[It is strongly recommended to disable this option in production environments.]]></item>
 		<item name="wcf.acp.option.category.general.system.packageServer"><![CDATA[Update Server]]></item>