Administrator / new_rukzachok-1

Commit 412a90ce92ebb3daa61b8621322cbd2b07299498

Authored by Karnovsky A
2 parents c7852657 1f1fedec

Merge remote-tracking branch 'origin/master'

Showing 16 changed files with 29 additions and 20 deletions   Show diff stats
Inline Side-by-side
frontend/assets/AppAsset.php
  Show/Hide comments   View file @412a90c
... ... @@ -31,7 +31,7 @@ class AppAsset extends AssetBundle
31 31 ];
32 32  
33 33 public function init() {
34   - $this->jsOptions['position'] = View::POS_HEAD;
  34 + $this->jsOptions['position'] = View::POS_END;
35 35 parent::init();
36 36 }
37 37 }
... ...
frontend/views/basket/index.php
  Show/Hide comments   View file @412a90c
... ... @@ -11,7 +11,7 @@ $this->title = 'Корзина';
11 11 $this->registerMetaTag(['name' => 'description', 'content' => 'Корзина']);
12 12 $this->registerMetaTag(['name' => 'keywords', 'content' => 'Корзина']);
13 13  
14   -$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_HEAD,'depends'=>['yii\web\YiiAsset']]);
  14 +$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_END,'depends'=>['yii\web\YiiAsset']]);
15 15  
16 16 $this->registerJs("
17 17 $('#orders-phone,#orders-phone2').mask('(000) 000-0000');
... ...
frontend/views/catalog/product.php
  Show/Hide comments   View file @412a90c
... ... @@ -72,7 +72,7 @@ $this->registerJs ("
72 72 ", View::POS_READY, 'nav_product');
73 73  
74 74 $this->registerCssFile (Yii::$app->request->BaseUrl . '/js/shadowbox-3.0.3/shadowbox.css');
75   -$this->registerJsFile (Yii::$app->request->baseUrl . '/js/shadowbox-3.0.3/shadowbox.js', ['position' => View::POS_HEAD, 'depends' => ['yii\web\JqueryAsset']]);
  75 +$this->registerJsFile (Yii::$app->request->baseUrl . '/js/shadowbox-3.0.3/shadowbox.js', ['position' => View::POS_END, 'depends' => ['yii\web\JqueryAsset']]);
76 76 $this->registerJs ("
77 77 Shadowbox.init({
78 78  
... ...
frontend/views/catalog/products.php
  Show/Hide comments   View file @412a90c
... ... @@ -19,7 +19,10 @@ $this->params['seo']['title'] = $category->name;
19 19  
20 20 $this->registerCssFile (Yii::getAlias('@web/css/ion.rangeSlider.css'));
21 21 $this->registerCssFile (Yii::getAlias('@web/css/ion.rangeSlider.skinHTML5.css'));
22   -$this->registerJsFile (Yii::getAlias('@web/js/ion.rangeSlider.js'));
  22 +$this->registerJsFile(Yii::getAlias('@web/js/ion.rangeSlider.js'),[
  23 + 'position' => View::POS_END,
  24 + 'depends' => ['yii\web\JqueryAsset']
  25 +]);
23 26 ?>
24 27  
25 28 <script type="text/javascript">
... ...
frontend/views/iam/edit_company.php
  Show/Hide comments   View file @412a90c
... ... @@ -10,7 +10,7 @@ $this-&gt;title = &#39;Редактирование Исполнителя - Компа
10 10 $this->params['breadcrumbs'][] = ['label'=>'Профиль','url'=>['/iam/index']];
11 11 $this->params['breadcrumbs'][] = $this->title;
12 12  
13   -$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_HEAD,'depends'=>['yii\web\YiiAsset']]);
  13 +$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_END,'depends'=>['yii\web\YiiAsset']]);
14 14  
15 15 $this->registerJs("
16 16 $('#user-phone').mask('(000) 000-0000');
... ...
frontend/views/iam/edit_customer.php
  Show/Hide comments   View file @412a90c
... ... @@ -10,7 +10,7 @@ $this-&gt;title = &#39;Редактирование Заказчика&#39;;
10 10 $this->params['breadcrumbs'][] = ['label'=>'Профиль','url'=>['/iam/index']];
11 11 $this->params['breadcrumbs'][] = $this->title;
12 12  
13   -$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_HEAD,'depends'=>['yii\web\YiiAsset']]);
  13 +$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_END,'depends'=>['yii\web\YiiAsset']]);
14 14  
15 15 $this->registerJs("
16 16 $('#user-phone').mask('(000) 000-0000');
... ...
frontend/views/iam/edit_person.php
  Show/Hide comments   View file @412a90c
... ... @@ -12,7 +12,7 @@ $this-&gt;title = &#39;Редактирование профиля&#39;;
12 12 $this->params['breadcrumbs'][] = ['label'=>'Профиль','url'=>['/iam/index']];
13 13 $this->params['breadcrumbs'][] = $this->title;
14 14  
15   -$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_HEAD,'depends'=>['yii\web\YiiAsset']]);
  15 +$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_END,'depends'=>['yii\web\YiiAsset']]);
16 16  
17 17 $this->registerJs("
18 18 $('#user-phone').mask('(000) 000-0000');
... ...
frontend/views/layouts/main.php
  Show/Hide comments   View file @412a90c
... ... @@ -46,14 +46,14 @@ $this-&gt;registerJsFile (Yii::$app-&gt;request-&gt;baseUrl . &#39;/js/fix_height.js&#39;, [&#39;posi
46 46  
47 47 // jquery-migrate
48 48 $this->registerJsFile('http://code.jquery.com/jquery-migrate-1.3.0.js',[
49   - 'position' => View::POS_HEAD,
  49 + 'position' => View::POS_END,
50 50 'depends' => ['yii\web\JqueryAsset']
51 51 ]);
52 52  
53 53 // jcarousel
54 54 $this->registerCssFile(Yii::$app->request->BaseUrl.'/js/jsor-jcarousel-7bb2e0a/skins/tango/skin.css');
55 55 $this->registerJsFile(Yii::$app->request->baseUrl.'/js/jsor-jcarousel-7bb2e0a/lib/jquery.jcarousel.min.js',[
56   - 'position' => View::POS_HEAD,
  56 + 'position' => View::POS_END,
57 57 'depends' => ['yii\web\JqueryAsset']
58 58 ]);
59 59  
... ...
frontend/views/products/_show.php
  Show/Hide comments   View file @412a90c
... ... @@ -27,7 +27,7 @@ $this-&gt;registerJs(&quot;
27 27  
28 28 ", View::POS_READY, 'gallery');
29 29  
30   -$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.sliderkit.1.9.2.pack.js',['position'=>View::POS_HEAD,'depends'=>['yii\web\YiiAsset']]);
  30 +$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.sliderkit.1.9.2.pack.js',['position'=>View::POS_END,'depends'=>['yii\web\YiiAsset']]);
31 31 $this->registerJs("
32 32  
33 33 $('.skit').sliderkit({
... ...
frontend/views/products/index.php
  Show/Hide comments   View file @412a90c
... ... @@ -20,8 +20,8 @@ $this-&gt;params[&#39;catalog_id&#39;] = $catalog-&gt;id;
20 20 $this->registerMetaTag (['name' => 'description', 'content' => $catalog->meta_description]);
21 21 $this->registerMetaTag (['name' => 'keywords', 'content' => $catalog->meta_keywords]);
22 22 $this->registerCssFile (Yii::$app->request->BaseUrl . '/css/begunok.css');
23   - $this->registerJsFile (Yii::$app->request->baseUrl . '/js/jquery.ui-slider.js', ['position' => View::POS_HEAD, 'depends' => ['yii\web\JqueryAsset']]);
24   - $this->registerJsFile (Yii::$app->request->baseUrl . '/js/begunok.js', ['position' => View::POS_HEAD, 'depends' => ['yii\web\JqueryAsset']]);
  23 + $this->registerJsFile (Yii::$app->request->baseUrl . '/js/jquery.ui-slider.js', ['position' => View::POS_END, 'depends' => ['yii\web\JqueryAsset']]);
  24 + $this->registerJsFile (Yii::$app->request->baseUrl . '/js/begunok.js', ['position' => View::POS_END, 'depends' => ['yii\web\JqueryAsset']]);
25 25 $this->params['breadcrumbs'][] = ['label' => 'Каталог', 'url' => ['/catalog/all']];
26 26 if (! empty($catalog->parent)) $this->params['breadcrumbs'][] = ['label' => $catalog->parent->name, 'url' => ['products/index', 'translit' => $catalog->parent->translit]];
27 27 $this->params['breadcrumbs'][] = ['label' => $catalog->name];
... ...
frontend/views/products/show.php
  Show/Hide comments   View file @412a90c
... ... @@ -60,7 +60,7 @@ use yii\widgets\Breadcrumbs;
60 60 ", View::POS_READY, 'nav_product');
61 61  
62 62 $this->registerCssFile (Yii::$app->request->BaseUrl . '/js/shadowbox-3.0.3/shadowbox.css');
63   - $this->registerJsFile (Yii::$app->request->baseUrl . '/js/shadowbox-3.0.3/shadowbox.js', ['position' => View::POS_HEAD, 'depends' => ['yii\web\JqueryAsset']]);
  63 + $this->registerJsFile (Yii::$app->request->baseUrl . '/js/shadowbox-3.0.3/shadowbox.js', ['position' => View::POS_END, 'depends' => ['yii\web\JqueryAsset']]);
64 64 $this->registerJs ("
65 65 Shadowbox.init({
66 66  
... ...
frontend/views/reg/company.php
  Show/Hide comments   View file @412a90c
... ... @@ -9,7 +9,7 @@ use yii\captcha\Captcha;
9 9 $this->title = 'Регистрация Исполнителя - Компания';
10 10 $this->params['breadcrumbs'][] = $this->title;
11 11  
12   -$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_HEAD,'depends'=>['yii\web\YiiAsset']]);
  12 +$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_END,'depends'=>['yii\web\YiiAsset']]);
13 13  
14 14 $this->registerJs("
15 15 $('#user-phone').mask('(000) 000-0000');
... ...
frontend/views/reg/customer.php
  Show/Hide comments   View file @412a90c
... ... @@ -9,7 +9,7 @@ use yii\captcha\Captcha;
9 9 $this->title = 'Регистрация Заказчика';
10 10 $this->params['breadcrumbs'][] = $this->title;
11 11  
12   -$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_HEAD,'depends'=>['yii\web\YiiAsset']]);
  12 +$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_END,'depends'=>['yii\web\YiiAsset']]);
13 13  
14 14 $this->registerJs("
15 15 $('#user-phone').mask('(000) 000-0000');
... ...
frontend/views/reg/person.php
  Show/Hide comments   View file @412a90c
... ... @@ -9,7 +9,7 @@ use yii\captcha\Captcha;
9 9 $this->title = 'Регистрация';
10 10 $this->params['breadcrumbs'][] = $this->title;
11 11  
12   -$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_HEAD,'depends'=>['yii\web\YiiAsset']]);
  12 +$this->registerJsFile(Yii::$app->request->baseUrl.'/js/jquery.mask.js',['position'=>View::POS_END,'depends'=>['yii\web\YiiAsset']]);
13 13  
14 14 $this->registerJs("
15 15 $('#customer-phone').mask('(000) 000-0000');
... ...
frontend/views/site/index.php
  Show/Hide comments   View file @412a90c
... ... @@ -12,7 +12,7 @@ use frontend\widgets\Seo;
12 12 $this->params['seo']['title'] = 'Купить городской рюкзак Киев | Купить рюкзаки Dakine Украина | Rukzachok.com.ua';
13 13 $this->registerJsFile (
14 14 Yii::$app->request->baseUrl . '/js/slides.min.jquery.js',
15   - ['position' => View::POS_HEAD, 'depends' => ['yii\web\JqueryAsset']]);
  15 + ['position' => View::POS_END, 'depends' => ['yii\web\JqueryAsset']]);
16 16  
17 17 ?>
18 18  
... ...
frontend/widgets/SliderWidget.php
  Show/Hide comments   View file @412a90c
... ... @@ -55,8 +55,10 @@ class SliderWidget extends Widget
55 55 if (! $this->is_init_slider)
56 56 {
57 57 // TODO:: wiget подключение jcarousel
58   - $this->view->registerJsFile (\Yii::$app->request->baseUrl . '/js/widget-carousel/lib/jquery.jcarousel.min.js', ['position' => View::POS_END]);
59   -
  58 + $this->view->registerJsFile(\Yii::$app->request->baseUrl . '/js/widget-carousel/lib/jquery.jcarousel.min.js',[
  59 + 'position' => View::POS_END,
  60 + 'depends' => ['yii\web\JqueryAsset']
  61 + ]);
60 62 $this->is_init_slider = true;
61 63 }
62 64 }
... ... @@ -71,7 +73,11 @@ class SliderWidget extends Widget
71 73 ', 1);
72 74  
73 75 $this->view->registerCssFile (\Yii::$app->request->BaseUrl . '/js/widget-carousel/'.$slider->title.'/style.css');
74   - $this->view->registerJsFile (\Yii::$app->request->BaseUrl . '/js/widget-carousel/'.$slider->title.'/style.js');
  76 +
  77 + $this->view->registerJsFile(\Yii::$app->request->BaseUrl . '/js/widget-carousel/'.$slider->title.'/style.js',[
  78 + 'position' => View::POS_END,
  79 + 'depends' => ['yii\web\JqueryAsset']
  80 + ]);
75 81 }
76 82  
77 83 public function htmlSlider ($slider, $images)
... ...