3 files changed, 23 insertions, 12 deletions

diff --git a/content/fireflix-panel.xul b/content/fireflix-panel.xul
index 2a15a51..b84b596 100644
--- a/content/fireflix-panel.xul
+++ b/content/fireflix-panel.xul
@@ -143,17 +143,17 @@
       <groupbox id="searchresult_props" orient="horizontal" hidden="true">
        <vbox width="100" pack="center">
         <hbox pack="center">
          <image id="search_photo"/>
         </hbox>
        </vbox>
        <vbox flex="1">
         <label id="searchresult_title"/>
-        <textbox flex="1" multiline="true" class="plain" readonly="true" id="searchresult_description"/>
+        <iframe flex="1" id="searchresult_description"/>
         <hbox pack="end">
          <button command="cmd_search_open"/>
         </hbox>
        </vbox>
       </groupbox>
      </vbox>
     </tabpanel>
 
diff --git a/content/fireflix.css b/content/fireflix.css
index 188f48e..4a3228f 100644
--- a/content/fireflix.css
+++ b/content/fireflix.css
@@ -67,24 +67,16 @@ image#set_photo, image#set_primary {
 }
 
 menuitem.menuhead {
  background: gray;
  color: black;
  font-weight: bold;
 }
 
-label#searchresult_description {
- font-weight: bold;
-}
-textbox#searchresult_description {
- padding: 1px 3px !important;
- background: white;
-}
-
 #copying div {
  margin: 1ex 1em;
  font-family: courier, monospace;
  font-size: 9pt;
  padding: 2px;
  border: dotted 1px gray;
  background: white;
 }
diff --git a/content/fireflix.js b/content/fireflix.js
index 337354e..6773134 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -749,51 +749,70 @@ var fireflix = {
       XPathResult.ORDERED_NODE_ITERATOR_TYPE, null );
      _this.importXPR(xp);
      _this.on_select();
     }, function(x,s,c,m) {
      _this.fireflix.flickr_failure(x,s,c,m);
     }
    );
   },
+  render_description_frame: function(content) {
+   if(!content) {
+    try {
+     this.searchresult_description.contentDocument.lastChild.innerHTML
+      = '';
+    }catch(e) { } /* it will throw exceptions when the iframe isn't well
+    prepared to meet me, but it's unimportant then, anyway */
+   }else{
+    this.searchresult_description.contentDocument.lastChild.setAttribute(
+     'style',
+     'font-size: 80%; margin: 1px 3px; font-family: arial, sans-serif'
+    );
+    this.searchresult_description.contentDocument.lastChild.innerHTML
+     = content;
+    var ls = this.searchresult_description.contentDocument.links;
+    for(var l=0;l<ls.length;++l)
+     ls.item(l).setAttribute('target','_blank');
+   }
+  },
   on_select: function() {
    if(this.selection.currentIndex<0) {
     this.searchresult_props.hidden = true;
    }else{
     var p = this.photos[this.selection.currentIndex];
     if(!p) {
      this.searchresult_props.hidden = true;
     }else{
      this.search_photo.src = this.fireflix.flickr.make_photo_url(p,'t');
      this.searchresult_title.value = p.title;
-     this.searchresult_description.value = null;
+     this.render_description_frame(null);
      if(p.description==null && p.description==undefined) {
       var pid = p.id;
       var ci = this.selection.currentIndex;
       var _this = this;
       this.fireflix.flickr.api_call(
        {
         method: 'flickr.photos.getInfo',
         auth_token: 'default',
         photo_id: p.id,
         secret: p.secret
        }, function(xr) {
         var pp = _this.photos[ci];
         if(ci==_this.selection.currentIndex && pp.id==pid) {
          var n = xp_node('/rsp/photo',xr.responseXML);
          pp.fromNode_(n);
-         _this.searchresult_description.value=pp.description?pp.description:null;
+         _this.render_description_frame(pp.description);
         }
        }, function(x,s,c,m) {
         _this.fireflix.flickr_failure(x,s,c,m);
        }
       );
       this.searchresult_props.hidden = false;
      }else{
-      this.searchresult_description.value=p.description?p.description:null;
+      this.render_description_frame(p.description);
      }
     }
    }
   },
   on_cmd_open: function(ev) {
    if(this.selection.currentIndex<0)
     return;
    var p = this.photos[this.selection.currentIndex];