Skip to content

erp5
erp5
Commit 7833ff55 authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

Use index_html instead getTextContent and fix external images handling 

This fixes includes fixes for UTF-8 issues, and the usage of full URLs and/or image reference into image.
parent 517d9a40
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 12 deletions
bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewAsBook.xml
View file @ 7833ff55
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
cleanForPrince();\n cleanForPrince();\n
return false;\n return false;\n
});\n });\n
convertBook(\'getTextContent\', $(\'body\'));\n convertBook(\'index_html?format=html\', $(\'body\'));\n
});\n });\n
</script>\n </script>\n
<title>View as Book</title>\n <title>View as Book</title>\n
......
bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/TestPage_viewAsChapter.xml
View file @ 7833ff55
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
cleanForPrince();\n cleanForPrince();\n
return false;\n return false;\n
});\n });\n
convertChapter(\'getTextContent\', $(\'body\'), true, true, 1, 1);\n convertChapter(\'index_html?format=html\', $(\'body\'), true, true, 1, 1);\n
});\n });\n
</script>\n </script>\n
<title>View as Chapter</title>\n <title>View as Chapter</title>\n
......
bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/book_converter.js.xml
View file @ 7833ff55
...@@ -53,7 +53,7 @@ function convertBook(linkToBook, container){\n ...@@ -53,7 +53,7 @@ function convertBook(linkToBook, container){\n
$(function() {\n $(function() {\n
//Getting the html content\n //Getting the html content\n
$.get(linkToBook, function(data, textStatus, jqXHR){\n $.get(linkToBook, function(data, textStatus, jqXHR){\n
linkToBook = linkToBook.replace(\'getTextContent\',\'\');\n linkToBook = linkToBook.replace(\'index_html?format=html\',\'\');\n
var tocContainer = $(\'<div>\').html(data);\n var tocContainer = $(\'<div>\').html(data);\n
var sections = tocContainer.children();\n var sections = tocContainer.children();\n
body = $(\'<body>\');\n body = $(\'<body>\');\n
...@@ -71,7 +71,7 @@ function convertBook(linkToBook, container){\n ...@@ -71,7 +71,7 @@ function convertBook(linkToBook, container){\n
for(var j = 0; j < p; j++){\n for(var j = 0; j < p; j++){\n
var newChapter = $(\'<div>\').addClass(\'chapter\').attr(\'id\',\'chapter-h-\' + partCounter + \'-\' + (j+1));\n var newChapter = $(\'<div>\').addClass(\'chapter\').attr(\'id\',\'chapter-h-\' + partCounter + \'-\' + (j+1));\n
partContainer.append(newChapter);\n partContainer.append(newChapter);\n
convertChapter($(\'> a\', chapterTitles.eq(j)).attr(\'href\') + \'/getTextContent\', newChapter, false, false);\n convertChapter($(\'> a\', chapterTitles.eq(j)).attr(\'href\') + \'/index_html?format=html\', newChapter, false, false);\n
}\n }\n
body.append(partContainer);\n body.append(partContainer);\n
firstChapter = false;\n firstChapter = false;\n
...@@ -91,7 +91,7 @@ function convertBook(linkToBook, container){\n ...@@ -91,7 +91,7 @@ function convertBook(linkToBook, container){\n
newMatter.addClass(\'endmatter\').attr("id","endmatter-h-" + matterCounter);\n newMatter.addClass(\'endmatter\').attr("id","endmatter-h-" + matterCounter);\n
body.append(newMatter);\n body.append(newMatter);\n
matterCounter++;\n matterCounter++;\n
convertChapter(link.attr(\'href\') + \'/getTextContent\', newMatter, false, false);\n convertChapter(link.attr(\'href\') + \'/index_html?format=html\', newMatter, false, false);\n
}\n }\n
else{\n else{\n
partCounter++;\n partCounter++;\n
......
bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/chapter_converter.js.xml
View file @ 7833ff55
...@@ -52,12 +52,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -52,12 +52,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
var temp = $(\'iframe\', parent.document).contents().children().clone();\n var temp = $(\'iframe\', parent.document).contents().children().clone();\n
$(\'script\', temp).remove();\n $(\'script\', temp).remove();\n
$(\'style, meta:not([name=author])\', temp).remove();\n $(\'style, meta:not([name=author])\', temp).remove();\n
$(\'head\', temp).prepend($(\'<meta>\').attr(\'http-equiv\',\'content-type\').attr(\'content\', \'text/html; charset=utf-8\'));\n
var images = $(\'img\', temp);\n var images = $(\'img\', temp);\n
n = images.length;\n n = images.length;\n
for(var i = 0; i < n; i++){\n for(var i = 0; i < n; i++){\n
var img = images.eq(i);\n var img = images.eq(i);\n
var src = img.attr(\'src\').split(\'?format\')[0].split(\'/\');\n var src = img.attr(\'src\').split(\'?format\')[0].split(\'/\');\n
\n
var extension = img.attr(\'type\');\n var extension = img.attr(\'type\');\n
if(extension == undefined)\n if(extension == undefined)\n
extension = "png";\n extension = "png";\n
...@@ -67,10 +67,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -67,10 +67,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
}\n }\n
var text = temp.html();\n var text = temp.html();\n
var result = "", tagName = "", c = "", chr = "";\n var result = "", tagName = "", c = "", chr = "";\n
var n = text.length;\n
if (text == null) {\n if (text == null) {\n
return false;\n return false;\n
}\n }\n
var n = text.length;\n
var tag = false, tagNameParsing = false;\n var tag = false, tagNameParsing = false;\n
for(var i = 0; i < n; i++){\n for(var i = 0; i < n; i++){\n
chr = text[i];\n chr = text[i];\n
...@@ -186,7 +186,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -186,7 +186,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
titleObj.text(title);\n titleObj.text(title);\n
else\n else\n
$(\'head\').append($(\'<title>\').text(title));\n $(\'head\').append($(\'<title>\').text(title));\n
$(\'head\').append($(\'<meta>\').attr(\'name\',\'author\').attr(\'content\', authors));\n $(\'head\').prepend($(\'<meta>\').attr(\'name\',\'author\').attr(\'content\', authors));\n
titleObj = $(\'<h1>\').text(title);\n titleObj = $(\'<h1>\').text(title);\n
var subtitle = $(\'<h2>\').text(description);\n var subtitle = $(\'<h2>\').text(description);\n
var edition = $(\'<h3>\').text(shortTitle);\n var edition = $(\'<h3>\').text(shortTitle);\n
...@@ -210,7 +210,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -210,7 +210,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
//Getting the html content\n //Getting the html content\n
$.get(link, function(data, textStatus, jqXHR){\n $.get(link, function(data, textStatus, jqXHR){\n
var chapterContainer = $(\'<div>\').addClass(\'chapter\').attr(\'id\', \'chapter-h-\' + partCounter + \'-\' + chapterCounter).html(data);\n var chapterContainer = $(\'<div>\').addClass(\'chapter\').attr(\'id\', \'chapter-h-\' + partCounter + \'-\' + chapterCounter).html(data);\n
link = link.replace("getTextContent","");\n link = link.replace("index_html?format=html","");\n
var sections = $(\'section\', chapterContainer);\n var sections = $(\'section\', chapterContainer);\n
$(\'base,meta,link,title\', chapterContainer).remove();\n $(\'base,meta,link,title\', chapterContainer).remove();\n
changeTag($(\'footer\', chapterContainer), \'p\');\n changeTag($(\'footer\', chapterContainer), \'p\');\n
...@@ -224,7 +224,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -224,7 +224,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
var img = images[j];\n var img = images[j];\n
var div = $(\'<div>\');\n var div = $(\'<div>\');\n
var caption = $(\'<p>\').addClass(\'caption\');\n var caption = $(\'<p>\').addClass(\'caption\');\n
$(img).attr(\'src\', link + $(img).attr(\'src\'));\n if((/^http/).test($(img).attr(\'src\')) == false) {\n
$(img).attr(\'src\', link + $(img).attr(\'src\'));\n
}\n
$(img).before(div);\n $(img).before(div);\n
var imgToAppend = $(img);\n var imgToAppend = $(img);\n
var imgWidth = $(img).attr(\'width\');\n var imgWidth = $(img).attr(\'width\');\n
...@@ -236,7 +238,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -236,7 +238,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
var p = otherImages.length;\n var p = otherImages.length;\n
for(var j = 0; j < p; j++){\n for(var j = 0; j < p; j++){\n
var img = otherImages[j];\n var img = otherImages[j];\n
$(img).attr(\'src\', link + $(img).attr(\'src\'));\n if((/^http/).test($(img).attr(\'src\')) == false) {\n
$(img).attr(\'src\', link + $(img).attr(\'src\'));\n
}\n
}\n }\n
if(first && i == 0)\n if(first && i == 0)\n
element.attr(\'style\',\'counter-reset: page 1;\');\n element.attr(\'style\',\'counter-reset: page 1;\');\n
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7