Use webpack to deliver jstree (and use newest version)
Also delete bootstrap files now served via webpack
This commit is contained in:
@ -22,7 +22,6 @@
|
||||
// vendor/assets
|
||||
//= require ace/ace
|
||||
//= require ace/ext-language_tools
|
||||
//= require jstree/jstree.min
|
||||
//= require jquery-ui.min
|
||||
//= require underscore.min
|
||||
//= require_tree .
|
||||
|
@ -20,6 +20,5 @@
|
||||
*= require google_opensans
|
||||
*= require jquery-ui.min
|
||||
*= require jquery-ui.structure.min
|
||||
*= require style.min
|
||||
*= require_tree .
|
||||
*/
|
||||
|
@ -11,6 +11,8 @@
|
||||
import 'jquery'
|
||||
import 'bootstrap/dist/js/bootstrap.bundle.min';
|
||||
import 'chosen-js/chosen.jquery';
|
||||
import 'jstree';
|
||||
|
||||
// CSS
|
||||
import 'chosen-js/chosen.css';
|
||||
import 'jstree/dist/themes/default/style.min.css';
|
||||
|
@ -5,6 +5,7 @@
|
||||
"bootswatch": "^4.1.3",
|
||||
"chosen-js": "^1.8.7",
|
||||
"jquery": "^3.3.1",
|
||||
"jstree": "^3.3.5",
|
||||
"popper.js": "^1.14.4",
|
||||
"webpack-merge": "^4.1.4"
|
||||
},
|
||||
|
BIN
vendor/assets/images/32px.png
vendored
BIN
vendor/assets/images/32px.png
vendored
Binary file not shown.
Before Width: | Height: | Size: 3.0 KiB |
BIN
vendor/assets/images/40px.png
vendored
BIN
vendor/assets/images/40px.png
vendored
Binary file not shown.
Before Width: | Height: | Size: 1.8 KiB |
BIN
vendor/assets/images/throbber.gif
vendored
BIN
vendor/assets/images/throbber.gif
vendored
Binary file not shown.
Before Width: | Height: | Size: 1.7 KiB |
0
vendor/assets/javascripts/.keep
vendored
0
vendor/assets/javascripts/.keep
vendored
7
vendor/assets/javascripts/bootstrap.min.js
vendored
7
vendor/assets/javascripts/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
0
vendor/assets/stylesheets/.keep
vendored
0
vendor/assets/stylesheets/.keep
vendored
7
vendor/assets/stylesheets/bootstrap.min.css
vendored
7
vendor/assets/stylesheets/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
1
vendor/assets/stylesheets/style.min.css
vendored
1
vendor/assets/stylesheets/style.min.css
vendored
File diff suppressed because one or more lines are too long
33
yarn.lock
33
yarn.lock
@ -1243,14 +1243,14 @@ caniuse-api@^2.0.0:
|
||||
lodash.uniq "^4.5.0"
|
||||
|
||||
caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
|
||||
version "1.0.30000888"
|
||||
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000888.tgz#38081675206f8856b648c1cd793a28a2c5762448"
|
||||
integrity sha512-bp7cHptv4AQZFtkyzYk2bJN5E8CSYklm6K3bJ/fGUa52oxydzBKK4uYlZ+A0lNIiThRFJMoXU2TacG9ve2KpXw==
|
||||
version "1.0.30000890"
|
||||
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000890.tgz#b406595db8b631975b8dc5fa174f32925c23778b"
|
||||
integrity sha512-aO5uw1Taw8GkNMMXIWOz/WJz3y6tR1ETUAdH/pvO5EoJ3I1Po9vNJd9aMjY1GKucS/OXWMiQbXRbk3O1sgCbRA==
|
||||
|
||||
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000844:
|
||||
version "1.0.30000888"
|
||||
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000888.tgz#22edb50d91dd70612b5898e3b36f460600c6492f"
|
||||
integrity sha512-vftg+5p/lPsQGpnhSo/yBuYL36ai/cyjLvU3dOPJY1kkKrekLWIy8SLm+wzjX0hpCUdFTasC4/ZT7uqw4rKOnQ==
|
||||
version "1.0.30000890"
|
||||
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000890.tgz#86a18ffcc65d79ec6a437e985761b8bf1c4efeaf"
|
||||
integrity sha512-4NI3s4Y6ROm+SgZN5sLUG4k7nVWQnedis3c/RWkynV5G6cHSY7+a8fwFyn2yoBDE3E6VswhTNNwR3PvzGqlTkg==
|
||||
|
||||
case-sensitive-paths-webpack-plugin@^2.1.2:
|
||||
version "2.1.2"
|
||||
@ -2026,9 +2026,9 @@ ee-first@1.1.1:
|
||||
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
|
||||
|
||||
electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.47:
|
||||
version "1.3.73"
|
||||
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.73.tgz#aa67787067d58cc3920089368b3b8d6fe0fc12f6"
|
||||
integrity sha512-6PIg7v9zRoVGh6EheRF8h6Plti+3Yo/qtHobS4/Htyt53DNHmKKGFqSae1AIk0k1S4gCQvt7I2WgpbuZNcDY+g==
|
||||
version "1.3.75"
|
||||
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.75.tgz#dd04551739e7371862b0ac7f4ddaa9f3f95b7e68"
|
||||
integrity sha512-nLo03Qpw++8R6BxDZL/B1c8SQvUe/htdgc5LWYHe5YotV2jVvRUMP5AlOmxOsyeOzgMiXrNln2mC05Ixz6vuUQ==
|
||||
|
||||
elliptic@^6.0.0:
|
||||
version "6.4.1"
|
||||
@ -3413,7 +3413,7 @@ isstream@~0.1.2:
|
||||
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
|
||||
integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
|
||||
|
||||
jquery@^3.3.1:
|
||||
jquery@>=1.9.1, jquery@^3.3.1:
|
||||
version "3.3.1"
|
||||
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
|
||||
integrity sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==
|
||||
@ -3521,6 +3521,13 @@ jsprim@^1.2.2:
|
||||
json-schema "0.2.3"
|
||||
verror "1.10.0"
|
||||
|
||||
jstree@^3.3.5:
|
||||
version "3.3.5"
|
||||
resolved "https://registry.yarnpkg.com/jstree/-/jstree-3.3.5.tgz#9c578db32d0a643775cddd8020ad5992f4119c13"
|
||||
integrity sha1-nFeNsy0KZDd1zd2AIK1ZkvQRnBM=
|
||||
dependencies:
|
||||
jquery ">=1.9.1"
|
||||
|
||||
killable@^1.0.0:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
|
||||
@ -6012,9 +6019,9 @@ source-map@^0.6.1, source-map@~0.6.1:
|
||||
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
|
||||
|
||||
spdx-correct@^3.0.0:
|
||||
version "3.0.1"
|
||||
resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.1.tgz#434434ff9d1726b4d9f4219d1004813d80639e30"
|
||||
integrity sha512-hxSPZbRZvSDuOvADntOElzJpenIR7wXJkuoUcUtS0erbgt2fgeaoPIYretfKpslMhfFDY4k0MZ2F5CUzhBsSvQ==
|
||||
version "3.0.2"
|
||||
resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.2.tgz#19bb409e91b47b1ad54159243f7312a858db3c2e"
|
||||
integrity sha512-q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ==
|
||||
dependencies:
|
||||
spdx-expression-parse "^3.0.0"
|
||||
spdx-license-ids "^3.0.0"
|
||||
|
Reference in New Issue
Block a user