diff options
| author | Raimund Schlüßler <raimund.schluessler@mailbox.org> | 2017-11-03 00:01:04 +0300 |
|---|---|---|
| committer | Raimund Schlüßler <raimund.schluessler@mailbox.org> | 2017-11-03 00:01:04 +0300 |
| commit | d03f107fbfcb869f06787c8b9eac2e73a22b2634 (patch) | |
| tree | 441a2aa8c639574c0856773e56d3720519e2a1bd | |
| parent | a4c71e9a50e50d042793fbd9b6bf05c1a015f36c (diff) | |
Combined loading of javascript files
| -rw-r--r-- | js/merged.json | 12 | ||||
| -rw-r--r-- | templates/main.php | 11 |
2 files changed, 13 insertions, 10 deletions
diff --git a/js/merged.json b/js/merged.json new file mode 100644 index 00000000..86ca1500 --- /dev/null +++ b/js/merged.json @@ -0,0 +1,12 @@ +[ + "vendor/angular/angular.min.js", + "vendor/angular-route/angular-route.min.js", + "vendor/angular-animate/angular-animate.min.js", + "vendor/angular-sanitize/angular-sanitize.min.js", + "vendor/angular-drag-and-drop-lists/angular-drag-and-drop-lists.min.js", + "vendor/ui-select/dist/select.min.js", + "vendor/jstimezonedetect/dist/jstz.min.js", + "vendor/ical.js/build/ical.min.js", + "vendor_legacy/jquery-timepicker/jquery.ui.timepicker.js", + "public/app.min.js" +] diff --git a/templates/main.php b/templates/main.php index 8f36a778..2bbbaaa9 100644 --- a/templates/main.php +++ b/templates/main.php @@ -1,14 +1,5 @@ <?php - script('tasks', 'vendor/angular/angular.min'); - script('tasks', 'vendor/angular-route/angular-route.min'); - script('tasks', 'vendor/angular-animate/angular-animate.min'); - script('tasks', 'vendor/angular-sanitize/angular-sanitize.min'); - script('tasks', 'vendor/angular-drag-and-drop-lists/angular-drag-and-drop-lists.min'); - script('tasks', 'vendor/ui-select/dist/select.min'); - script('tasks', 'vendor/jstimezonedetect/dist/jstz.min'); - script('tasks', 'public/app.min'); - script('tasks', 'vendor_legacy/jquery-timepicker/jquery.ui.timepicker'); - script('tasks', 'vendor/ical.js/build/ical.min'); + script('tasks', 'merged'); style('tasks', 'style'); style('tasks', 'vendor/angularui/ui-select/select2'); ?> |