Skip to content

Commit

Permalink
Merge pull request #3670 from z-song/analysis-zd79YJ
Browse files Browse the repository at this point in the history
Apply fixes from StyleCI
  • Loading branch information
z-song authored Jul 21, 2019
2 parents 284eeea + 4b59446 commit 822412b
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 6 deletions.
1 change: 0 additions & 1 deletion src/Actions/Interactor/Form.php
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,6 @@ public function addModalHtml()
public function getModalId()
{
if (!$this->modalId) {

if ($this->action instanceof RowAction) {
$this->modalId = uniqid('row-action-modal-');
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/Grid/Concerns/HasActions.php
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,4 @@ protected function appendActionsColumn()
$this->addColumn(Grid\Column::ACTION_COLUMN_NAME, trans('admin.action'))
->displayUsing($this->getActionClass(), [$this->actionsCallback]);
}
}
}
4 changes: 2 additions & 2 deletions src/Grid/Row.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ class Row
*/
public function __construct($number, $data, $keyName)
{
$this->data = $data;
$this->number = $number;
$this->data = $data;
$this->number = $number;
$this->keyName = $keyName;
}

Expand Down
1 change: 0 additions & 1 deletion src/Traits/HasAssets.php
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@ public static function baseJs($js = null)
public static function script($script = '', $deferred = false)
{
if (!empty($script)) {

if ($deferred) {
return self::$deferredScript = array_merge(self::$deferredScript, (array) $script);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Widgets/Navbar/Fullscreen.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use Illuminate\Contracts\Support\Renderable;

/**
* Class FullScreen
* Class FullScreen.
*
* @see https://javascript.ruanyifeng.com/htmlapi/fullscreen.html
*/
Expand Down

0 comments on commit 822412b

Please sign in to comment.