vertumnus
/
primevue-mirror
mirror of https://github.com/primefaces/primevue.git
1
0
Fork 0
Code Packages Releases Activity

Merge branch 'master' of https://github.com/primefaces/primevue

pull/6798/head
Cagatay Civici 2024-11-13 15:17:18 +03:00
parent 27584e7d48 eab946c088
commit 85f9ca0b91
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/showcase/doc/editor/BasicDoc.vue
View File

@ -5,7 +5,7 @@
<div class="card"> <div class="card">
<Editor v-model="value" editorStyle="height: 320px" /> <Editor v-model="value" editorStyle="height: 320px" />
</div> </div>
<DocSectionCode :code="code" :dependencies="{ quill: '1.3.7' }" component="Editor" /> <DocSectionCode :code="code" :dependencies="{ quill: '2.0.0' }" component="Editor" />
</template> </template>
<script> <script>

2
apps/showcase/doc/editor/ReadOnlyDoc.vue
View File

@ -5,7 +5,7 @@
<div class="card"> <div class="card">
<Editor v-model="value" editorStyle="height: 320px" readonly /> <Editor v-model="value" editorStyle="height: 320px" readonly />
</div> </div>
<DocSectionCode :code="code" :dependencies="{ quill: '1.3.7' }" component="Editor" /> <DocSectionCode :code="code" :dependencies="{ quill: '2.0.0' }" component="Editor" />
</template> </template>
<script> <script>

2
apps/showcase/doc/editor/TemplateDoc.vue
View File

@ -13,7 +13,7 @@
</template> </template>
</Editor> </Editor>
</div> </div>
<DocSectionCode :code="code" :dependencies="{ quill: '1.3.7' }" component="Editor" /> <DocSectionCode :code="code" :dependencies="{ quill: '2.0.0' }" component="Editor" />
</template> </template>
<script> <script>

4
apps/showcase/package.json
View File

@ -46,7 +46,7 @@
"postcss": "^8.4.31", "postcss": "^8.4.31",
"prettier": "2.7.1", "prettier": "2.7.1",
"primeicons": "^7.0.0", "primeicons": "^7.0.0",
"quill": "^1.3.7", "quill": "2.0.0",
"sass": "1.45.0", "sass": "1.45.0",
"sass-loader": "8.0.2", "sass-loader": "8.0.2",
"tailwindcss": "^3.4.1", "tailwindcss": "^3.4.1",
@ -69,4 +69,4 @@
"engines": { "engines": {
"node": ">=12.11.0" "node": ">=12.11.0"
} }
} }

2
packages/primevue/src/editor/Editor.vue
View File

@ -124,7 +124,7 @@ export default {
methods: { methods: {
renderValue(value) { renderValue(value) {
if (this.quill) { if (this.quill) {
if (value) this.quill.setContents(this.quill.clipboard.convert(value)); if (value) this.quill.clipboard.dangerouslyPasteHTML(value);
else this.quill.setText(''); else this.quill.setText('');
} }
}, },