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

[FIX] Wiki module - several text formating issues

Browse Source 
bzr revid: ado@tinyerp.com-20120328051937-9ad5x6qfhn6r8ihy
This commit is contained in:
ado
2012-03-28 10:49:37 +05:30
parent 85be0cf0a4 e58ad1d4de
commit 1fb9846f6d
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/wiki/static/src/lib/wiky/wiky.js
+17 -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);
}
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;
};
@@ -197,12 +207,10 @@ 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+"\" />";
return "<image src='"+url+"' alt=\""+label+"\" />";
};
wiky.process_video = function(url) {
addons/wiki/wiki.py
+2 -2
View File
@@ -230,9 +230,9 @@ class wiki_history(osv.osv):
text2 = history_pool.read(cr, uid, [v2], ['text_area'])[0]['text_area']
line1 = line2 = ''
if text1:
line1 = tools.ustr(text1.splitlines(1))
line1 = text1.splitlines(1)
if text2:
line2=tools.ustr(text2.splitlines(1))
line2 = text2.splitlines(1)
if (not line1 and not line2) or (line1 == line2):
raise osv.except_osv(_('Warning !'), _('There are no changes in revisions'))
diff = difflib.HtmlDiff()