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

Version 1.2.8 Fix Editor

Browse Source
This commit is contained in:
Sebastian
2018-12-06 20:30:53 +01:00
parent 39d59df52a
commit 870c00b2fd
6 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
system/Controllers/ContentApiController.php
View File

@@ -668,8 +668,11 @@ class ContentApiController extends ContentController
$blockArray = $parsedown->text($blockMarkdown);
}
# needed for ToC links
$relurl = '/tm/content/' . $this->settings['editor'] . '/' . $this->item->urlRel;
/* parse markdown-content-array to content-string */
$blockHTML = $parsedown->markup($blockArray);
$blockHTML = $parsedown->markup($blockArray, $relurl);
return $response->withJson(array('content' => $blockHTML, 'markdown' => $blockMarkdown, 'blockId' => $blockId, 'id' => $id, 'errors' => false));
}

7
system/Controllers/ContentBackendController.php
View File

@@ -127,14 +127,17 @@ class ContentBackendController extends ContentController
# turn markdown into an array of markdown-blocks
$content = $parsedown->markdownToArrayBlocks($content);
}
# needed for ToC links
$relurl = '/tm/content/' . $this->settings['editor'] . '/' . $this->item->urlRel;
foreach($content as $key => $block)
{
/* parse markdown-file to content-array */
$contentArray = $parsedown->text($block);
/* parse markdown-content-array to content-string */
$content[$key] = $parsedown->markup($contentArray);
$content[$key] = $parsedown->markup($contentArray, $relurl);
}
# extract title and delete from content array, array will start at 1 after that.

4
system/Controllers/PageController.php
View File

@@ -132,9 +132,9 @@ class PageController extends Controller
/* get the first image from content array */
$firstImage = $this->getFirstImage($contentArray);
/* parse markdown-content-array to content-string */
$contentHTML = $parsedown->markup($contentArray);
$contentHTML = $parsedown->markup($contentArray, $item->urlRel);
$contentHTML = $this->c->dispatcher->dispatch('onHtmlLoaded', new OnHtmlLoaded($contentHTML))->getData();
/* extract the h1 headline*/