X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=f0448d10f810beaf6113758862f773148dc6af96;hb=95373e2651717ba158fd6fd616f05d13d62a398a;hp=32b295b8529ad870ec37417719f125d315f7c249;hpb=db04b1fad38881b8a042c392f9bbd0227b75a18d;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 32b295b..f0448d1 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -201,9 +201,10 @@ function my_onterm(data) {
 }
 
 function add_single_facet(acc, caption, data, max, cclIndex) {
-    acc.push('<div class="facet">');
+    acc.push('<div class="facet" id="mkwsFacet' + caption + '">');
     acc.push('<div class="termtitle">' + M(caption) + '</div>');
     for (var i = 0; i < data.length && i < max; i++ ) {
+	acc.push('<div class="term">');
         acc.push('<a href="#" ');
 	var action;
 	if (!cclIndex) {
@@ -214,7 +215,8 @@ function add_single_facet(acc, caption, data, max, cclIndex) {
 	    action = 'limitQuery(\'' + cclIndex + '\', this.firstChild.nodeValue)';
 	}
 	acc.push('onclick="' + action + ';return false;">' + data[i].name + '</a>'
-		 + '<span> (' + data[i].freq + ')</span><br/>');
+		 + ' <span>' + data[i].freq + '</span>');
+	acc.push('</div>');
     }
     acc.push('</div>');
 }
@@ -308,7 +310,7 @@ function loadSelect ()
 // limit the query after clicking the facet
 function limitQuery (field, value)
 {
-    document.mkwsSearchForm.query.value += ' and ' + field + '="' + value + '"';
+    document.mkwsSearchForm.mkwsQuery.value += ' and ' + field + '="' + value + '"';
     onFormSubmitEventHandler();
 }
 
@@ -638,7 +640,7 @@ function mkws_html_all(config) {
 }
 
 function mkws_set_lang(mkws_config)  {
-    var lang = jQuery.parseQuerystring().lang || mkws_config.lang || "";
+    var lang = $.parseQuerystring().lang || mkws_config.lang || "";
     if (!lang || !mkws_locale_lang[lang]) {
 	mkws_config.lang = ""
     } else {
@@ -727,7 +729,7 @@ function mkws_service_proxy_auth(auth_url) {
 
     var request = new pzHttpRequest(auth_url);
     request.get(null, function(data) {
-	if (!jQuery.isXMLDoc(data)) {
+	if (!$.isXMLDoc(data)) {
 	    alert("service proxy auth response document is not valid XML document, give up!");
 	    return;
 	}
@@ -821,8 +823,8 @@ function M(word) {
 /*
  * implement jQuery plugins
  */
-jQuery.extend({
-    // implement jQuery.parseQuerystring() for parsing URL parameters
+$.extend({
+    // implement $.parseQuerystring() for parsing URL parameters
     parseQuerystring: function() {
 	var nvpair = {};
 	var qs = window.location.search.replace('?', '');
@@ -902,8 +904,7 @@ jQuery.extend({
 	    <div id="mkwsResults"></div>\
 	    <div id="mkwsTargets"></div>\
 	    <div id="mkwsStat"></div>\
-	  </div>\
-	  <script> $(document).ready(function() { init_popup();});  </script>';
+	  </div>'
 
 	if (config && config.layout == 'div') {
 	    this.debug2("jquery plugin layout: div");
@@ -911,6 +912,7 @@ jQuery.extend({
 	} else if (config && config.layout == 'popup') {
 	    this.debug2("jquery plugin layout: popup");
 	    document.write(popup);
+	    $(document).ready( function() { init_popup(config); } );
 	} else {
 	    this.debug2("jquery plugin layout: table");
 	    document.write(table);
@@ -918,14 +920,22 @@ jQuery.extend({
     }
 });
 
-function init_popup(config) {
-    if (!config)
-	config = {};
+function init_popup(obj) {
+    var config = obj ? obj : {};
 
     var height = config.height || 760;
     var width = config.width || 880;
-    var id_button = config.button || "input#mkwsButton";
-    var id_popup = config.popup || "#mkwsPopup";
+    var id_button = config.id_button || "input#mkwsButton";
+    var id_popup = config.id_popup || "#mkwsPopup";
+
+    debug("popup height: " + height + ", width: " + width);
+
+    // make sure that jquery-ui was loaded afte jQuery core lib, e.g.:
+    // <script src="http://code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
+    if (!$.ui) {
+	debug("Error: jquery-ui.js is missing, did you included it after jquery core in the HTML file?");
+	return;
+    }
 
     $(id_popup).dialog({
       closeOnEscape: true,