Commit 94271c8ab39548d47606395c12c0378f70a59cd9
1 parent
b70239a0
17.02.16
Showing
2 changed files
with
4 additions
and
3 deletions
Show diff stats
frontend/assets/AdminAsset.php
| @@ -25,6 +25,7 @@ class AdminAsset extends AssetBundle | @@ -25,6 +25,7 @@ class AdminAsset extends AssetBundle | ||
| 25 | ]; | 25 | ]; |
| 26 | public $js = [ | 26 | public $js = [ |
| 27 | 'js/script.js', | 27 | 'js/script.js', |
| 28 | + '/admin/js/option.js', | ||
| 28 | //'http://maps.google.com/maps/api/js?sensor=false', | 29 | //'http://maps.google.com/maps/api/js?sensor=false', |
| 29 | 'js/markerclusterer.js', | 30 | 'js/markerclusterer.js', |
| 30 | 'js/jquery.scrollbox.min.js', | 31 | 'js/jquery.scrollbox.min.js', |
| @@ -35,6 +36,7 @@ class AdminAsset extends AssetBundle | @@ -35,6 +36,7 @@ class AdminAsset extends AssetBundle | ||
| 35 | public $depends = [ | 36 | public $depends = [ |
| 36 | 'yii\web\YiiAsset', | 37 | 'yii\web\YiiAsset', |
| 37 | 'yii\bootstrap\BootstrapPluginAsset', | 38 | 'yii\bootstrap\BootstrapPluginAsset', |
| 39 | + 'backend\assets\FileUploadAsset', | ||
| 38 | ]; | 40 | ]; |
| 39 | public $jsOptions = array( | 41 | public $jsOptions = array( |
| 40 | 'position' => \yii\web\View::POS_HEAD | 42 | 'position' => \yii\web\View::POS_HEAD |
frontend/assets/AppAsset.php
| @@ -28,7 +28,6 @@ class AppAsset extends AssetBundle | @@ -28,7 +28,6 @@ class AppAsset extends AssetBundle | ||
| 28 | '/js/jquery.scrollbox.min.js', | 28 | '/js/jquery.scrollbox.min.js', |
| 29 | '/js/slider.js', | 29 | '/js/slider.js', |
| 30 | '/js/jquery.rating.js', | 30 | '/js/jquery.rating.js', |
| 31 | - '/admin/js/option.js', | ||
| 32 | // '/js/jmousewhell.js', | 31 | // '/js/jmousewhell.js', |
| 33 | '/js/autoresize.jquery.js', | 32 | '/js/autoresize.jquery.js', |
| 34 | '/js/jquery.MultiFile.js', | 33 | '/js/jquery.MultiFile.js', |
| @@ -37,8 +36,8 @@ class AppAsset extends AssetBundle | @@ -37,8 +36,8 @@ class AppAsset extends AssetBundle | ||
| 37 | 'js/fieldWidget.js' | 36 | 'js/fieldWidget.js' |
| 38 | ]; | 37 | ]; |
| 39 | public $depends = [ | 38 | public $depends = [ |
| 40 | - 'yii\web\YiiAsset', | ||
| 41 | - 'backend\assets\FileUploadAsset', | 39 | + //'yii\web\YiiAsset', |
| 40 | + | ||
| 42 | ]; | 41 | ]; |
| 43 | public $jsOptions = array( | 42 | public $jsOptions = array( |
| 44 | 'position' => \yii\web\View::POS_HEAD | 43 | 'position' => \yii\web\View::POS_HEAD |