cjtterabytesoft / yii2-jvectormap

Jvectormap.php

Spacing +1 added lines, -2 removed lines

@@ -198,8 +198,7 @@
         $this->jvname = $this->jvname . str_replace('_', '-', $this->map) . ".js";
         if (file_exists(yii::getAlias((!$this->maptype ? $this->jvpath : $this->jvpathcustom) . $this->jvname))) {
             JvectormapAsset::register(Yii::$app->view);
-            $this->bundle = !$this->maptype ? MapAsset::register(Yii::$app->view) :
-                MapcustomAsset::register(Yii::$app->view);
+            $this->bundle = !$this->maptype ? MapAsset::register(Yii::$app->view) : MapcustomAsset::register(Yii::$app->view);
             $this->bundle->js[] = $this->jvname; // dynamic map added
             $this->bundle->publishOptions[] = [
                 'only' => [

assets/MapcustomAsset.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
     public $sourcePath = '@webroot/maps/js';
 
-    public function registerAssetFiles($view)     {
+    public function registerAssetFiles($view) {
         parent::registerAssetFiles($view);
     }
 

assets/MapAsset.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
     
     public $sourcePath = "@cjtterabytesoft/jvectormap/assets/maps/js";
 
-    public function registerAssetFiles($view)     {
+    public function registerAssetFiles($view) {
         parent::registerAssetFiles($view);
     }
 

assets/JvectormapAsset.php

Indentation -8 removed lines

@@ -43,11 +43,3 @@
 
     public $depends = [
 <<<<<<< HEAD
-        'yii\web\YiiAsset',      
-=======
-        'yii\web\YiiAsset',
-        'yii\bootstrap\BootstrapAsset',
-        'yii\bootstrap\BootstrapPluginAsset',        
->>>>>>> 36ccbfac055135fc9099db73d4e33646b31650f5
-    ];
-}
\ No newline at end of file

Switch Indentation -8 removed lines

@@ -43,11 +43,3 @@
 
     public $depends = [
 <<<<<<< HEAD
-        'yii\web\YiiAsset',      
-=======
-        'yii\web\YiiAsset',
-        'yii\bootstrap\BootstrapAsset',
-        'yii\bootstrap\BootstrapPluginAsset',        
->>>>>>> 36ccbfac055135fc9099db73d4e33646b31650f5
-    ];
-}
\ No newline at end of file

Spacing +1 added lines, -9 removed lines

@@ -42,12 +42,4 @@
     ];
 
     public $depends = [
-<<<<<<< HEAD
-        'yii\web\YiiAsset',      
-=======
-        'yii\web\YiiAsset',
-        'yii\bootstrap\BootstrapAsset',
-        'yii\bootstrap\BootstrapPluginAsset',        
->>>>>>> 36ccbfac055135fc9099db73d4e33646b31650f5
-    ];
-}
\ No newline at end of file
+<< << <<< HEAD

Braces -8 removed lines

@@ -43,11 +43,3 @@
 
     public $depends = [
 <<<<<<< HEAD
-        'yii\web\YiiAsset',      
-=======
-        'yii\web\YiiAsset',
-        'yii\bootstrap\BootstrapAsset',
-        'yii\bootstrap\BootstrapPluginAsset',        
->>>>>>> 36ccbfac055135fc9099db73d4e33646b31650f5
-    ];
-}
\ No newline at end of file

Upper-Lower-Casing -8 removed lines

@@ -43,11 +43,3 @@
 
     public $depends = [
 <<<<<<< HEAD
-        'yii\web\YiiAsset',      
-=======
-        'yii\web\YiiAsset',
-        'yii\bootstrap\BootstrapAsset',
-        'yii\bootstrap\BootstrapPluginAsset',        
->>>>>>> 36ccbfac055135fc9099db73d4e33646b31650f5
-    ];
-}
\ No newline at end of file