View the DQSD CVS repository here:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/dqsd/
Update of /cvsroot/dqsd/dqsd
In directory usw-pr-cvs1:/tmp/cvs-serv30561
Modified Files:
ChangeLog.txt helpmenu.js loader.js
Log Message:
* Remove HTML tags from menu item search names
* Stop indicating as '[local]' aliases defined in aliases.txt
Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/dqsd/dqsd/ChangeLog.txt,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -d -r1.140 -r1.141
*** ChangeLog.txt 15 Oct 2002 14:38:43 -0000 1.140
--- ChangeLog.txt 17 Oct 2002 15:21:49 -0000 1.141
***************
*** 26,29 ****
--- 26,31 ----
* Fix for tooltips problem on scrolling menus (bug 617639) (DQSDTools.DLL changes,
version.js NOT changed to force upgrade)
+ * Remove HTML tags from menu item search names
+ * Stop indicating as '[local]' aliases defined in aliases.txt
Index: helpmenu.js
===================================================================
RCS file: /cvsroot/dqsd/dqsd/helpmenu.js,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** helpmenu.js 11 Oct 2002 05:29:53 -0000 1.34
--- helpmenu.js 17 Oct 2002 15:21:49 -0000 1.35
***************
*** 92,97 ****
hsubmenu = hcatmenu;
}
! mb.AppendMenuItem( search.name + (search.local ? ' [local]' : '' ) + '\t' +
(search.aliasmenudisplay ? alias.replace(/&/g, '&&') : ""), // menu text along with
alias
search.aliases[0], // function invoked when user
selects menu item
makeToolTipString(search),
--- 92,100 ----
hsubmenu = hcatmenu;
}
+
+ // Remove HTML tags from name
+ var searchname = search.name.replace( /<[^<]*>/g, '' );
! mb.AppendMenuItem( searchname + (search.local ? ' [local]' : '' ) + '\t' +
(search.aliasmenudisplay ? alias.replace(/&/g, '&&') : ""), // menu text along with
alias
search.aliases[0], // function invoked when user
selects menu item
makeToolTipString(search),
Index: loader.js
===================================================================
RCS file: /cvsroot/dqsd/dqsd/loader.js,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** loader.js 29 Sep 2002 06:37:52 -0000 1.55
--- loader.js 17 Oct 2002 15:21:49 -0000 1.56
***************
*** 31,35 ****
INTERNAL_FUNC_PREFIX = "_dqsd_internal_fn_";
! function addalias(alias, fname, name, desc, cat, subcats)
{
// If this alias is already defined, then remove it from the search it was
previously defined for
--- 31,35 ----
INTERNAL_FUNC_PREFIX = "_dqsd_internal_fn_";
! function addalias(alias, fname, name, desc, cat, subcats, local)
{
// If this alias is already defined, then remove it from the search it was
previously defined for
***************
*** 88,92 ****
);
eval( fname + " = f;" );
! addsearch( fname, name ? name : url, desc ? desc : url, url.search(/%s/) < 0 ?
url : "", cat, true, subcats);
}
else if ((res = fname.match(/^(\w+) +(.+)/)) && searches[res[1]]) // starts with
a valid search function
--- 88,92 ----
);
eval( fname + " = f;" );
! addsearch( fname, name ? name : url, desc ? desc : url, url.search(/%s/) < 0 ?
url : "", cat, local, subcats);
}
else if ((res = fname.match(/^(\w+) +(.+)/)) && searches[res[1]]) // starts with
a valid search function
***************
*** 99,103 ****
);
eval( fname + " = f;" );
! addsearch( fname, name ? name : cmd, desc ? desc : cmd, "", cat, true,
subcats);
}
else
--- 99,103 ----
);
eval( fname + " = f;" );
! addsearch( fname, name ? name : cmd, desc ? desc : cmd, "", cat, local,
subcats);
}
else
***************
*** 324,331 ****
// 4. load and execute the alias file
! addAliasesFromFile( "aliases" );
! addAliasesFromFile( localaliases, "Shortcuts" );
! function addAliasesFromFile( aliasFile, category )
{
var aliasTable = readTabDelimitedFile(aliasFile);
--- 324,331 ----
// 4. load and execute the alias file
! addAliasesFromFile( "aliases", null, false );
! addAliasesFromFile( localaliases, "Shortcuts", true );
! function addAliasesFromFile( aliasFile, category, local )
{
var aliasTable = readTabDelimitedFile(aliasFile);
***************
*** 345,351 ****
(fields.length >= 3 && fields[2] != '') ? fields[2] : null, //
name
(fields.length >= 4 && fields[3] != '') ? fields[3] : null, //
description
! (fields.length >= 5 && fields[4] != "") ? fields[4] :
((arguments.length >= 2) ? category : null), // category
! (fields.length >= 6 && fields[5] != "") ? fields[5].split(',') :
new Array() // subcategories
! );
}
}
--- 345,351 ----
(fields.length >= 3 && fields[2] != '') ? fields[2] : null, //
name
(fields.length >= 4 && fields[3] != '') ? fields[3] : null, //
description
! (fields.length >= 5 && fields[4] != "") ? fields[4] :
((arguments.length >= 2 && arguments[1] != null) ? category : null), // category
! (fields.length >= 6 && fields[5] != "") ? fields[5].split(',') :
new Array(), // subcategories
! local );
}
}
-------------------------------------------------------
This sf.net email is sponsored by: viaVerio will pay you up to
$1,000 for every account that you consolidate with us.
http://ad.doubleclick.net/clk;4749864;7604308;v?
http://www.viaverio.com/consolidator/osdn.cfm
_______________________________________________
DQSD-CVS mailing list
https://lists.sourceforge.net/lists/listinfo/dqsd-cvs
DQSD CVS repository:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/dqsd/
