wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use jquery-ui-dist instead of jquery-ui to resolve an issue with effects

Browse source 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst 2018-12-21 13:30:33 +01:00 committed by Julius Härtl
parent 69410a4f1c
commit 15400fcf7b
No known key found for this signature in database
GPG key ID: 4C614C6ED2CDE6DF
5 changed files with 10 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
core/js/dist/main.js vendored
View file

Binary file not shown.

BIN
core/js/dist/main.js.map vendored
View file

Binary file not shown.

29
core/src/globals.js
View file

@ -22,29 +22,12 @@
import _ from 'underscore'
import $ from 'jquery'
import 'jquery-migrate/dist/jquery-migrate.min'
import 'jquery-ui'
// TODO: remove anything that is not really used
import 'jquery-ui/ui/widgets/accordion'
import 'jquery-ui/ui/widgets/autocomplete'
import 'jquery-ui/ui/widgets/button'
import 'jquery-ui/ui/widgets/checkboxradio'
import 'jquery-ui/ui/widgets/controlgroup'
import 'jquery-ui/ui/widgets/datepicker'
import 'jquery-ui/ui/widgets/dialog'
import 'jquery-ui/ui/widgets/draggable'
import 'jquery-ui/ui/widgets/droppable'
import 'jquery-ui/ui/widgets/menu'
import 'jquery-ui/ui/widgets/mouse'
import 'jquery-ui/ui/widgets/progressbar'
import 'jquery-ui/ui/widgets/resizable'
import 'jquery-ui/ui/widgets/selectable'
import 'jquery-ui/ui/widgets/selectmenu'
import 'jquery-ui/ui/widgets/slider'
import 'jquery-ui/ui/widgets/sortable'
import 'jquery-ui/ui/widgets/tabs'
import 'jquery-ui/ui/widgets/tooltip'
// TODO END
import 'jquery-ui/themes/base/all.css'
// TODO: switch to `jquery-ui` package and import widgets and effects individually
// `jquery-ui-dist` is used as a workaround for the issue of missing effects
import 'jquery-ui-dist/jquery-ui'
import 'jquery-ui-dist/jquery-ui.css'
import 'jquery-ui-dist/jquery-ui.theme.css'
// END TODO
import autosize from 'autosize'
import Backbone from 'backbone'
import 'bootstrap/js/tooltip'

6
package-lock.json generated
View file

@ -3587,10 +3587,10 @@
"resolved": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-1.4.0.tgz",
"integrity": "sha1-4AKOSDHMFH2PIvOCBRbr+5dReaU="
},
"jquery-ui": {
"jquery-ui-dist": {
"version": "1.12.1",
"resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz",
"integrity": "sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE="
"resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.12.1.tgz",
"integrity": "sha1-XAgV08xvkP9fqvWyaKbiO0ypBPo="
},
"js-levenshtein": {
"version": "1.1.4",

2
package.json
View file

@ -34,7 +34,7 @@
"jcrop": "git+https://github.com/ChristophWurst/Jcrop.git#v0.9.12-npm",
"jquery": "^2.1.4",
"jquery-migrate": "^1.4.0",
"jquery-ui": "^1.12.1",
"jquery-ui-dist": "^1.12.1",
"jstimezonedetect": "^1.0.6",
"marked": "^0.3.6",
"moment": "^2.18.1",