From 2591ca639056db4f6abe294cc7a81bb831c8f7f9 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Wed, 11 Jan 2017 17:04:02 +1100 Subject: html: Embed the catalogue XML in JS. The is to work around a security issue with Chrome on Windows. This patches let the cover page load on Chrome and Edge on Windows 10. --- common/html-coverpage/static/rtems/js/catalogue.js | 81 +++++++++++----------- 1 file changed, 42 insertions(+), 39 deletions(-) (limited to 'common/html-coverpage/static/rtems/js/catalogue.js') diff --git a/common/html-coverpage/static/rtems/js/catalogue.js b/common/html-coverpage/static/rtems/js/catalogue.js index d54def2..ae32aed 100644 --- a/common/html-coverpage/static/rtems/js/catalogue.js +++ b/common/html-coverpage/static/rtems/js/catalogue.js @@ -29,48 +29,51 @@ function catalogueFooter() { '\n'; } -function loadCatalogue(path) { +function paintCatalogue(xml) { var el_cat_title = $('#rtems-catalogue-title'); var el_cat = $('#rtems-catalogue'); + /* + * Use jquery as XMLDocument is consider not stable on Firefox's web site. + */ + var pdfIcon = 'static/images/Adobe_PDF_file_icon_32x32.png'; + var htmlIcon = 'static/images/html-xxl.png'; + var docs = $(xml).find('rtems-docs'); + var date = $(docs).attr('date'); + var title = $(docs).find('catalogue'); + var table = catalogueHeader(date); + $(docs).find('doc').each(function() { + var name = $(this).find('name').text(); + var title = $(this).find('title').text(); + var release = $(this).find('release').text(); + var version = $(this).find('version').text(); + var html = $(this).find('html').text(); + var pdf = $(this).find('pdf').text(); + var singlehtml = $(this).find('singlehtml').text(); + var empty = '\n'; + table += '\n'; + if (html) + table += '' + title + '\n'; + else + table += empty; + if (pdf) + table += '' + + '\n'; + else + table += empty; + if (singlehtml) + table += '' + + '\n'; + else + table += empty; + table += '\n'; + }); + table += catalogueFooter(); + el_cat_title.html('

' + $(title).text() + '

'); + el_cat.html(table); +} +function loadCatalogue(path) { var f = $.get(path, function(xml) { - /* - * Use jquery as XMLDocument is consider not stable on Firefox's web site. - */ - var pdfIcon = 'static/images/Adobe_PDF_file_icon_32x32.png'; - var htmlIcon = 'static/images/html-xxl.png'; - var docs = $(xml).find('rtems-docs'); - var date = $(docs).attr('date'); - var title = $(docs).find('catalogue'); - var table = catalogueHeader(date); - $(docs).find('doc').each(function() { - var name = $(this).find('name').text(); - var title = $(this).find('title').text(); - var release = $(this).find('release').text(); - var version = $(this).find('version').text(); - var html = $(this).find('html').text(); - var pdf = $(this).find('pdf').text(); - var singlehtml = $(this).find('singlehtml').text(); - var empty = '\n'; - table += '\n'; - if (html) - table += '' + title + '\n'; - else - table += empty; - if (pdf) - table += '' + - '\n'; - else - table += empty; - if (singlehtml) - table += '' + - '\n'; - else - table += empty; - table += '\n'; - }); - table += catalogueFooter(); - el_cat_title.html('

' + $(title).text() + '

'); - el_cat.html(table); + paintCatalogue(xml); }, 'xml'); } -- cgit v1.2.3