update

skeeks-semenov · Nov 12, 2021 · 9209bba · 9209bba
1 parent 02b27b4
commit 9209bba
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 48 deletions.
diff --git a/src/assets/BaseAsset.php b/src/assets/BaseAsset.php
@@ -8,65 +8,20 @@
  * @date 24.01.2015
  * @since 1.0.0
  */
+
 namespace skeeks\sx\assets;
+
 use skeeks\sx\File;
 use yii\web\AssetBundle;
 
 /**
  * Class BaseAsset
  * @package skeeks\sx\assets
  */
-abstract class BaseAsset extends AssetBundle
+class BaseAsset extends \skeeks\cms\base\AssetBundle
 {
     public $sourcePath = '@skeeks/sx/assets';
     public $css = [];
     public $js = [];
     public $depends = [];
-
-    /*public function init()
-    {
-        parent::init();
-
-        $this->js = (array) $this->js;
-        if (count($this->js) <= 1)
-        {
-            return;
-        }
-
-        $fileName = 'yii2-sx-' . md5($this->className()) . ".js";
-        $fileMinJs = \Yii::getAlias('@app/runtime/assets/js/' . $fileName);
-
-        if (file_exists($fileMinJs))
-        {
-            $this->js = [
-                $fileName
-            ];
-
-            $this->sourcePath = '@app/runtime/assets/js';
-
-            return;
-        }
-
-        $fileContent = "";
-        foreach ($this->js as $js)
-        {
-            $fileContent .= file_get_contents($this->sourcePath . '/' . $js);
-        }
-
-        if ($fileContent)
-        {
-            $file = new File($fileMinJs);
-            $file->make($fileContent);
-        }
-    }*/
-
-    /**
-     * @param string $asset
-     * @return string
-     * @throws \yii\base\InvalidConfigException
-     */
-    static public function getAssetUrl($asset)
-    {
-        return \Yii::$app->assetManager->getAssetUrl(\Yii::$app->assetManager->getBundle(static::className()), $asset);
-    }
 }
diff --git a/src/assets/Core.php b/src/assets/Core.php
@@ -10,13 +10,20 @@
  */
 namespace skeeks\sx\assets;
 
+use skeeks\sx\File;
 use yii\helpers\Json;
 /**
  * Class Core
  * @package skeeks\sx\assets
  */
 class Core extends BaseAsset
 {
+    public function init()
+    {
+        parent::init();
+        $this->_implodeFiles();
+    }
+
     /**
      * Registers this asset bundle with a view.
      * @param View $view the view to be registered with

diff --git a/src/assets/Custom.php b/src/assets/Custom.php
@@ -15,6 +15,12 @@
  */
 class Custom extends BaseAsset
 {
+    public function init()
+    {
+        parent::init();
+        $this->_implodeFiles();
+    }
+
     public $js = [
         'js/Widget.js',
         'js/helpers/Helpers.js',