Merge 1.5.2.4 ( ~ r10652)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10653 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-05-03 05:43:44 +00:00
parent 412816433d
commit f0c12f5756
20 changed files with 3413 additions and 4275 deletions

View file

@ -381,7 +381,7 @@ if(jQuery) jQuery.noConflict();
var styleText = "";
var click_str = "";
if(icon) styleText = " style=\"background-image:url('"+icon+"')\" ";
/* if(icon) styleText = " style=\"background-image:url('"+icon+"')\" "; */
switch(target) {
case "popup" :
click_str = " onclick=\"popopen(this.href,'"+target+"'); return false;\"";