Skip to content

T
taskonsite-архив-перенесен
Commit 6b9fd9a1 authored by Олег Гиммельшпах's avatar Олег Гиммельшпах
Browse files
Options

fix js

parent 5a5b71c3
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 14 deletions
backend/assets/AppAsset.php
View file @ 6b9fd9a1
...@@ -29,8 +29,13 @@ class AppAsset extends AssetBundle ...@@ -29,8 +29,13 @@ class AppAsset extends AssetBundle
'plugins/bootstrap-datetimepicker/js/bootstrap-datetimepicker.js', 'plugins/bootstrap-datetimepicker/js/bootstrap-datetimepicker.js',
'plugins/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.ru.js', 'plugins/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.ru.js',
'plugins/tinymce/js/tinymce/tinymce.min.js', 'plugins/tinymce/js/tinymce/tinymce.min.js',
'js/form-load.js'
]; ];
public $depends = [ public $depends = [
'yii\web\JqueryAsset',
'yii\jui\JuiAsset',
'yii\bootstrap\BootstrapAsset',
'yii\bootstrap\BootstrapPluginAsset',
'backend\assets\HeadAsset'
]; ];
} }
backend/assets/HeadAsset.php
View file @ 6b9fd9a1
...@@ -22,15 +22,19 @@ class HeadAsset extends AssetBundle ...@@ -22,15 +22,19 @@ class HeadAsset extends AssetBundle
public $js = [ public $js = [
'plugins/switchery/switchery.min.js', 'plugins/switchery/switchery.min.js',
'plugins/powerange/powerange.min.js', 'plugins/powerange/powerange.min.js',
'plugins/pace/pace.min.js',
'js/form-slider-switcher.demo.min.js', 'js/form-slider-switcher.demo.min.js',
'js/apps.min.js',
'js/packages/adminBaseClasses/buttonSet.js', 'js/packages/adminBaseClasses/buttonSet.js',
'js/packages/adminBaseClasses/gridBase.js', 'js/packages/adminBaseClasses/gridBase.js',
'js/apps.min.js',
]; ];
public $jsOptions = [ public $jsOptions = [
'position' => \yii\web\View::POS_HEAD 'position' => \yii\web\View::POS_HEAD
]; ];
public $depends = [ public $depends = [
'yii\web\JqueryAsset',
'yii\jui\JuiAsset',
'yii\bootstrap\BootstrapAsset',
'yii\bootstrap\BootstrapPluginAsset',
]; ];
} }
backend/views/layouts/blank.php
View file @ 6b9fd9a1
...@@ -54,11 +54,6 @@ AppAsset::register($this); ...@@ -54,11 +54,6 @@ AppAsset::register($this);
<?php $this->endBody() ?> <?php $this->endBody() ?>
<?php <?php
$this->registerJsFile('/plugins/jquery/jquery-1.9.1.js', ['position' => \yii\web\View::POS_END]);
$this->registerJsFile('/plugins/jquery/jquery-migrate-1.1.0.js', ['position' => \yii\web\View::POS_END ]);
$this->registerJsFile('/plugins/jquery-ui/ui/minified/jquery-ui.min.js', ['position' => \yii\web\View::POS_END ]);
$this->registerJsFile('/plugins/bootstrap/js/bootstrap.min.js', ['position' => \yii\web\View::POS_END ]);
$this->registerJsFile('/js/yii.activeForm.js', ['position' => \yii\web\View::POS_END]);
$this->registerJsFile('/plugins/jquery/jquery-1.9.1.js', ['position' => \yii\web\View::POS_HEAD]); $this->registerJsFile('/plugins/jquery/jquery-1.9.1.js', ['position' => \yii\web\View::POS_HEAD]);
$this->registerJsFile('/plugins/jquery/jquery-migrate-1.1.0.js', ['position' => \yii\web\View::POS_HEAD ]); $this->registerJsFile('/plugins/jquery/jquery-migrate-1.1.0.js', ['position' => \yii\web\View::POS_HEAD ]);
......
backend/views/layouts/head.php
View file @ 6b9fd9a1
...@@ -16,7 +16,3 @@ ...@@ -16,7 +16,3 @@
<?php $this->registerCssFile('/plugins/gritter/css/jquery.gritter.css', ['position' => \yii\web\View::POS_HEAD ]);?> <?php $this->registerCssFile('/plugins/gritter/css/jquery.gritter.css', ['position' => \yii\web\View::POS_HEAD ]);?>
<?php $this->registerCssFile('/plugins/DataTables/css/data-table.css', ['position' => \yii\web\View::POS_HEAD ]);?> <?php $this->registerCssFile('/plugins/DataTables/css/data-table.css', ['position' => \yii\web\View::POS_HEAD ]);?>
<?php $this->registerJsFile('/plugins/pace/pace.min.js', ['position' => \yii\web\View::POS_HEAD ]);?>
<?php $this->registerJsFile('/js/form-load.js', ['position' => \yii\web\View::POS_END ]);?>
backend/views/layouts/main.php
View file @ 6b9fd9a1
...@@ -9,7 +9,6 @@ use yii\widgets\Breadcrumbs; ...@@ -9,7 +9,6 @@ use yii\widgets\Breadcrumbs;
/* @var $content string */ /* @var $content string */
//die('-!-!-'); //die('-!-!-');
assets\AppAsset::register($this); assets\AppAsset::register($this);
assets\HeadAsset::register($this);
?> ?>
<?php $this->beginPage() ?> <?php $this->beginPage() ?>
<!DOCTYPE html> <!DOCTYPE html>
......
backend/views/site/login.php
View file @ 6b9fd9a1
...@@ -119,6 +119,6 @@ $this->params['breadcrumbs'][] = $this->title; ...@@ -119,6 +119,6 @@ $this->params['breadcrumbs'][] = $this->title;
<?php <?php
$this->registerJsFile('/js/login-v2.demo.min.js', ['position' => \yii\web\View::POS_END ]); $this->registerJsFile('/js/login-v2.demo.min.js', ['position' => \yii\web\View::POS_END ]);
$this->registerJsFile('/js/apps.min.js', ['position' => \yii\web\View::POS_END ]); // $this->registerJsFile('/js/apps.min.js', ['position' => \yii\web\View::POS_END ]);
$this->registerJs('App.init();LoginV2.init();', \yii\web\View::POS_READY); $this->registerJs('App.init();LoginV2.init();', \yii\web\View::POS_READY);
?> ?>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

task-on.com - ООО "Арт Проект"