1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 12:12:48 +01:00

Upgraded to sweetalert2

This commit is contained in:
Hillel Coren 2016-10-25 18:24:59 +03:00
parent 7fcc634a74
commit 368dbd1fde
7 changed files with 42 additions and 44 deletions

View File

@ -29,9 +29,9 @@
"stacktrace-js": "~1.0.1", "stacktrace-js": "~1.0.1",
"fuse.js": "~2.0.2", "fuse.js": "~2.0.2",
"dropzone": "~4.3.0", "dropzone": "~4.3.0",
"sweetalert": "~1.1.3",
"nouislider": "~8.5.1", "nouislider": "~8.5.1",
"bootstrap-daterangepicker": "~2.1.24" "bootstrap-daterangepicker": "~2.1.24",
"sweetalert2": "^5.3.8"
}, },
"resolutions": { "resolutions": {
"jquery": "~1.11" "jquery": "~1.11"

View File

@ -49,7 +49,7 @@ elixir(function(mix) {
bowerDir + '/font-awesome/css/font-awesome.css', bowerDir + '/font-awesome/css/font-awesome.css',
bowerDir + '/dropzone/dist/dropzone.css', bowerDir + '/dropzone/dist/dropzone.css',
bowerDir + '/spectrum/spectrum.css', bowerDir + '/spectrum/spectrum.css',
bowerDir + '/sweetalert/dist/sweetalert.css', bowerDir + '/sweetalert2/dist/sweetalert2.css',
'bootstrap-combobox.css', 'bootstrap-combobox.css',
'typeahead.js-bootstrap.css', 'typeahead.js-bootstrap.css',
'style.css', 'style.css',
@ -109,9 +109,11 @@ elixir(function(mix) {
bowerDir + '/moment/moment.js', bowerDir + '/moment/moment.js',
bowerDir + '/moment-timezone/builds/moment-timezone-with-data.js', bowerDir + '/moment-timezone/builds/moment-timezone-with-data.js',
//bowerDir + '/stacktrace-js/dist/stacktrace-with-polyfills.min.js', //bowerDir + '/stacktrace-js/dist/stacktrace-with-polyfills.min.js',
bowerDir + '/fuse.js/src/fuse.js', bowerDir + '/es6-promise/es6-promise.auto.js',
bowerDir + '/sweetalert/dist/sweetalert-dev.js', bowerDir + '/sweetalert2/dist/sweetalert2.js',
//bowerDir + '/sweetalert/dist/sweetalert-dev.js',
bowerDir + '/nouislider/distribute/nouislider.js', bowerDir + '/nouislider/distribute/nouislider.js',
bowerDir + '/fuse.js/src/fuse.js',
'bootstrap-combobox.js', 'bootstrap-combobox.js',
'script.js', 'script.js',
'pdf.pdfmake.js', 'pdf.pdfmake.js',

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

10
public/css/built.css vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -99,7 +99,7 @@
showCancelButton: true, showCancelButton: true,
closeOnConfirm: false, closeOnConfirm: false,
allowOutsideClick: true, allowOutsideClick: true,
}, function() { }).then(function() {
success(); success();
swal.close(); swal.close();
}); });