mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-08-05 05:37:45 +02:00
Code Issues Releases Wiki Activity

Version 1.5.1: Fix code syntax in raw editor, fix codeblocks, fix post errors, load post-vue conditionally

Browse Source
This commit is contained in:
trendschau
2021-11-21 15:39:45 +01:00
parent 63c8b204d7
commit 1f06da7b19
9 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
system/Controllers/ControllerAuthorArticleApi.php
View File

@@ -722,7 +722,7 @@ class ControllerAuthorArticleApi extends ControllerAuthor
# update the structure for editor
$this->setFreshStructureDraft();
$folder = Folder::getItemWithKeyPath($this->structureYaml, $folderKeyPath);
$folder = Folder::getItemWithKeyPath($this->structureDraft, $folderKeyPath);
# activate this if you want to redirect after creating the page...
# $url = $this->uri->getBaseUrl() . '/tm/content/' . $this->settings['editor'] . $folder->urlRelWoF . '/' . $slug;
@@ -1031,7 +1031,6 @@ class ControllerAuthorArticleApi extends ControllerAuthor
{
$content[0] = trim($content[0], "# ");
}
return $response->withJson(array('data' => $content, 'errors' => false));
}

6
system/Extensions/ParsedownExtension.php
View File

@@ -994,6 +994,11 @@ class ParsedownExtension extends \ParsedownExtra
);
}
# keep empty lines in pre-tags
if($CurrentBlock['type'] == 'FencedCode' && isset($current['text']))
{
$current['text'] .= "\n";
}
continue;
}
@@ -1050,7 +1055,6 @@ class ParsedownExtension extends \ParsedownExtra
# current block failed to "eat" current line
# let's see if we can start a new block
$marker = $text[0];
# ~

3
system/author/editor/editor-raw.twig
View File

@@ -45,7 +45,8 @@
</div>
<div class="large" :class="{'error' : errors.content}">
<label for="content">{{ __('Content') }}*</label>
<textarea id="content" v-model="form.content" @input="changeContent" required>{{ content }}</textarea>
<textarea @input="changeContent" v-model="form.content" required></textarea>
<div id="content" style="display:none" v-pre>{{ content }}</div>
<span class="error" v-if="errors.content">${ errors.content }</span>
</div>
<input id="path" type="hidden" value="{{ item.urlRel }}" required readonly />

2
system/author/js/vue-editor.js
View File

@@ -8,7 +8,7 @@ let editor = new Vue({
},
form: {
title: document.getElementById("title").value,
content: document.getElementById("content").value,
content: document.getElementById("content").innerHTML,
},
showEditor: 'show',
},

2
system/author/js/vue-meta.js
View File

@@ -146,8 +146,8 @@ let meta = new Vue({
{
editor.showEditor = 'hidden';
posts.showPosts = 'hidden';
}
return 'tab-' + this.currentTab.toLowerCase()
}
}
},
mounted: function(){

2
system/author/js/vue-posts.js
View File

@@ -66,4 +66,4 @@ let posts = new Vue({
});
}
}
})
})

6
system/author/layouts/layoutBlox.twig
View File

@@ -62,7 +62,11 @@
{{ assets.renderEditorJS() }}
<script src="{{ base_url }}/system/author/js/vue-blox.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/vue-posts.js?20211010"></script>
{% if item.elementType == "folder" %}
<script src="{{ base_url }}/system/author/js/vue-posts.js?20211010"></script>
{% else %}
<script>let posts = false;</script>
{% endif %}
<script src="{{ base_url }}/system/author/js/sortable.min.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/vuedraggable.umd.min.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/vue-navi.js?20211010"></script>

6
system/author/layouts/layoutEditor.twig
View File

@@ -59,7 +59,11 @@
{{ assets.renderEditorJS() }}
<script src="{{ base_url }}/system/author/js/vue-editor.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/vue-posts.js?20211010"></script>
{% if item.elementType == "folder" %}
<script src="{{ base_url }}/system/author/js/vue-posts.js?20211010"></script>
{% else %}
<script>let posts = false;</script>
{% endif %}
<script src="{{ base_url }}/system/author/js/sortable.min.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/vuedraggable.umd.min.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/vue-navi.js?20211010"></script>