tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

FIX: Use chosen from npm package.

Browse Source 
Downloading the package from github makes npm install a lot slower and
complicates the webpack build.
This commit is contained in:
Sam Minnee 2016-08-21 18:53:59 +12:00 committed by Ingo Schommer
parent 2e577ddb1d
commit a6049ec383
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/client/src/bundles/lib.js
View File

@ -56,6 +56,7 @@ require('../../../../client/src/legacy/TabSet.js');
require('../legacy/ssui.core.js');
require('../../../../client/src/legacy/GridField.js');
require('json-js');
require('chosen-js');
require('expose?SilverStripeComponent!lib/SilverStripeComponent');
require('expose?Backend!lib/Backend');
@ -81,12 +82,5 @@ require('expose?ReactRouteRegister!lib/ReactRouteRegister');
require('expose?Injector!lib/Injector');
require('expose?Router!lib/Router');
// Chosen is manually compiled from its support files
// Loaded into global state as I don't know how to chain the exports loader into the argument
// of the imports loader
require('expose?AbstractChosen!exports?AbstractChosen!chosen/coffee/lib/abstract-chosen.coffee');
require('expose?SelectParser!exports?SelectParser!chosen/coffee/lib/select-parser.coffee');
require('chosen/coffee/chosen.jquery.coffee');
// Ensure that styles are built as part of this webpack bundle
require('../styles/bundle.scss');

6
admin/client/src/styles/_chosen.scss
View File

@ -1,5 +1 @@
$chosen-sprite: url("../images/chosen-sprite.png");
$chosen-sprite-retina: url("../images/chosen-sprite@2x.png");
@import "../../../../client/src/styles/_compasscompat";
@import "../../../../node_modules/chosen/sass/chosen";
@import "../../../../node_modules/chosen-js/chosen.css";

3
admin/client/src/styles/bundle.scss
View File

@ -1,6 +1,9 @@
// Variables
@import "variables";
// Compatibilty with compass
@import "../../../../client/src/styles/_compasscompat";
// Thirdparty
@import "chosen";
@import "../../../../node_modules/bootstrap/scss/bootstrap";

2
package.json
View File

@ -36,7 +36,7 @@
"blueimp-file-upload": "^6.0.3",
"blueimp-load-image": "^1.1.3",
"blueimp-tmpl": "^1.0.2",
"bootstrap": "4.0.0-alpha.2",
"bootstrap": "^4.0.0-alpha.2",
"chosen-js": "^1.5.1",
"deep-equal": "^1.0.1",
"deep-freeze-strict": "^1.1.1",