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
@@ -119,65 +119,65 @@
        <hbox>
         <label control="search_for" value="&panel.search.search_for.label;"
         accesskey="s"/>
         <textbox id="search_for" flex="1"/>
        </hbox>
        <hbox>
         <checkbox id="search_tags" label="&panel.search.mode.tagsonly.label;"
         tooltiptext="&panel.search.mode.tagsonly.tip;" checked="false"
         accesskey="t" />
         <checkbox id="search_mine" label="&panel.search.mode.mine.label;" checked="true" accesskey="m"/>
         <spacer flex="1"/>
         <button command="cmd_search"/>
        </hbox>
       </groupbox>
       <tree id="searchresults" rows="2" flex="1"
       onselect="fireflix.foundphotos.on_select()"
       ondblclick="fireflix.foundphotos.on_cmd_open(event)"
       onkeypress="if(event.keyCode==event.DOM_VK_RETURN)
       fireflix.foundphotos.on_cmd_open(event)">
        <treecols>
         <treecol id="sr_title" label="&panel.search.col.title.label;" flex="2" crop="end" align="start" />
        </treecols>
        <treechildren/>
       </tree>
       <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>
 
     <tabpanel id="tabpanel_sets" flex="1"
      onkeypress="if(event.keyCode==event.DOM_VK_RETURN)
      document.getElementById('setphotos').focus()">
      <vbox flex="1">
       <tree id="setslist" rows="2" onselect="fireflix.photosets.on_select()"
       flex="1" context="sets_menu"
       >
        <treecols>
         <treecol id="sl_name" label="&panel.sets.name.label;" flex="4" crop="end" align="start" tooltiptext="&panel.sets.name.tip;"/>
         <splitter class="tree-splitter" />
         <treecol id="sl_photos" label="&panel.sets.photos.label;" flex="1" align="end" tooltiptext="&panel.sets.photos.tip;" />
        </treecols>
        <treechildren/>
       </tree>
       <hbox>
        <button command="cmd_refresh_sets" />
        <button command="cmd_set_props" />
       </hbox>
       <tree id="setphotos" rows="2" onselect="fireflix.photoset.on_select()"
       flex="1">
        <treecols>
         <treecol id="sp_title" label="&panel.setphotos.title.label;" flex="1" crop="end" align="start" tooltiptext="&panel.setphotos.title.tip;" />
         <splitter class="tree-splitter" />
         <treecol id="sp_taken" label="&panel.setphotos.taken.label;" crop="end" align="start" tooltiptext="&panel.setphotos.taken.tip;" hidden="true" />
diff --git a/content/fireflix.css b/content/fireflix.css
index 188f48e..4a3228f 100644
--- a/content/fireflix.css
+++ b/content/fireflix.css
@@ -43,48 +43,40 @@ groupbox#set_photo_props {
 groupbox#upload_file_props label {
  text-align: right;
 }
 
 image#set_photo, image#set_primary {
  border: black 1px solid;
 }
 
 .about .insides {
  margin: 1ex;
 }
 .about .text {
  border: yellow solid 1px;
  background: green;
 }
 .about .title {
  font-size: 300%;
  font-weight: bold;
  color: yellow;
 }
 .about .link {
  text-decoration: underline;
  color: white;
  cursor: pointer;
 }
 
 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
@@ -725,99 +725,118 @@ var fireflix = {
     this.photos.push(new Photo(n));
    }
    this.rowCount = this.photos.length;
    this.tree.endUpdateBatch();
   },
   search_photos: function() {
    var pars = {
     method: 'flickr.photos.search',
     auth_token: 'default',
     extras: 'license,date_upload,date_taken,owner_name,icon_server,original_format,last_update,geo'
    };
    if(this.search_mine.checked)
     pars.user_id='me';
    if(this.search_tags.checked) {
     pars.tags=this.search_for.value.split(/ +/).join(',');
    }else{
     pars.text=this.search_for.value;
    }
    var _this = this;
    this.fireflix.flickr.api_call( pars,
     function(xr) {
      var x = xr.responseXML;
      var xp = x.evaluate(
       '/rsp/photos/photo', x, null,
       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];
    if(!p.id)
     return;
    this.fireflix.openTab(this.fireflix.flickr.make_photo_url(p,'p'));
   }
  },
 
  photo_html: function(p,i,l) {
   // TODO: add alt/title when possible
   var rv = 
    '<a href="'+this.flickr.make_photo_url(p,l)+'">' +
    '<img src="'+this.flickr.make_photo_url(p,i)+'" />'+
    '</a>';
   return rv;
  },
  build_html: function(photos,uti,utl) {
   var rv = '';
   for(var i in photos) {
    var p = photos[i];
    rv += this.photo_html(p,utl,uti)+'\n';
   }
   return rv;
  },
 
  popup_content: function(s) {