summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--content/fireflix.js14
-rw-r--r--locale/en-US/fireflix.properties2
2 files changed, 12 insertions, 4 deletions
diff --git a/content/fireflix.js b/content/fireflix.js
index 92c42f4..966630c 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -797,12 +797,18 @@ var fireflix = {
this.cmd_search_next_page.setAttribute('disabled',(this.paging.page<this.paging.pages)?'false':'true');
}
},
render_description_frame: function(content) {
- if(!content) {
- this.searchresult_description.innerHTML = '';
- }else{
- this.searchresult_description.innerHTML = content?content:'';
+ this.searchresult_description.innerHTML = '';
+ if(content) {
+ var dp = new DOMParser();
+ var pd = dp.parseFromString(
+ '<div xmlns="http://www.w3.org/1999/xhtml">'+content+'</div>', 'text/xml' );
+ var de = pd.documentElement;
+ if(de.tagName=='parsererror')
+ this.searchresult_description.innerHTML=this.fireflix.loc_strings.getString('broken_description');
+ else
+ this.searchresult_description.appendChild(de);
/* of all linking elements flickr only allows a */
var as = this.searchresult_description.getElementsByTagName('a');
for(var a=0;a<as.length;++a)
as.item(a).setAttribute('target','_blank');
diff --git a/locale/en-US/fireflix.properties b/locale/en-US/fireflix.properties
index 18300ff..f583040 100644
--- a/locale/en-US/fireflix.properties
+++ b/locale/en-US/fireflix.properties
@@ -10,4 +10,6 @@ urltype_b=Large (fits in 1024x1024)
urltype_o=Original image
urltype_p=Flickr photo URL
search_page=Page %S of %S
+
+broken_description=Broken photo description