diff options
| author | Michał Gołębiowski-Owczarek <m.goleb@gmail.com> | 2019-04-17 19:56:25 +0200 |
|---|---|---|
| committer | Michał Gołębiowski-Owczarek <m.goleb@gmail.com> | 2019-04-17 19:58:20 +0200 |
| commit | 0d4af5293449722fe873bc1a4b462a857dbbe58e (patch) | |
| tree | c117e81016e316538c10b5c53cef8ebf1095e5eb /src | |
| parent | 22caea8149fc1049ac05b9fab8242a07f25a580c (diff) | |
| download | jquery-0d4af5293449722fe873bc1a4b462a857dbbe58e.tar.gz jquery-0d4af5293449722fe873bc1a4b462a857dbbe58e.zip | |
Build: Fix unresolved jQuery reference in finalPropName
Also, prevent further similar breakages by changing our ESLint configuration
to disallow relying on a global jQuery object in AMD modules.
(cherry-picked from 874030583c9b94603de467124420e6c7a1c3c8ac)
Fixes gh-4358
Closes gh-4361
Diffstat (limited to 'src')
| -rw-r--r-- | src/.eslintrc.json | 11 | ||||
| -rw-r--r-- | src/css/finalPropName.js | 5 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/.eslintrc.json b/src/.eslintrc.json index 2083914bd..3d0ca185a 100644 --- a/src/.eslintrc.json +++ b/src/.eslintrc.json @@ -3,7 +3,12 @@ "extends": "../.eslintrc-browser.json", - "globals": { - "jQuery": true - } + "overrides": [ + { + "files": "wrapper.js", + "globals": { + "jQuery": false + } + } + ] } diff --git a/src/css/finalPropName.js b/src/css/finalPropName.js index e5c77b0b2..352d18a27 100644 --- a/src/css/finalPropName.js +++ b/src/css/finalPropName.js @@ -1,4 +1,7 @@ -define( [ "../var/document" ], function( document ) { +define( [ + "../var/document", + "../core" +], function( document, jQuery ) { "use strict"; |