Recompile assets, remove the dedicated vendor script file

October's backend JS is one massive file now
This commit is contained in:
Samuel Georges 2015-05-29 23:05:10 +10:00
parent c5d3bb1a77
commit 6a56f97a4f
7 changed files with 6137 additions and 5271 deletions

View File

@ -65,7 +65,6 @@ class ServiceProvider extends ModuleServiceProvider
CombineAssets::registerCallback(function($combiner) {
$combiner->registerBundle('~/modules/backend/assets/less/october.less');
$combiner->registerBundle('~/modules/backend/assets/js/october.js');
$combiner->registerBundle('~/modules/backend/assets/js/vendor/vendor.js');
$combiner->registerBundle('~/modules/backend/widgets/table/assets/js/build.js');
$combiner->registerBundle('~/modules/backend/formwidgets/datepicker/assets/js/build.js');
$combiner->registerBundle('~/modules/backend/formwidgets/richeditor/assets/less/richeditor.less');

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -7,6 +7,17 @@
* @see october-min.js
*
=require vendor/mousewheel.js
=require vendor/jquery.touchwipe.js
=require vendor/moment.js
=require vendor/jquery.autoellipsis.js
=require vendor/jquery.waterfall.js
=require vendor/jquery.cookie.js
=require ../vendor/select2/select2.js
=require ../vendor/dropzone/dropzone.js
=require ../vendor/sweet-alert/sweet-alert.js
=require ../vendor/jcrop/js/jquery.Jcrop.js
=require ../../../system/assets/ui/js/foundation.js
=require ../../../system/assets/ui/js/flashmessage.js
=require ../../../system/assets/ui/js/inspector.js

File diff suppressed because one or more lines are too long

View File

@ -1,23 +0,0 @@
/*
* This is a bundle file, you can compile this in two ways:
* (1) Using your favorite JS combiner
* (2) Using CLI command:
* php artisan october:util compile assets
*
* @see vendor-min.js
*
=require mousewheel.js
=require jquery.touchwipe.js
=require moment.js
=require jquery.autoellipsis.js
=require jquery.waterfall.js
=require jquery.cookie.js
=require ../../vendor/select2/select2.js
=require ../../vendor/dropzone/dropzone.js
=require ../../vendor/sweet-alert/sweet-alert.js
=require ../../vendor/jcrop/js/jquery.Jcrop.js
*/

View File

@ -13,8 +13,7 @@
<link href="<?= Backend::skinAsset('assets/css/october.css') ?>?v<?= System\Models\Parameters::get('system::core.build', 1) ?>" rel="stylesheet">
<script src="<?= Backend::skinAsset('assets/js/vendor/jquery.min.js') ?>"></script>
<script src="<?= URL::asset('modules/system/assets/js/framework.js') ?>"></script>
<script src="<?= Backend::skinAsset('assets/js/vendor/vendor-min.js') ?>"></script>
<script src="<?= Backend::skinAsset('assets/js/october-min.js') ?>"></script>
<script src="<?= Backend::skinAsset('assets/js/october-min.js') ?>?v<?= System\Models\Parameters::get('system::core.build', 1) ?>"></script>
<script src="<?= URL::asset('modules/cms/widgets/mediamanager/assets/js/mediamanager-global-min.js') ?>"></script>
<?= $this->makeAssets() ?>