From ad287573389b9d9c657946d6c42b39d47ffd429f Mon Sep 17 00:00:00 2001 From: Lee Bradley Date: Fri, 24 Feb 2017 11:08:52 +0000 Subject: [PATCH] Remove `Requirements::javascript()` for Framework src JS As jQuery is bundled in the frameworks vendor.js having these calls causes a duplicate of the jQuery library This also means plugins link with the wrong library etc. Noticed with `jQuery.dialog()` from a Page edit screen going to an associated DataObject edit screen --- src/StringTagField.php | 2 -- src/TagField.php | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/StringTagField.php b/src/StringTagField.php index 8c1cd22..6bab71e 100644 --- a/src/StringTagField.php +++ b/src/StringTagField.php @@ -153,8 +153,6 @@ class StringTagField extends DropdownField Requirements::css(TAG_FIELD_DIR . '/css/select2.min.css'); Requirements::css(TAG_FIELD_DIR . '/css/TagField.css'); - Requirements::javascript(ADMIN_THIRDPARTY_DIR . '/jquery/jquery.js'); - Requirements::javascript(ADMIN_THIRDPARTY_DIR . '/jquery-entwine/dist/jquery.entwine-dist.js'); Requirements::javascript(TAG_FIELD_DIR . '/js/select2.js'); Requirements::javascript(TAG_FIELD_DIR . '/js/TagField.js'); diff --git a/src/TagField.php b/src/TagField.php index 5727d84..cd55a9d 100644 --- a/src/TagField.php +++ b/src/TagField.php @@ -201,8 +201,6 @@ class TagField extends DropdownField Requirements::css(TAG_FIELD_DIR . '/css/select2.min.css'); Requirements::css(TAG_FIELD_DIR . '/css/TagField.css'); - Requirements::javascript(ADMIN_THIRDPARTY_DIR . '/jquery/jquery.js'); - Requirements::javascript(ADMIN_THIRDPARTY_DIR . '/jquery-entwine/dist/jquery.entwine-dist.js'); Requirements::javascript(TAG_FIELD_DIR . '/js/select2.js'); Requirements::javascript(TAG_FIELD_DIR . '/js/TagField.js');