github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 11:44:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: updates jquery-color to prevent it to pull old jquery version (#7857)

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2019-07-04 15:03:21 +02:00 committed by GitHub
parent bfbd97d3b5
commit e9bb13c630
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 621 additions and 616 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tasks/javascript.rake
View File

@ -58,7 +58,7 @@ task 'javascript:update' do
source: 'jquery.autoellipsis/src/jquery.autoellipsis.js',
destination: 'jquery.autoellipsis-1.0.10.js'
}, {
source: 'jquery-color/jquery.color.js'
source: 'jquery-color/dist/jquery.color.js'
}, {
source: 'jquery.cookie/jquery.cookie.js'
}, {

2
package.json
View File

@ -17,7 +17,7 @@
"htmlparser": "https://github.com/tautologistics/node-htmlparser",
"intersection-observer": "^0.5.1",
"jquery": "3.4.1",
"jquery-color": "1.0.0",
"jquery-color": "3.0.0-alpha.1",
"jquery-resize": "https://github.com/cowboy/jquery-resize/",
"jquery-tags-input": "1.3.5",
"jquery.autoellipsis": "https://github.com/pvdspek/jquery.autoellipsis",

1218
vendor/assets/javascripts/jquery.color.js vendored
View File

File diff suppressed because it is too large Load Diff

15
yarn.lock
View File

@ -1346,17 +1346,10 @@ isobject@^3.0.0, isobject@^3.0.1:
resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
jQuery@latest:
version "1.7.4"
resolved "https://registry.yarnpkg.com/jQuery/-/jQuery-1.7.4.tgz#f32dc5c85a7044ee864b4443b9ee45f9478ba137"
integrity sha1-8y3FyFpwRO6GS0RDue5F+UeLoTc=
jquery-color@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/jquery-color/-/jquery-color-1.0.0.tgz#003aba988a6f2d21d963d1f2eeeb6cdbc80471f1"
integrity sha1-ADq6mIpvLSHZY9Hy7uts28gEcfE=
dependencies:
jQuery latest
jquery-color@3.0.0-alpha.1:
version "3.0.0-alpha.1"
resolved "https://registry.yarnpkg.com/jquery-color/-/jquery-color-3.0.0-alpha.1.tgz#0c00ed91251bac45fc4ff3143939f434ef46d188"
integrity sha512-UjsdBsWuehWLfnXfL4JZtxGbRB2eUz6Rhn3qxBKaVR3Qwm7fQlY1y/Va0o7GzDwGJnOvYKc3H+i2k7bC1yGcJg==
"jquery-resize@https://github.com/cowboy/jquery-resize/":
version "0.0.0"