Skip to content

Commit 09ff603

Browse files
committed
Install block-ui@2.70.1 from npm
malsup/blockui#114
1 parent 1ffbd1b commit 09ff603

5 files changed

Lines changed: 12 additions & 60 deletions

File tree

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@
9494
"balbuf/composer-git-merge-driver": "^1.1",
9595
"bgrins/filereader.js": "*",
9696
"components/jquery": "~1.8.3",
97-
"components/jquery-blockui": "*@dev",
9897
"components/jquery-cookie": "~1.4.1",
9998
"components/jquery-datatables": "~1.10.4",
10099
"components/jqueryui": "1.11.*",

composer.lock

Lines changed: 1 addition & 57 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"node": "^8.10.0||^10"
1414
},
1515
"devDependencies": {
16+
"block-ui": "^2.70.1",
1617
"chosen-js": "^1.8.7",
1718
"cross-env": "^5.1",
1819
"drmonty-garlicjs": "^1.2.3",
@@ -22,6 +23,7 @@
2223
"sass-loader": "^8.0.2"
2324
},
2425
"resolutions": {
26+
"block-ui/jquery": "1.9.x",
2527
"drmonty-garlicjs/jquery": "1.9.x"
2628
}
2729
}

webpack.mix.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ mix.scripts([
3636
mix.scripts([
3737
'node_modules/jquery/jquery.js',
3838
'node_modules/jquery/jquery-migrate.js',
39-
'htdocs/components/jquery-blockui/jquery.blockUI.js',
39+
'node_modules/block-ui/jquery.blockUI.js',
4040
'htdocs/components/form/src/jquery.form.js',
4141
'htdocs/components/jquery-cookie/jquery.cookie.js',
4242
'htdocs/components/jquery-ui/ui/core.js',

yarn.lock

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1270,6 +1270,13 @@ bindings@^1.5.0:
12701270
dependencies:
12711271
file-uri-to-path "1.0.0"
12721272

1273+
block-ui@^2.70.1:
1274+
version "2.70.1"
1275+
resolved "https://registry.yarnpkg.com/block-ui/-/block-ui-2.70.1.tgz#c862d64ee6288fb78123377c6680bc7ab262103f"
1276+
integrity sha1-yGLWTuYoj7eBIzd8ZoC8erJiED8=
1277+
dependencies:
1278+
jquery ">=1.7.x"
1279+
12731280
bluebird@^3.1.1, bluebird@^3.5.5:
12741281
version "3.7.2"
12751282
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
@@ -3749,7 +3756,7 @@ jest-worker@^25.1.0:
37493756
merge-stream "^2.0.0"
37503757
supports-color "^7.0.0"
37513758

3752-
jquery@1.9.x, jquery@>=1.8:
3759+
jquery@1.9.x, jquery@>=1.7.x, jquery@>=1.8:
37533760
version "1.9.1"
37543761
resolved "https://registry.yarnpkg.com/jquery/-/jquery-1.9.1.tgz#e4cd4835faaefbade535857613c0fc3ff2adaf34"
37553762
integrity sha1-5M1INfqu+63lNYV2E8D8P/KtrzQ=

0 commit comments

Comments
 (0)