diff --git a/package.json b/package.json index fec5bc2bab..9024cc068b 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "socket.io-wildcard": "~0.1.1", "bcryptjs": "~0.7.10", "nodebb-plugin-mentions": "~0.4", - "nodebb-plugin-markdown": "~0.3", + "nodebb-plugin-markdown": "~0.4", "nodebb-widget-essentials": "~0.0", "nodebb-theme-vanilla": "~0.0.14", "nodebb-theme-cerulean": "~0.0.13", diff --git a/public/language/en_GB/topic.json b/public/language/en_GB/topic.json index 085f8df821..d92093720d 100644 --- a/public/language/en_GB/topic.json +++ b/public/language/en_GB/topic.json @@ -91,6 +91,5 @@ "composer.thumb_file_label": "Or upload a file", "composer.thumb_remove": "Clear fields", "composer.drag_and_drop_images": "Drag and Drop Images Here", - "composer.content_is_parsed_with": "Content is parsed with", "composer.upload_instructions": "Upload images by dragging & dropping them." } diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index 45b8c2b974..1862092834 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -638,6 +638,13 @@ define(['taskbar'], function(taskbar) { } }); + socket.emit('modules.composer.renderHelp', function(err, html) { + if (html && html.length > 0) { + postContainer.find('.help').html(html); + postContainer.find('[data-pane=".tab-help"]').parent().removeClass('hidden'); + } + }); + $(window).trigger('action:composer.loaded', { post_uuid: post_uuid }); diff --git a/public/templates/composer.tpl b/public/templates/composer.tpl index 584ba48153..7302c9a040 100644 --- a/public/templates/composer.tpl +++ b/public/templates/composer.tpl @@ -58,6 +58,7 @@