Merge branch 'fixBug' into 'master'

Fix the issue of md preview module in Alfresco 5.2.1

See merge request !1
This commit is contained in:
peter 2017-09-13 08:28:02 +09:30
commit 5a688398bb
4 changed files with 13 additions and 2 deletions

View File

@ -30,7 +30,7 @@ configurations {
all*.exclude group: 'maven-plugins'
}
version = "1.1.0"
version = "1.1.1"
ext {
alfresco = [:]

View File

@ -20,6 +20,7 @@
border-right: 1px solid #ccc;
padding: 10px;
margin-left: 3px;
text-align: left;
}
@ -300,6 +301,8 @@
.markdown-body li {
list-style: inside !important;
float: none;
text-align: left;
}
.markdown-body ul,

View File

@ -13,6 +13,14 @@
<css>/res/components/preview/MarkDown.css</css>
</dependencies>
</customization>
<customization>
<targetPackageRoot>org.alfresco.components.documentlibrary</targetPackageRoot>
<sourcePackageRoot>com.parashift.markdown.preview-config</sourcePackageRoot>
<dependencies>
<js>/res/components/preview/MarkDown.js</js>
<css>/res/components/preview/MarkDown.css</css>
</dependencies>
</customization>
</customizations>
</module>
</modules>

View File

@ -7,7 +7,7 @@ if (model.widgets)
{
//We need to know some extra bits about the node, such as the repoPath to display images
pObj = eval('(' + remote.call("/slingshot/doclib2/node/" + url.args.nodeRef.replace(":/","")) + ')');
pObj = eval('(' + remote.call("/slingshot/doclib2/node/" + model.nodeRef.replace(":/","")) + ')');
//We check to see if the mime type is markdown, and if so, overwrite the conditions object.
if(pObj.item && pObj.item.node && pObj.item.node.mimetype == "text/x-markdown") {