Author: ssmiweve
Date: 2008-10-13 14:57:15 +0200 (Mon, 13 Oct 2008)
New Revision: 6875
Modified:
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/head.jsp
trunk/generic.sesam/war/src/main/javascript/external/mwsuggest.js
Log:
SEARCH-4933- Staveforslag i s?\195?\184kefeltet
up/down arrows working properly (because both search text fields have same id
"inputBox" the second must not be attached to the suggestions).
Modified:
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/head.jsp
===================================================================
---
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/head.jsp
2008-10-13 12:23:54 UTC (rev 6874)
+++
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/head.jsp
2008-10-13 12:57:15 UTC (rev 6875)
@@ -68,8 +68,8 @@
var wgMWSuggestTemplate = "/search/?q={searchTerms}&c=suggest";
var wgMWSuggestMessages = ["with suggestions", "no suggestions"]; // todo move
into messages.properties
// these pairs of inputs/forms will be autoloaded at startup
-var os_autoload_inputs = new Array('inputBox','inputBox');
-var os_autoload_forms = new Array('sf','sf-bottom');
+var os_autoload_inputs = new Array('inputBox');//,'inputBox');
+var os_autoload_forms = new Array('sf');//,'sf-bottom');
// search_box_id -> Results object
var os_map = {};
Modified: trunk/generic.sesam/war/src/main/javascript/external/mwsuggest.js
===================================================================
--- trunk/generic.sesam/war/src/main/javascript/external/mwsuggest.js
2008-10-13 12:23:54 UTC (rev 6874)
+++ trunk/generic.sesam/war/src/main/javascript/external/mwsuggest.js
2008-10-13 12:57:15 UTC (rev 6875)
@@ -7,6 +7,7 @@
* - removed function os_getNamespaces(r)
* - removed references to wgDBname
* - removed os_createToggle stuff from os_MWSuggestInit() ||
os_initHandlers(..)
+ * - added "os_map[name] == null" test to os_initHandlers(..)
*
* The results format is unmodified, eg a query on "Open" gives
* ["Open",["Open","Open (album)","Open (Album)","Open (application)","Open
(band)","Open (Blues Image album)","Open (Cowboy Junkies album)","Open
(Gotthard album)","Open (magazine)","Open (mathematics)"]]
@@ -783,17 +784,17 @@
/** Init Result objects and event handlers */
function os_initHandlers(name, formname, element){
- var r = new os_Results(name, formname);
- // event handler
- os_hookEvent(element, "keyup", function(event) { os_eventKeyup(event);
});
- os_hookEvent(element, "keydown", function(event) {
os_eventKeydown(event); });
- os_hookEvent(element, "keypress", function(event) {
os_eventKeypress(event); });
- os_hookEvent(element, "blur", function(event) { os_eventBlur(event); });
- os_hookEvent(element, "focus", function(event) { os_eventFocus(event);
});
- element.setAttribute("autocomplete","off");
- // stopping handler
- os_hookEvent(document.getElementById(formname), "submit",
function(event){ return os_eventOnsubmit(event); });
- os_map[name] = r;
+ var r = new os_Results(name, formname);
+ // event handler
+ os_hookEvent(element, "keyup", function(event) { os_eventKeyup(event); });
+ os_hookEvent(element, "keydown", function(event) { os_eventKeydown(event);
});
+ os_hookEvent(element, "keypress", function(event) {
os_eventKeypress(event); });
+ os_hookEvent(element, "blur", function(event) { os_eventBlur(event); });
+ os_hookEvent(element, "focus", function(event) { os_eventFocus(event); });
+ element.setAttribute("autocomplete","off");
+ // stopping handler
+ os_hookEvent(document.getElementById(formname), "submit", function(event){
return os_eventOnsubmit(event); });
+ os_map[name] = r;
}
/** Return the span element that contains the toggle link */
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
