Skip to content

Commit ed3dfb1

Browse files
authored
Merge pull request #29 from duckzland/master
NewFeature: Adding asHtml() to TextWithSlug
2 parents b009a84 + baa7a75 commit ed3dfb1

File tree

6 files changed

+37
-12
lines changed

6 files changed

+37
-12
lines changed

Diff for: dist/js/field.js

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: dist/js/field.js.LICENSE.txt

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*!
2+
* Determine if an object is a Buffer
3+
*
4+
* @author Feross Aboukhadijeh <https://feross.org>
5+
* @license MIT
6+
*/
7+
8+
/**
9+
* @license
10+
* Lodash <https://lodash.com/>
11+
* Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
12+
* Released under MIT license <https://lodash.com/license>
13+
* Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
14+
* Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
15+
*/

Diff for: dist/mix-manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"/js/field.js": "/js/field.js",
33
"/css/field.css": "/css/field.css"
4-
}
4+
}

Diff for: package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
1111
},
1212
"devDependencies": {
13-
"cross-env": "^5.0.0",
14-
"laravel-mix": "^1.0",
15-
"laravel-nova": "^1.0"
13+
"cross-env": "^7.0.3",
14+
"laravel-mix": "^5.0.9",
15+
"laravel-nova": "^1.6.0"
1616
},
1717
"dependencies": {
1818
"speakingurl": "^14.0.1",

Diff for: resources/js/components/TextWithSlug/IndexField.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<template>
2-
<span>{{ field.value }}</span>
2+
<div v-if="field.asHtml" v-html="field.value"></div>
3+
<span v-else class="whitespace-no-wrap">{{ field.value }}</span>
34
</template>
45

56
<script>

Diff for: resources/js/field.js

+14-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
1+
import SlugIndexField from './components/Slug/IndexField';
2+
import SlugDetailField from './components/Slug/DetailField';
3+
import SlugFormField from './components/Slug/FormField';
4+
5+
import TextSlugIndexField from './components/TextWithSlug/IndexField';
6+
import TextSlugDetailField from './components/TextWithSlug/DetailField';
7+
import TextSlugFormField from './components/TextWithSlug/FormField';
8+
19
Nova.booting((Vue, router) => {
2-
Vue.component('index-nova-slug-field', require('./components/Slug/IndexField'));
3-
Vue.component('detail-nova-slug-field', require('./components/Slug/DetailField'));
4-
Vue.component('form-nova-slug-field', require('./components/Slug/FormField'));
10+
Vue.component('index-nova-slug-field', SlugIndexField);
11+
Vue.component('detail-nova-slug-field', SlugDetailField);
12+
Vue.component('form-nova-slug-field', SlugFormField);
513

6-
Vue.component('index-nova-textwithslug-field', require('./components/TextWithSlug/IndexField'));
7-
Vue.component('detail-nova-textwithslug-field', require('./components/TextWithSlug/DetailField'));
8-
Vue.component('form-nova-textwithslug-field', require('./components/TextWithSlug/FormField'));
14+
Vue.component('index-nova-textwithslug-field', TextSlugIndexField);
15+
Vue.component('detail-nova-textwithslug-field', TextSlugDetailField);
16+
Vue.component('form-nova-textwithslug-field', TextSlugFormField);
917
})

0 commit comments

Comments
 (0)