diff --git a/composer.json b/composer.json index 9777438..a4ec106 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "php": "^7.1", "illuminate/database": "^5.0|^6.0|^7.0", "illuminate/support": "^5.0|^6.0|^7.0", - "laravel/helpers": "^1.0", + "laravel/helpers": "^1.0" }, "license": "MIT", "homepage": "https://github.com/nelkasovic/laravel-full-calendar", diff --git a/src/Qlick/LaravelFullcalendar/Calendar.php b/src/Qlick/LaravelFullcalendar/Calendar.php index f3498e7..661b7d0 100644 --- a/src/Qlick/LaravelFullcalendar/Calendar.php +++ b/src/Qlick/LaravelFullcalendar/Calendar.php @@ -1,6 +1,4 @@ -id)) { + if (!empty($this->id)) { return $this->id; } @@ -232,7 +230,6 @@ public function getOptionsJson() } return $json; - } /** @@ -271,5 +268,4 @@ protected function replaceCallbackPlaceholders($json, $placeholders) return str_replace($search, $replace, $json); } - } diff --git a/src/Qlick/LaravelFullcalendar/Event.php b/src/Qlick/LaravelFullcalendar/Event.php index e5231d4..0b0f6f9 100644 --- a/src/Qlick/LaravelFullcalendar/Event.php +++ b/src/Qlick/LaravelFullcalendar/Event.php @@ -1,4 +1,4 @@ -options; } -} \ No newline at end of file +}