Removed jQuery CDN

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 1798966edf32a3a681f694f5199d57193d1d5eb9..a459e600db8d553c97e254ea13d52e092c6b078c 100644 (file)
--- 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 dacb6f49e735ab1a87bb86e4a77f3bac4dd8c83d..4def956d5fa7b648f6ed425c4482a448bc54ba1b 100644 (file)
--- 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 f32c0e00704a6769ce5eb44cd615dde9f7be498a..7a7b39c1826e44bc9ef2383fbdea2034f8e6c6af 100644 (file)
--- 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 4aa2cb3b7838a4a1a7a2cff6f375d886f9d775c7..2805cf23f6dc84b25681d82dff59a8db6bc8f28c 100644 (file)
--- 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>