Skip to content

Commit

Permalink
Update jQuery files
Browse files Browse the repository at this point in the history
Demo theme: v1.10.2 -> v1.11.1
Backend: v2.0.3 -> v2.1.1
Furthermore I renamed the jquery-2.0.3.min.js file because of easy to
update jQuery in future.
  • Loading branch information
gergo85 committed Dec 1, 2014
1 parent f4b9cbf commit 2a05c23
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 9,797 deletions.
5 changes: 0 additions & 5 deletions modules/backend/assets/js/vendor/jquery-2.0.3.min.js

This file was deleted.

2 changes: 2 additions & 0 deletions modules/backend/assets/js/vendor/jquery.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion modules/backend/layouts/_head.htm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link href="<?= Backend::skinAsset('assets/vendor/select2/select2.css') ?>" rel="stylesheet">
<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-2.0.3.min.js') ?>"></script>
<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/modernizr.min.js') ?>"></script>
<script src="<?= Backend::skinAsset('assets/js/vendor/mousewheel.js') ?>"></script>
Expand Down
2 changes: 1 addition & 1 deletion modules/backend/layouts/auth.htm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<title><?= e(trans('backend::lang.auth.title')) ?></title>
<link href="<?= URL::to('modules/backend/assets/css/october.css') ?>" rel="stylesheet">

<script src="<?= URL::to('modules/backend/assets/js/vendor/jquery-2.0.3.min.js') ?>"></script>
<script src="<?= URL::to('modules/backend/assets/js/vendor/jquery.min.js') ?>"></script>
<script src="<?= URL::to('modules/system/assets/js/framework.js') ?>"></script>
<script src="<?= URL::to('modules/backend/assets/js/october.utils.js') ?>"></script>
<script src="<?= URL::to('modules/backend/assets/js/vendor/modernizr.min.js') ?>"></script>
Expand Down
2 changes: 1 addition & 1 deletion modules/system/classes/CombineAssets.php
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public function __construct()
/*
* Common Aliases
*/
$this->registerAlias('js', 'jquery', '~/modules/backend/assets/js/vendor/jquery-2.0.3.min.js');
$this->registerAlias('js', 'jquery', '~/modules/backend/assets/js/vendor/jquery.min.js');
$this->registerAlias('js', 'framework', '~/modules/system/assets/js/framework.js');
$this->registerAlias('js', 'framework.extras', '~/modules/system/assets/js/framework.extras.js');
$this->registerAlias('css', 'framework.extras', '~/modules/system/assets/css/framework.extras.css');
Expand Down
Loading

0 comments on commit 2a05c23

Please sign in to comment.