Browse Source

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

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
tags/v16.0.0alpha1
Christoph Wurst 5 years ago
parent
commit
15400fcf7b
No account linked to committer's email address
5 changed files with 104 additions and 195 deletions
  1. 93
    167
      core/js/dist/main.js
  2. 1
    1
      core/js/dist/main.js.map
  3. 6
    23
      core/src/globals.js
  4. 3
    3
      package-lock.json
  5. 1
    1
      package.json

+ 93
- 167
core/js/dist/main.js
File diff suppressed because it is too large
View File


+ 1
- 1
core/js/dist/main.js.map
File diff suppressed because it is too large
View File


+ 6
- 23
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'

+ 3
- 3
package-lock.json 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",

+ 1
- 1
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",

Loading…
Cancel
Save