Skip to content
Snippets Groups Projects
Unverified Commit 15400fcf authored by Christoph Wurst's avatar Christoph Wurst Committed by Julius Härtl
Browse files

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


Signed-off-by: default avatarChristoph Wurst <christoph@winzerhof-wurst.at>
parent 69410a4f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
core/js/dist/main.js
+58.15 KiB (+6%)
View file @ 15400fcf
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
core/js/dist/main.js.map
+143.03 KiB (+4%)
View file @ 15400fcf
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
core/src/globals.js
+ 6
− 23
View file @ 15400fcf
...@@ -22,29 +22,12 @@ ...@@ -22,29 +22,12 @@
import _ from 'underscore' import _ from 'underscore'
import $ from 'jquery' import $ from 'jquery'
import 'jquery-migrate/dist/jquery-migrate.min' import 'jquery-migrate/dist/jquery-migrate.min'
import 'jquery-ui' // TODO: switch to `jquery-ui` package and import widgets and effects individually
// TODO: remove anything that is not really used // `jquery-ui-dist` is used as a workaround for the issue of missing effects
import 'jquery-ui/ui/widgets/accordion' import 'jquery-ui-dist/jquery-ui'
import 'jquery-ui/ui/widgets/autocomplete' import 'jquery-ui-dist/jquery-ui.css'
import 'jquery-ui/ui/widgets/button' import 'jquery-ui-dist/jquery-ui.theme.css'
import 'jquery-ui/ui/widgets/checkboxradio' // END TODO
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'
import autosize from 'autosize' import autosize from 'autosize'
import Backbone from 'backbone' import Backbone from 'backbone'
import 'bootstrap/js/tooltip' import 'bootstrap/js/tooltip'
......
package-lock.json
+ 3
− 3
View file @ 15400fcf
...@@ -3587,10 +3587,10 @@ ...@@ -3587,10 +3587,10 @@
"resolved": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-1.4.0.tgz", "resolved": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-1.4.0.tgz",
"integrity": "sha1-4AKOSDHMFH2PIvOCBRbr+5dReaU=" "integrity": "sha1-4AKOSDHMFH2PIvOCBRbr+5dReaU="
}, },
"jquery-ui": { "jquery-ui-dist": {
"version": "1.12.1", "version": "1.12.1",
"resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz", "resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.12.1.tgz",
"integrity": "sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE=" "integrity": "sha1-XAgV08xvkP9fqvWyaKbiO0ypBPo="
}, },
"js-levenshtein": { "js-levenshtein": {
"version": "1.1.4", "version": "1.1.4",
......
package.json
+ 1
− 1
View file @ 15400fcf
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
"jcrop": "git+https://github.com/ChristophWurst/Jcrop.git#v0.9.12-npm", "jcrop": "git+https://github.com/ChristophWurst/Jcrop.git#v0.9.12-npm",
"jquery": "^2.1.4", "jquery": "^2.1.4",
"jquery-migrate": "^1.4.0", "jquery-migrate": "^1.4.0",
"jquery-ui": "^1.12.1", "jquery-ui-dist": "^1.12.1",
"jstimezonedetect": "^1.0.6", "jstimezonedetect": "^1.0.6",
"marked": "^0.3.6", "marked": "^0.3.6",
"moment": "^2.18.1", "moment": "^2.18.1",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment