Some minor fixes and optimizations

diff --git a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
index c600cd8de39295769e0dca843e25f5104497e579..1d7e9be56065fd307ef0590b95c76f0fde783b4c 100644 (file)
--- a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
+++ b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
@@ -194,7 +194,7 @@ requirejs.config({
                {/if}
                
                {* invoke background queue roughly every 10th request *}
-               if (Math.random().toString()[2] === '0') {
+               if (Math.random() < 0.1) {
                        require(['Ajax'], function(Ajax) {
                                // fire and forget background queue perform task
                                Ajax.apiOnce({

diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index cf908d1528895548cb1943e638ebd5111d449240..679a5d61be8ecc3d6c88a22c63abfbeddd2d5471 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -98,6 +98,12 @@
                });
        </script>
        {js application='wcf' lib='jquery'}
+       
+       <script>
+               // prevent jQuery and other libraries from utilizing define()
+               __require_define_amd = define.amd;
+               define.amd = undefined;
+       </script>
        {js application='wcf' lib='jquery-ui'}
        {js application='wcf' lib='jquery-ui' file='touchPunch' bundle='WCF.Combined'}
        {js application='wcf' lib='jquery-ui' file='nestedSortable' bundle='WCF.Combined'}
@@ -105,6 +111,7 @@
        {js application='wcf' file='WCF' bundle='WCF.Combined'}
        {js application='wcf' acp='true' file='WCF.ACP'}
        <script>
+               define.amd = __require_define_amd;
                $.holdReady(true);
                WCF.User.init({$__wcf->user->userID}, '{@$__wcf->user->username|encodeJS}');
        </script>

diff --git a/wcfsetup/install/files/lib/system/template/plugin/JsFunctionTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/JsFunctionTemplatePlugin.class.php
index 6091ac5cb25c224fd5bef0b0b43bee0fc74562fc..3c1cd1a3805c2a681fb76e1a3d94accebfa8118a 100644 (file)
--- a/wcfsetup/install/files/lib/system/template/plugin/JsFunctionTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/JsFunctionTemplatePlugin.class.php
@@ -73,11 +73,11 @@ class JsFunctionTemplatePlugin implements IFunctionTemplatePlugin {
                        $src .= $tagArgs['file'];
                }
                
-               if (in_array($src, $this->includedFiles)) {
+               if (isset($this->includedFiles[$src])) {
                        return '';
                }
                
-               $this->includedFiles[] = $src;
+               $this->includedFiles[$src] = true;
                $src .= (!ENABLE_DEBUG_MODE ? '.min' : '') . '.js?v=' . LAST_UPDATE_TIME;
                
                $relocate = !RequestHandler::getInstance()->isACPRequest() && (!isset($tagArgs['core']) || $tagArgs['core'] !== 'true');