lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use minified assets too. Closes #2258

Browse Source 
Combine didn't improve the situation for us
This commit is contained in:
James Brooks
2016-12-03 20:02:32 +00:00
parent 443ded7029
commit 826e4e6077
5 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gulpfile.js
View File

@@ -14,20 +14,20 @@ elixir((mix) => {
.sass('dashboard.scss', 'public/dist/css/dashboard.css')
.sass('app.scss', 'public/dist/css/app.css')
.scripts([
'node_modules/jquery/dist/jquery.js',
'node_modules/bootstrap-sass/assets/javascripts/bootstrap.js',
'node_modules/moment/min/moment-with-locales.js',
'node_modules/eonasdan-bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js',
'node_modules/lodash/lodash.js',
'node_modules/autosize/dist/autosize.js',
'node_modules/messenger/build/js/messenger.js',
'node_modules/sortablejs/Sortable.js',
'node_modules/jquery/dist/jquery.min.js',
'node_modules/bootstrap-sass/assets/javascripts/bootstrap.min.js',
'node_modules/moment/min/moment-with-locales.min.js',
'node_modules/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js',
'node_modules/lodash/lodash.min.js',
'node_modules/autosize/dist/autosize.min.js',
'node_modules/messenger/build/js/messenger.min.js',
'node_modules/sortablejs/Sortable.min.js',
'node_modules/jquery-minicolors/jquery.minicolors.min.js',
'node_modules/chart.js/dist/Chart.min.js',
'node_modules/jquery-sparkline/jquery.sparkline.min.js',
'node_modules/sweetalert2/dist/sweetalert2.min.js',
'node_modules/livestamp/livestamp.js',
'node_modules/jquery-minicolors/jquery.minicolors.js',
'node_modules/jquery-serializeobject/jquery.serializeObject.js',
'node_modules/chart.js/dist/Chart.js',
'node_modules/jquery-sparkline/jquery.sparkline.js',
'node_modules/sweetalert2/dist/sweetalert2.js',
'resources/assets/js/password-strength.js',
'resources/assets/js/app.js',
'resources/assets/js/**/*.js'

22
public/build/dist/js/all-74bb70763d.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

22
public/build/dist/js/all-cf55758af2.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/build/rev-manifest.json
View File

@@ -1,5 +1,5 @@
{
"dist/css/app.css": "dist/css/app-2e810c16a9.css",
"dist/css/dashboard.css": "dist/css/dashboard-bce5e0b203.css",
"dist/js/all.js": "dist/js/all-cf55758af2.js"
"dist/js/all.js": "dist/js/all-74bb70763d.js"
}

37
resources/assets/js/app.js
View File

@@ -384,23 +384,24 @@ $(function() {
}
});
}
function askConfirmation(callback, cancelCallback) {
swal({
type: "warning",
title: "Confirm your action",
text: "Are you sure you want to do this?",
buttonsStyling: false,
reverseButtons: true,
confirmButtonText: "Yes",
confirmButtonClass: "btn btn-lg btn-danger",
cancelButtonClass: "btn btn-lg btn-default",
showCancelButton: true,
focusCancel: true
}).then(function () {
if (_.isFunction(callback)) callback();
}, function () {
if (_.isFunction(cancelCallback)) cancelCallback();
});
}
});
function askConfirmation(callback, cancelCallback) {
swal({
type: "warning",
title: "Confirm your action",
text: "Are you sure you want to do this?",
buttonsStyling: false,
reverseButtons: true,
confirmButtonText: "Yes",
confirmButtonClass: "btn btn-lg btn-danger",
cancelButtonClass: "btn btn-lg btn-default",
showCancelButton: true,
focusCancel: true
}).then(function () {
if (_.isFunction(callback)) callback();
}, function () {
if (_.isFunction(cancelCallback)) cancelCallback();
});
}