diff options
author | William Desportes <williamdes@wdes.fr> | 2021-04-17 01:49:06 +0300 |
---|---|---|
committer | William Desportes <williamdes@wdes.fr> | 2021-04-17 01:53:14 +0300 |
commit | ba35901594676dfe032dc6869db52845c1f03e85 (patch) | |
tree | 7c4a68217b650a1e31b3a3320df070375f3f3df0 /scripts | |
parent | 3fb08c3208c06452fb72f69b36fd6393acffad4c (diff) | |
parent | fe306b28ee24ff17cd41adbcda373fab09591a29 (diff) |
Merge branch 'origin/QA_5_1' into master
Signed-off-by: William Desportes <williamdes@wdes.fr>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/sync-js-vendor-files.sh | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/scripts/sync-js-vendor-files.sh b/scripts/sync-js-vendor-files.sh index 14e9a34116..285ce76690 100755 --- a/scripts/sync-js-vendor-files.sh +++ b/scripts/sync-js-vendor-files.sh @@ -40,28 +40,7 @@ echo 'Updating jquery-mousewheel' cp ./node_modules/jquery-mousewheel/jquery.mousewheel.js ./js/vendor/jquery/jquery.mousewheel.js echo 'Updating jquery-ui' cp ./node_modules/jquery-ui-dist/jquery-ui.min.js ./js/vendor/jquery/jquery-ui.min.js -echo 'Updating jquery.event.drag' -cp ./node_modules/jquery.event.drag/jquery.event.drag.js ./js/vendor/jquery/jquery.event.drag-2.2.js # https://github.com/devongovett/jquery.event.drag/commit/2db3b7865f31eee6a8145532554f8b02210180bf#diff-ab8497cedd384270de86ee2e9f06530e -echo 'Patching jquery.event.drag to be jquery init compatible' -echo '--- js/vendor/jquery/jquery.event.drag-2.2.js 2020-04-18 16:43:43.822208181 +0200 -+++ js/vendor/jquery/jquery.event.drag-2.2.js 2020-04-18 16:44:29.342750892 +0200 -@@ -7,7 +7,7 @@ - // Updated: 2012-05-21 - // REQUIRES: jquery 1.7.x - --module.exports = function( $ ){ -+;(function( $ ){ - // add the jquery instance method - $.fn.drag = function( str, arg, opts ){ - // figure out the event type -@@ -397,4 +397,4 @@ - - // share the same special event configuration with related events... - $special.draginit = $special.dragstart = $special.dragend = drag; --}; -+})( jQuery ); -' | patch --strip=0 echo 'Updating jquery-validation' cp ./node_modules/jquery-validation/dist/jquery.validate.js ./js/vendor/jquery/jquery.validate.js cp ./node_modules/jquery-validation/dist/additional-methods.js ./js/vendor/jquery/additional-methods.js |