From cb6a237db78041301e674f04aa4a3fd1c89c0ebe Mon Sep 17 00:00:00 2001 From: Jakub Skoczen Date: Tue, 27 Mar 2007 09:59:07 +0000 Subject: [PATCH] Masterkey: IE 6 and 7 works. Safari 2.04, Opera 9.10 and Konqueror works with minor CSS positioning issues. --- js/pz2.js | 39 ++++++++++++++++++++++++++++----------- www/masterkey/js/client.js | 3 +-- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/js/pz2.js b/js/pz2.js index c503b7c..84e9893 100644 --- a/js/pz2.js +++ b/js/pz2.js @@ -1,6 +1,23 @@ +//since explorer is flawed +if (!window['Node']) { + window.Node = new Object(); + Node.ELEMENT_NODE = 1; + Node.ATTRIBUTE_NODE = 2; + Node.TEXT_NODE = 3; + Node.CDATA_SECTION_NODE = 4; + Node.ENTITY_REFERENCE_NODE = 5; + Node.ENTITY_NODE = 6; + Node.PROCESSING_INSTRUCTION_NODE = 7; + Node.COMMENT_NODE = 8; + Node.DOCUMENT_NODE = 9; + Node.DOCUMENT_TYPE_NODE = 10; + Node.DOCUMENT_FRAGMENT_NODE = 11; + Node.NOTATION_NODE = 12; +} // check for jQuery -if(typeof window.jQuery == "undefined") +if(typeof window.jQuery == "undefined"){ throw new Error("pz2.js requires jQuery library"); +} // prevent execution of more than once if(typeof window.pz2 == "undefined") { window.undefined = window.undefined; @@ -70,7 +87,7 @@ var pz2 = function(paramArray) { // auto init session? if (paramArray.autoInit !== false) __myself.init(__myself.keepAlive); -} +}; pz2.prototype = { init: function(keepAlive) { @@ -88,7 +105,7 @@ pz2.prototype = { else // if it gets here the http return code was 200 (pz2 errors are 417) // but the response was invalid, it should never occur - setTimeout("__myself.init()", 1000) + setTimeout("__myself.init()", 1000); } ); }, @@ -109,7 +126,7 @@ pz2.prototype = { else // if it gets here the http return code was 200 (pz2 errors are 417) // but the response was invalid, it should never occur - setTimeout("__myself.ping()", 1000) + setTimeout("__myself.ping()", 1000); } ); }, @@ -139,7 +156,7 @@ pz2.prototype = { if ( data.getElementsByTagName("status")[0].childNodes[0].nodeValue == "OK" ) { __myself.searchStatusOK = true; //piggyback search - __myself.show(0, num, sort) + __myself.show(0, num, sort); if ( __myself.statCallback ) __myself.statTimer = setTimeout("__myself.stat()", __myself.statTime / 2); if ( __myself.termlistCallback ) @@ -179,7 +196,7 @@ pz2.prototype = { "idle": Number( data.getElementsByTagName("idle")[0].childNodes[0].nodeValue ), "failed": Number( data.getElementsByTagName("failed")[0].childNodes[0].nodeValue ), "error": Number( data.getElementsByTagName("error")[0].childNodes[0].nodeValue ) - } + }; __myself.statCallback(stat); if (activeClients > 0) __myself.statTimer = setTimeout("__myself.stat()", __myself.statTime); @@ -187,7 +204,7 @@ pz2.prototype = { else // if it gets here the http return code was 200 (pz2 errors are 417) // but the response was invalid, it should never occur - __myself.statTimer = setTimeout("__myself.stat()", __myself.statTime / 4) + __myself.statTimer = setTimeout("__myself.stat()", __myself.statTime / 4); } ); }, @@ -220,7 +237,7 @@ pz2.prototype = { "start": Number( data.getElementsByTagName("start")[0].childNodes[0].nodeValue ), "num": Number( data.getElementsByTagName("num")[0].childNodes[0].nodeValue ), "hits": [] - } + }; // parse all the first-level nodes for all tags var hits = data.getElementsByTagName("hit"); var hit = new Array(); @@ -302,7 +319,7 @@ pz2.prototype = { { "command": "termlist", "session": __myself.sessionID, "name": __myself.termKeys }, function(data) { if ( data.getElementsByTagName("termlist") ) { - var termList = { "activeclients": Number( data.getElementsByTagName("activeclients")[0].childNodes[0].nodeValue ) } + var termList = { "activeclients": Number( data.getElementsByTagName("activeclients")[0].childNodes[0].nodeValue ) }; var termLists = data.getElementsByTagName("list"); //for each termlist for (i = 0; i < termLists.length; i++) { @@ -313,8 +330,8 @@ pz2.prototype = { for (j = 0; j < terms.length; j++) { var term = { "name": terms[j].getElementsByTagName("name")[0].childNodes[0].nodeValue, - "freq": terms[j].getElementsByTagName("frequency")[0].childNodes[0].nodeValue, - } + "freq": terms[j].getElementsByTagName("frequency")[0].childNodes[0].nodeValue + }; var termIdNode = terms[j].getElementsByTagName("id"); if(terms[j].getElementsByTagName("id").length) diff --git a/www/masterkey/js/client.js b/www/masterkey/js/client.js index e00defc..a97b780 100644 --- a/www/masterkey/js/client.js +++ b/www/masterkey/js/client.js @@ -48,7 +48,6 @@ function onFormSubmitEventHandler() { // function my_onshow(data) { - global = data; var recsBody = $('div.records'); recsBody.empty(); @@ -58,7 +57,7 @@ function my_onshow(data) var id = data.hits[i].recid; var count = data.hits[i].count || 1; - var recBody = $('
'); var aTitle = $(''+title+'').appendTo(recBody); aTitle.click(function(){ var clickedId = this.parentNode.id.split('_')[1]; -- 1.7.10.4