Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions assets/DevtoolsAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,11 @@

namespace humhub\modules\devtools\assets;

use yii\web\AssetBundle;
use humhub\components\assets\AssetBundle;

class DevtoolsAsset extends AssetBundle
{
public $defer = true;

public $publishOptions = [
'forceCopy' => false,
];
public $forceCopy = false;
public $sourcePath = '@devtools/resources';
public $jsOptions = ['position' => \yii\web\View::POS_END];
public $css = ['css/humhub.devtools.css'];
Expand Down
4 changes: 1 addition & 3 deletions assets/GiiAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

use humhub\assets\FontAwesomeAsset;
use humhub\assets\Select2Asset;
use humhub\components\assets\AssetBundle;
use yii\bootstrap\BootstrapAsset;
use yii\web\AssetBundle;
use yii\web\JqueryAsset;

class GiiAsset extends AssetBundle
Expand All @@ -26,6 +26,4 @@ class GiiAsset extends AssetBundle
];

public $depends = [BootstrapAsset::class, JqueryAsset::class, Select2Asset::class, FontAwesomeAsset::class];


}
8 changes: 3 additions & 5 deletions gii/templates/modules/simple/assets/Assets.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace <?= $generator->getClassNamespace('assets'); ?>;

use yii\web\AssetBundle;
use humhub\components\assets\AssetBundle;

/**
* AssetsBundles are used to include assets as javascript or css files
Expand All @@ -20,11 +20,9 @@ class Assets extends AssetBundle
public $jsOptions = ['position' => \yii\web\View::POS_END];

/**
* @var array change forceCopy to true when testing your js in order to rebuild this assets on every request (otherwise they will be cached)
* @var bool change to true when testing your js in order to rebuild this assets on every request (otherwise they will be cached)
*/
public $publishOptions = [
'forceCopy' => false
];
public $forceCopy = false;

public $js = [
'js/humhub.<?= $generator->moduleID ?>.js'
Expand Down