From 70bfbe0aa0a7c0555bc1886b67589d7da5b8ba42 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Wed, 26 Oct 2016 20:08:21 +0300 Subject: [PATCH] big commti --- frontend/assets/AppAsset.php | 1 + frontend/assets/FlipclockAsset.php | 3 +-- frontend/views/catalog/product.php | 2 -- frontend/views/event/_objects.php | 6 ++---- frontend/views/event/show.php | 7 +++---- frontend/widgets/views/slider.php | 5 ++--- 6 files changed, 9 insertions(+), 15 deletions(-) diff --git a/frontend/assets/AppAsset.php b/frontend/assets/AppAsset.php index 40fff2a..cc9549c 100755 --- a/frontend/assets/AppAsset.php +++ b/frontend/assets/AppAsset.php @@ -32,6 +32,7 @@ class AppAsset extends AssetBundle 'yii\web\JqueryAsset', 'sersid\owlcarousel\Asset', 'yii\bootstrap\BootstrapPluginAsset', + 'frontend\assets\FlipclockAsset', ]; public function init() { diff --git a/frontend/assets/FlipclockAsset.php b/frontend/assets/FlipclockAsset.php index 9fc2a19..5a26f26 100755 --- a/frontend/assets/FlipclockAsset.php +++ b/frontend/assets/FlipclockAsset.php @@ -23,7 +23,6 @@ class FlipclockAsset extends AssetBundle 'flipclock/compiled/flipclock.min.js' ]; public $jsOptions = array( - 'position' => \yii\web\View::POS_END, - 'depends' => ['yii\web\JqueryAsset'] + 'position' => \yii\web\View::POS_END ); } diff --git a/frontend/views/catalog/product.php b/frontend/views/catalog/product.php index 244a88d..c87db76 100755 --- a/frontend/views/catalog/product.php +++ b/frontend/views/catalog/product.php @@ -14,9 +14,7 @@ use frontend\assets\FotoramaAsset; use yii\helpers\Url; use yii\web\View; use yii\widgets\MaskedInput; -use frontend\assets\FlipclockAsset; FotoramaAsset::register($this); - FlipclockAsset::register($this); $this->title = $product->name; diff --git a/frontend/views/event/_objects.php b/frontend/views/event/_objects.php index f25b9ef..10bac2b 100755 --- a/frontend/views/event/_objects.php +++ b/frontend/views/event/_objects.php @@ -1,11 +1,9 @@
diff --git a/frontend/views/event/show.php b/frontend/views/event/show.php index 77f0e5e..02bf6be 100755 --- a/frontend/views/event/show.php +++ b/frontend/views/event/show.php @@ -1,11 +1,10 @@ title = $model->name; diff --git a/frontend/widgets/views/slider.php b/frontend/widgets/views/slider.php index 3e392d7..5006ecd 100755 --- a/frontend/widgets/views/slider.php +++ b/frontend/widgets/views/slider.php @@ -3,10 +3,9 @@ use common\components\artboximage\ArtboxImageHelper; use common\models\Slider; use yii\helpers\Html; -use yii\helpers\Url; use yii\web\View; -use frontend\assets\FlipclockAsset; -FlipclockAsset::register($this); + + ?> -- libgit2 0.21.4