Roxen.git/ server/ modules/ graphics/ graphic_text.pike

2000-08-21

2000-08-21 01:05:23 by Martin Nilsson <mani@lysator.liu.se>

• dd4e59d5ca86c3c4978455c0876708dee247457b (20 lines) (+11/-9) ^{[ Show | Annotate ]}
  Branch: 5.2

Partial fix for [Bug 37 (#37)]

Rev: server/modules/graphics/business_graphics/business.pike:1.131
Rev: server/modules/graphics/graphic_text.pike:1.232

1:   // This is a roxen module. Copyright © 1996 - 2000, Roxen IS.   //    - constant cvs_version="$Id: graphic_text.pike,v 1.231 2000/08/15 20:16:07 mast Exp $"; + constant cvs_version="$Id: graphic_text.pike,v 1.232 2000/08/21 01:04:55 nilsson Exp $";      #include <module.h>   inherit "module";
860:    m_delete(arg, "href");    }    -  if(!arg->noxml) { arg["/"]="/"; m_delete(arg, "noxml"); } -  if(!arg->border) arg->border=arg->border||"0"; +  int xml=!arg->noxml; +  m_delete(arg, "noxml"); +  if(!arg->border) arg->border="0";       if(arg->split)    {
881:    arg->width = (string)size->xsize;    arg->height = (string)size->ysize;    } -  res+=Roxen.make_tag( "img", arg )+" "; +  res+=Roxen.make_tag( "img", arg, xml )+" ";    }    return sprintf(lp,res);    }
925:    string sn="i"+id->misc->gtext_mi++;    if(!id->supports->js_image_object) {    return (!input)? -  ("<a "+ea+"href=\""+url+"\">"+Roxen.make_tag("img",arg+(["name":sn]))+"</a>"): -  Roxen.make_tag("input",arg+(["type":"image"])); +  ("<a "+ea+"href=\""+url+"\">"+Roxen.make_tag("img",arg+(["name":sn]),xml)+"</a>"): +  Roxen.make_tag("input",arg+(["type":"image"]),xml);    }       arg->name=sn;
952:    "'"+replace(magic,"'","`")+"'":    "0")+"); return true;\" "    "onMouseout=\"document.images['"+sn+"'].src = "+sn+"l.src;\">" -  +Roxen.make_tag("img",arg)+"</a>"; +  +Roxen.make_tag("img",arg,xml)+"</a>";    }       if(input) -  return Roxen.make_tag("input",arg+(["type":"image"])); +  return Roxen.make_tag("input",arg+(["type":"image"]),xml);    -  return sprintf(lp,Roxen.make_tag("img",arg)); +  return sprintf(lp,Roxen.make_tag("img",arg,xml));   }      array(string) simpletag_gh(string t, mapping m, string c, RequestID id) {