diff --git a/frontend/assets/AdminAsset.php b/frontend/assets/AdminAsset.php index 3b345b9..73e28b8 100755 --- a/frontend/assets/AdminAsset.php +++ b/frontend/assets/AdminAsset.php @@ -25,6 +25,7 @@ class AdminAsset extends AssetBundle ]; public $js = [ 'js/script.js', + '/admin/js/option.js', //'http://maps.google.com/maps/api/js?sensor=false', 'js/markerclusterer.js', 'js/jquery.scrollbox.min.js', @@ -35,6 +36,7 @@ class AdminAsset extends AssetBundle public $depends = [ 'yii\web\YiiAsset', 'yii\bootstrap\BootstrapPluginAsset', + 'backend\assets\FileUploadAsset', ]; public $jsOptions = array( 'position' => \yii\web\View::POS_HEAD diff --git a/frontend/assets/AppAsset.php b/frontend/assets/AppAsset.php index 6838234..9a39d7d 100755 --- a/frontend/assets/AppAsset.php +++ b/frontend/assets/AppAsset.php @@ -28,7 +28,6 @@ class AppAsset extends AssetBundle '/js/jquery.scrollbox.min.js', '/js/slider.js', '/js/jquery.rating.js', - '/admin/js/option.js', // '/js/jmousewhell.js', '/js/autoresize.jquery.js', '/js/jquery.MultiFile.js', @@ -37,8 +36,8 @@ class AppAsset extends AssetBundle 'js/fieldWidget.js' ]; public $depends = [ - 'yii\web\YiiAsset', - 'backend\assets\FileUploadAsset', + //'yii\web\YiiAsset', + ]; public $jsOptions = array( 'position' => \yii\web\View::POS_HEAD -- libgit2 0.21.4