diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2019-05-06 14:49:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-06 14:49:35 +0300 |
| commit | db76ab48c4ce23d727db4c2cc3ca13ebadef6d16 (patch) | |
| tree | 30787e4caad8c6d3e8a4f1f8f2361897f341008f | |
| parent | 5ea661ad0b2aa3c95b1a56a6e63aa4a775cc3640 (diff) | |
| parent | 4a1999f813a4ec91b3d6ec14a22b17e157bae054 (diff) | |
Merge pull request #150 from nextcloud/backport/149/stable16v16.0.1RC1
[stable16] Use correct CSS URL, remove default marked settings and change to GFM rendering
| -rw-r--r-- | appinfo/app.php | 2 | ||||
| -rw-r--r-- | js/public-share.js | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/appinfo/app.php b/appinfo/app.php index 756ac67..ecbadbb 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -19,5 +19,5 @@ if (\OC::$server->getUserSession()->isLoggedIn()) { $eventDispatcher->addListener('OCA\Files_Sharing::loadAdditionalScripts', function () { OC_Util::addVendorScript('core', 'marked/marked.min'); OCP\Util::addScript('files_texteditor', 'public-share'); - OCP\Util::addStyle('files_texteditor', '../build/public-share'); + OCP\Util::addStyle('files_texteditor', 'public-share'); }); diff --git a/js/public-share.js b/js/public-share.js index 133ba62..9f29cf4 100644 --- a/js/public-share.js +++ b/js/public-share.js @@ -53,11 +53,7 @@ $(document).ready(function(){ .html(DOMPurify.sanitize( marked(content, { renderer: renderer, - gfm: false, - breaks: false, - pedantic: false, - smartLists: true, - smartypants: false + smartLists: true }), { SAFE_FOR_JQUERY: true |