Skip to content

Commit

Permalink
fix incompatibility issue with laravel nova 3.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
milewski committed Apr 16, 2020
1 parent 6f38fdb commit cc66b4b
Show file tree
Hide file tree
Showing 6 changed files with 10,080 additions and 9 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/.idea
/vendor
/node_modules
package-lock.json
composer.phar
composer.lock
phpunit.xml
Expand Down
2 changes: 1 addition & 1 deletion dist/js/field.js

Large diffs are not rendered by default.

10,077 changes: 10,077 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"devDependencies": {
"cross-env": "^7.0.2",
"laravel-mix": "^5.0.4",
"laravel-nova": "^1.2.0",
"laravel-nova": "^1.2.2",
"vue-template-compiler": "^2.6.11"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/FormField.vue
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
* Set the initial, internal value for the field.
*/
setInitialValue() {
this.value = this.field.value || this.field.default || null
this.value = this.field.value || null
},
/**
Expand Down
5 changes: 0 additions & 5 deletions src/InlineMorphTo.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,6 @@ public function types(array $types): self

}

public function default(string $resource): self
{
return $this->withMeta([ 'default' => $resource ]);
}

private function resolveFields(Resource $resourceInstance): Collection
{

Expand Down

0 comments on commit cc66b4b

Please sign in to comment.