pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] OPW 573134: wiki: fix 'wikijs' support of syntax: h1, h2, h3, img, attach

Browse Source 
bzr revid: xal@openerp.com-20120427115924-vswbm3at6ke412g5
This commit is contained in:
Xavier ALT
2012-04-27 13:59:24 +02:00
parent 56e649d185 2b619bd2a7
commit d73d9e4254
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/wiki/static/src/lib/wiky/wiky.js
+16 -9
View File
@@ -11,17 +11,20 @@ wiky.process = function(wikitext) {
var lines = wikitext.split(/\r?\n/);
var start;
var html = "";
for (var i=0;i<lines.length;i++)
{
var line = lines[i];
if (line.match(/^===/)!=null && line.match(/===$/)!=null)
{
html += "<h2>"+line.substring(3,line.length-3)+"</h2>";
html += "<h3>"+line.substring(3,line.length-3)+"</h3>";
}
else if (line.match(/^==/)!=null && line.match(/==$/)!=null)
{
html += "<h3>"+line.substring(2,line.length-2)+"</h3>";
html += "<h2>"+line.substring(2,line.length-2)+"</h2>";
}
else if (line.match(/^=/)!=null && line.match(/=$/)!=null)
{
html += "<h1>"+line.substring(1,line.length-1)+"</h1>";
}
else if (line.match(/^:+/)!=null)
{
@@ -54,6 +57,14 @@ wiky.process = function(wikitext) {
html += wiky.process_bullet_point(lines,start,i);
}
else if (line.match(/^img:/)!=null)
{
html += wiky.process_image(line.substring(4));
}
else if (line.match(/^attach:/)!=null)
{
html += "<a href='"+line.substring(7)+"'>Download the file</a>"
}
else
{
html += wiky.process_normal(line);
@@ -61,7 +72,6 @@ wiky.process = function(wikitext) {
html += "<br/>\n";
}
return html;
};
@@ -97,7 +107,6 @@ wiky.process_indent = function(lines,start,end) {
wiky.process_bullet_point = function(lines,start,end) {
var html = (lines[start].charAt(0)=='*')?"<ul>":"<ol>";
for(var i=start;i<=end;i++) {
html += "<li>";
@@ -197,11 +206,9 @@ wiky.process_image = function(txt) {
if (index > -1)
{
url = txt.substring(0,index);
label = txt.substring(index+1);
label = txt.substring(0,index);
url = txt.substring(index+1);
}
return "<img src='"+url+"' alt=\""+label+"\" />";
};