remove module

dev7ch · Dec 29, 2017 · 925a813 · 925a813
1 parent 5ea4f0d
commit 925a813
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 93 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /vendor/
+/assets
 luya
 /.settings/
 /.buildpath

diff --git a/assets/.gitignore b/assets/.gitignore
diff --git a/src/Module.php b/src/Module.php
@@ -37,56 +37,4 @@ public static function t($message, array $params = [], $category = 'slick')
         return parent::baseT($category, $message, $params);
     }
 
-    /**
-     * Loading and parsing of json config array.
-     *
-     * @param $file
-     *
-     * @throws \luya\Exception
-     *
-     * @return string
-     *
-     * @internal param string $message
-     * @internal param array $params
-     */
-    private static function jsonLoad($file)
-    {
-        if (file_exists(\Yii::$app->getWebroot().'/'.$file)) {
-            file_get_contents(\Yii::$app->getWebroot().'/'.$file);
-
-            return  json_decode($file, true);
-        } else {
-            throw new  \luya\Exception('Slick.js configs:'.\Yii::$app->getWebroot().'/'.$file.' was not found.');
-        }
-    }
-
-    /**
-     * Load Slick.js options via LUYA configs as $params.
-     *
-     * @return bool|string|array
-     *
-     * @internal param array $params
-     */
-    public static function slickConfig()
-    {
-        $params = self::getInstance()->params;
-
-        if (array_key_exists('slickConfig', $params) && $params['slickConfig'] === true) {
-            return self::jsonLoad('slick-config.json');
-        }
-
-        if (array_key_exists('slickConfig', $params) && is_string($params['slickConfig'])) {
-            return self::jsonLoad($params['slickConfig']);
-        }
-
-        if (array_key_exists('slickConfig', $params) && is_array($params['slickConfig'])) {
-            return $params['slickConfig'];
-        }
-
-        if (array_key_exists('slickConfig', $params) && is_bool($params['slickConfig'] === false)) {
-            return false;
-        }
-
-        return false;
-    }
 }
diff --git a/src/SlickWidget.php b/src/SlickWidget.php
@@ -22,11 +22,7 @@ public function init()
         SlickAsset::register($this->getView());
         ResourcesAsset::register($this->getView());
 
-        if (Module::slickConfig() !== false) {
-            $this->slickConfig = Module::slickConfig();
-        } else {
-            $this->slickConfig = $this->slickConfigWidget;
-        }
+        $this->slickConfig = $this->slickConfigWidget;
 
         $this->view->registerJs(
             "var slickSlider = $('.slick-slider').slick({"

diff --git a/src/controllers/DefaultController.php b/src/controllers/DefaultController.php
diff --git a/src/views/blocks/SlickBlock.php b/src/views/blocks/SlickBlock.php
@@ -9,7 +9,7 @@
     'images'            => $images,
     'slickConfigWidget' => [
         'infinite'       => 'true',
-        'slidesToShow'   => '2',
+        'slidesToShow'   => '1',
         'slidesToScroll' => '1',
         'autoplay'       => 'true',
         'autoplaySpeed'  => '5000',

diff --git a/src/views/default/index.php b/src/views/default/index.php
diff --git a/tests/SlickBlockTest.php b/tests/SlickBlockTest.php
@@ -16,7 +16,7 @@ public function testEmpty()
 
     public function files_are_equal($a, $b)
     {
-        // Check if filesize is different
+        // Check if file size is different
         if(filesize($a) !== filesize($b))
             return false;
 
@@ -44,8 +44,8 @@ public function testWidgetView() {
 
 
         $is = ['view' => fopen(dirname(__FILE__, 2) . '/src/views/SlickSlider.php', 'rb')];
-        $should = [ 'view' => fopen(dirname(__FILE__) . '/data/views/SlickSlider.php', 'rb')];
-        $this->assertSameSize($is,$should);
+        $should = ['view' => fopen(dirname(__FILE__) . '/data/views/SlickSlider.php', 'rb')];
+        $this->assertSameSize($is, $should);
 
     }