Changeset 779

Timestamp:

01/04/12 16:17:57 (5 months ago)

Author:

mgalloy

Message:

Fix for broken search: using single quotes for Javascript strings which contain double quotes and making all links open in the main window instead of the search results window.

Location:

trunk/src

Files:

• resources/search.js (modified) (2 diffs)
• templates/libdata.tt (modified) (1 diff)

trunk/src/resources/search.js

@@ -134 +134 @@
   html += "<h1>" + title + "</h1>";
   html += "<h2>" + subtitle + "</h2>";  
-  html += "</div";
+  html += "</div>";
   
   html += "<div class=\"content\">";
@@ -144 +144 @@
   mType = libdata[item][MATCH_TYPE];
   width = Math.round(2 * libdata[item][SCORE]);
+  matchType = libdata[item][TYPE]
+  matchTypeRefEnd = matchType.indexOf(">")
+  matchType = matchType.substring(0, matchTypeRefEnd) + "target=\"main_frame\">" + matchType.substring(matchTypeRefEnd + 1, matchType.length);
   
   html += "<li>";
   html += "<img src=\"idldoc-resources/searchbar.png\" height=\"10\" width=\"" + width + "\" />&nbsp;";
   html += "<a href=\"" + libdata[item][URL] + "\" target=\"main_frame\">" + libdata[item][NAME] + "</a><br/>";
-  html += libdata[item][TYPE] + "<br/>";
+  html += matchType + "<br/>";
   
   nPreCharacters = 25;

trunk/src/templates/libdata.tt

@@ -12 +12 @@
 [% IF n_visible_pro_files %]
 [% FOREACH f IN visible_pro_files %][% SCOPE f %]
-libdata[libdataItem++] = new Array("[% index_url %]", "[% index_name %]", "[% index_type %]", "[% file_basename(basename) %]", "[% plain_author %]", "", "[% plain_comments %]", "", "[% strjoin(categories, ' ') %]", "[% plain_attributes %]");
+libdata[libdataItem++] = new Array("[% index_url %]", "[% index_name %]", '[% index_type %]', "[% file_basename(basename) %]", "[% plain_author %]", "", "[% plain_comments %]", "", "[% strjoin(categories, ' ') %]", "[% plain_attributes %]");
   [% IF n_visible_routines gt 0 %]
   [% FOREACH r IN visible_routines %][% SCOPE r %]
-  libdata[libdataItem++] = new Array("[% index_url %]", "[% index_name %]", "[% index_type %]", "[% file_basename(basename) %]", "[% plain_author %]", "[% name %]", "[% plain_comments %]", "[% plain_parameters %]", "[% strjoin(categories, ' ') %]", "[% plain_attributes %]");
+  libdata[libdataItem++] = new Array("[% index_url %]", "[% index_name %]", '[% index_type %]', "[% file_basename(basename) %]", "[% plain_author %]", "[% name %]", "[% plain_comments %]", "[% plain_parameters %]", "[% strjoin(categories, ' ') %]", "[% plain_attributes %]");
   [% END %][% END %]
   [% END %]