Merge pull request #23 from Yuq140/master

Rename compact function to compactTheme

README.md

@@ -43,7 +43,7 @@ public function fields(Request $request) {
 
 ### Themes
 
-Available themes: `chrome, compact, grayscale, material, photoshop, sketch, slider, swatches, twitter`.
+Available themes: `chrome, compactTheme, grayscale, material, photoshop, sketch, slider, swatches, twitter`.
 
 See the theme demos [here](http://xiaokaike.github.io/vue-color/).
 
@@ -76,7 +76,7 @@ Adding custom pallette colors to the pickers can be done like so:
 
 ```php
 Color::make('Color')
-  ->compact()
+  ->compactTheme()
   ->palette(['#beaf00', '#DEADAF', '#000']),
 ```
 

src/Color.php

@@ -4,8 +4,8 @@
 
 use Exception;
 use Laravel\Nova\Fields\Field;
-use Laravel\Nova\Http\Requests\NovaRequest;
 use Laravel\Nova\Fields\SupportsDependentFields;
+use Laravel\Nova\Http\Requests\NovaRequest;
 
 class Color extends Field
 {
@@ -48,7 +48,7 @@ public function twitter()
         return $this->pickerType('twitter');
     }
 
-    public function compact()
+    public function compactTheme()
     {
         return $this->pickerType('compact');
     }
@@ -90,15 +90,21 @@ public function hidePicker()
 
     public function saveAs($saveAs = 'hex')
     {
-        if (!in_array($saveAs, ['rgb', 'rgba', 'hex', 'hex8', 'hsl'])) throw new Exception("Invalid saveAs option provided [$saveAs].");
-        $saveAs = ($saveAs === "rgba") ? "rgb" : $saveAs;
+        if (! in_array($saveAs, ['rgb', 'rgba', 'hex', 'hex8', 'hsl'])) {
+            throw new Exception("Invalid saveAs option provided [{$saveAs}].");
+        }
+        $saveAs = ($saveAs === 'rgba') ? 'rgb' : $saveAs;
+
         return $this->withMeta(['saveAs' => $saveAs]);
     }
 
     public function displayAs($displayAs = 'hex')
     {
-        if (!in_array($displayAs, ['rgb', 'rgba', 'hex', 'hex8', 'hsl'])) throw new Exception("Invalid displayAs option provided [$displayAs].");
-        $displayAs = ($displayAs === "rgba") ? "rgb" : $displayAs;
+        if (! in_array($displayAs, ['rgb', 'rgba', 'hex', 'hex8', 'hsl'])) {
+            throw new Exception("Invalid displayAs option provided [{$displayAs}].");
+        }
+        $displayAs = ($displayAs === 'rgba') ? 'rgb' : $displayAs;
+
         return $this->withMeta(['displayAs' => $displayAs]);
     }
 
@@ -108,7 +114,10 @@ protected function fillAttributeFromRequest(NovaRequest $request, $requestAttrib
             // Try to turn into array
             $value = $request[$requestAttribute];
             $arrayValue = json_decode($value, true);
-            if (!empty($arrayValue)) $value = $arrayValue;
+
+            if (! empty($arrayValue)) {
+                $value = $arrayValue;
+            }
 
             $model->{$attribute} = $this->isNullValue($value) ? null : $value;
         }