Tried to fix build environment/select2 (#3262)

This commit is contained in:
Brady Wetherington 2017-02-02 18:53:50 -08:00 committed by snipe
parent b7d3b65bae
commit 7dbbe862ce
8 changed files with 105 additions and 35173 deletions

View file

@ -9,6 +9,7 @@
"bootstrap-sass": "^3.3.7", "bootstrap-sass": "^3.3.7",
"gulp": "^3.9.1", "gulp": "^3.9.1",
"jquery": "^3.1.0", "jquery": "^3.1.0",
"jquery-ui": "^1.12.1",
"laravel-elixir": "^6.0.0-11", "laravel-elixir": "^6.0.0-11",
"laravel-elixir-browserify": "^0.8.1", "laravel-elixir-browserify": "^0.8.1",
"laravel-elixir-codeception-standalone": "^0.1.0", "laravel-elixir-codeception-standalone": "^0.1.0",
@ -24,6 +25,7 @@
"vue-template-compiler": "=2.1.6" "vue-template-compiler": "=2.1.6"
}, },
"dependencies": { "dependencies": {
"bower": "^1.8.0",
"jquery": "^3.1.1", "jquery": "^3.1.1",
"laravel-elixir-codeception": "^0.2.0" "laravel-elixir-codeception": "^0.2.0"
} }

101
public/assets/js/all.js Normal file → Executable file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -1,4 +1,4 @@
{ {
"assets/css/app.css": "assets/css/app-d98e951062.css", "assets/css/app.css": "assets/css/app-d98e951062.css",
"assets/js/all.js": "assets/js/all-1782edec9f.js" "assets/js/all.js": "assets/js/all-3d58cc8f06.js"
} }

View file

@ -140,7 +140,7 @@ $(document).ready(function () {
{ {
// Vue collision: Avoid overriding a vue select2 instance // Vue collision: Avoid overriding a vue select2 instance
// by checking to see if the item has already been select2'd. // by checking to see if the item has already been select2'd.
$('select2:not([class^="select2-container"])').each((i,obj) => { $('.select2:not([class^="select2-container"])').each((i,obj) => {
{ {
$(obj).select2(); $(obj).select2();
} }
@ -151,4 +151,3 @@ $(document).ready(function () {
}); });

File diff suppressed because one or more lines are too long