Commit d51a2c7186a73213eac5b1fc5796da562d46a4e0
1 parent
93c2e365
big commti
Showing
4 changed files
with
17 additions
and
12 deletions
Show diff stats
frontend/views/catalog/product.php
@@ -5,15 +5,17 @@ | @@ -5,15 +5,17 @@ | ||
5 | */ | 5 | */ |
6 | use common\components\artboximage\ArtboxImageHelper; | 6 | use common\components\artboximage\ArtboxImageHelper; |
7 | use common\models\Orders; | 7 | use common\models\Orders; |
8 | -use common\modules\product\models\Product; | ||
9 | -use frontend\assets\FotoramaAsset; | 8 | + use common\modules\product\models\Product; |
9 | + use frontend\assets\FotoramaAsset; | ||
10 | use frontend\widgets\Seo; | 10 | use frontend\widgets\Seo; |
11 | use common\modules\comment\widgets\CommentWidget; | 11 | use common\modules\comment\widgets\CommentWidget; |
12 | use yii\bootstrap\ActiveForm; | 12 | use yii\bootstrap\ActiveForm; |
13 | use yii\bootstrap\Html; | 13 | use yii\bootstrap\Html; |
14 | -use yii\helpers\Url; | ||
15 | -use yii\web\View; | ||
16 | -use yii\widgets\MaskedInput; | 14 | + use yii\helpers\Url; |
15 | + use yii\web\View; | ||
16 | + use yii\widgets\MaskedInput; | ||
17 | + use frontend\assets\FlipclockAsset; | ||
18 | + FlipclockAsset::register($this); | ||
17 | FotoramaAsset::register($this); | 19 | FotoramaAsset::register($this); |
18 | $this->title = $product->name; | 20 | $this->title = $product->name; |
19 | 21 | ||
@@ -180,7 +182,7 @@ use yii\widgets\MaskedInput; | @@ -180,7 +182,7 @@ use yii\widgets\MaskedInput; | ||
180 | $js = " | 182 | $js = " |
181 | var clock; | 183 | var clock; |
182 | 184 | ||
183 | - clock = $('.clock_$event->primaryKey').FlipClock({ | 185 | + clock = new FlipClock($('.clock_$event->primaryKey'), { |
184 | clockFace: 'DailyCounter', | 186 | clockFace: 'DailyCounter', |
185 | language: 'ru', | 187 | language: 'ru', |
186 | classes: { | 188 | classes: { |
frontend/views/event/_objects.php
@@ -3,7 +3,8 @@ | @@ -3,7 +3,8 @@ | ||
3 | use yii\helpers\Url; | 3 | use yii\helpers\Url; |
4 | 4 | ||
5 | use yii\web\View; | 5 | use yii\web\View; |
6 | - | 6 | +use frontend\assets\FlipclockAsset; |
7 | +FlipclockAsset::register($this); | ||
7 | ?> | 8 | ?> |
8 | <div class="news_item"> | 9 | <div class="news_item"> |
9 | 10 | ||
@@ -21,7 +22,7 @@ use yii\web\View; | @@ -21,7 +22,7 @@ use yii\web\View; | ||
21 | <div class="clock_style clock_<?= $model->primaryKey ?>"></div> | 22 | <div class="clock_style clock_<?= $model->primaryKey ?>"></div> |
22 | 23 | ||
23 | <?php $js = "var clock; | 24 | <?php $js = "var clock; |
24 | - clock = $('.clock_". $model->primaryKey ."').FlipClock({ | 25 | + clock = new FlipClock(jQuery('.clock_". $model->primaryKey ."'),{ |
25 | clockFace: 'DailyCounter', | 26 | clockFace: 'DailyCounter', |
26 | language: 'ru', | 27 | language: 'ru', |
27 | classes: { | 28 | classes: { |
frontend/views/event/show.php
@@ -3,9 +3,10 @@ | @@ -3,9 +3,10 @@ | ||
3 | * @var $this View | 3 | * @var $this View |
4 | */ | 4 | */ |
5 | 5 | ||
6 | -use frontend\assets\FlipclockAsset; | 6 | + |
7 | use yii\web\View; | 7 | use yii\web\View; |
8 | use yii\widgets\ListView; | 8 | use yii\widgets\ListView; |
9 | +use frontend\assets\FlipclockAsset; | ||
9 | FlipclockAsset::register($this); | 10 | FlipclockAsset::register($this); |
10 | 11 | ||
11 | ?> | 12 | ?> |
@@ -33,7 +34,7 @@ $this->params['seo']['h1'] = $this->title; | @@ -33,7 +34,7 @@ $this->params['seo']['h1'] = $this->title; | ||
33 | <?php $js = " | 34 | <?php $js = " |
34 | var clock; | 35 | var clock; |
35 | 36 | ||
36 | - clock = $('.clock').FlipClock({ | 37 | + clock = new FlipClock(jQuery('.clock'),{ |
37 | clockFace: 'DailyCounter', | 38 | clockFace: 'DailyCounter', |
38 | language: 'ru', | 39 | language: 'ru', |
39 | classes: { | 40 | classes: { |
frontend/widgets/views/slider.php
@@ -4,7 +4,8 @@ use common\components\artboximage\ArtboxImageHelper; | @@ -4,7 +4,8 @@ use common\components\artboximage\ArtboxImageHelper; | ||
4 | use common\models\Slider; | 4 | use common\models\Slider; |
5 | use yii\helpers\Html; | 5 | use yii\helpers\Html; |
6 | use yii\web\View; | 6 | use yii\web\View; |
7 | - | 7 | +use frontend\assets\FlipclockAsset; |
8 | +FlipclockAsset::register($this); | ||
8 | 9 | ||
9 | ?> | 10 | ?> |
10 | 11 | ||
@@ -20,7 +21,7 @@ use yii\web\View; | @@ -20,7 +21,7 @@ use yii\web\View; | ||
20 | ?> | 21 | ?> |
21 | <div class="clock_style clock_<?= $image->primaryKey ?>"></div> | 22 | <div class="clock_style clock_<?= $image->primaryKey ?>"></div> |
22 | <?php $js = "var clock; | 23 | <?php $js = "var clock; |
23 | - clock = $('.clock_". $image->primaryKey ."').FlipClock({ | 24 | + clock = new FlipClock('.clock_". $image->primaryKey ."'), { |
24 | clockFace: 'DailyCounter', | 25 | clockFace: 'DailyCounter', |
25 | language: 'ru', | 26 | language: 'ru', |
26 | classes: { | 27 | classes: { |