Skip to content

Commit

Permalink
Merge branch 'release/1.1.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
pdanpdan committed Nov 22, 2023
2 parents 13c5dff + 6c72b71 commit 2d11404
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pdanpdan/quasar-play",
"version": "1.1.7",
"version": "1.1.8",
"description": "Playground for Quasar Framework",
"productName": "Quasar Play",
"author": {
Expand Down
7 changes: 4 additions & 3 deletions src/components/ShareDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
color="primary"
v-model="settings.previewMode"
:options="previewModeOptions"
:disable="settings.preview !== 'output'"
/>
</q-card-section>

Expand All @@ -46,7 +47,7 @@ const canShare = ref<boolean | null>(null);
const settings = reactive({
preview: 'output',
previewMode: 'preview',
editor: 'mirror',
editor: 'codemirror',
});
const previewOptions = [
Expand All @@ -63,13 +64,13 @@ const previewModeOptions = [
const editorOptions = [
{ value: 'monaco', label: locale.shareOptions.editorMonaco },
{ value: 'mirror', label: locale.shareOptions.editorMirror },
{ value: 'codemirror', label: locale.shareOptions.editorMirror },
];
const urlSearch = new URLSearchParams(location.search);
settings.preview = [ '', 'true', 't', '1' ].includes(String(urlSearch.get('preview')).toLowerCase()) ? 'output' : 'code';
settings.previewMode = (urlSearch.get('previewMode') || urlSearch.get('preview-mode') || 'preview').toLowerCase();
settings.editor = (urlSearch.get('editor') || 'monaco').toLowerCase().includes('mir') ? 'mirror' : 'monaco';
settings.editor = (urlSearch.get('editor') || 'monaco').toLowerCase().includes('mir') ? 'codemirror' : 'monaco';
</script>

<script setup lang="ts">
Expand Down

0 comments on commit 2d11404

Please sign in to comment.