X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=9a9c682cb4afc13466b75f0a227f88e5e9fa0833;hb=0689574b8d0579dd869bf4d80b98c62134f7a99b;hp=ab65016729cb1c404b53ed7130c0adecae168e6d;hpb=cc3a54a92a3835530a629ee5c5bb0f5ab2d0defc;p=mkws-moved-to-github.git
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index ab65016..9a9c682 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('
');
+ acc.push('
');
acc.push('
' + M(caption) + '
');
for (var i = 0; i < data.length && i < max; i++ ) {
+ acc.push('
');
acc.push('
' + data[i].name + ''
- + '
(' + data[i].freq + ')');
+ + '
' + data[i].freq + '');
+ acc.push('
');
}
acc.push('
');
}
@@ -233,6 +235,11 @@ function my_onrecord(data) {
function my_onbytarget(data) {
var targetDiv = document.getElementById("mkwsBytarget");
+ if (!targetDiv) {
+ // No mkwsTargets div.
+ return;
+ }
+
var table ='
Target ID | Hits | Diags | '
+'Records | State |
';
@@ -308,7 +315,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();
}
@@ -522,7 +529,6 @@ function mkws_html_all(config) {
sort_default: "relevance",
perpage_default: 20,
query_width: 50,
- switch_menu: false, /* show/hide Records|Targets menu */
lang_menu: true, /* show/hide language menu */
sort_menu: true, /* show/hide sort menu */
perpage_menu: true, /* show/hide perpage menu */
@@ -638,7 +644,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 {
@@ -670,11 +676,6 @@ function mkws_html_switch(config) {
No information available yet.\
');
$("#mkwsTargets").css("display", "none");
-
- if (!config.switch_menu) {
- debug("disable switch menu");
- $("#mkwsSwitch").css("display", "none");
- }
}
function mkws_html_sort(config) {
@@ -725,9 +726,12 @@ function mkws_service_proxy_auth(auth_url) {
debug("Run service proxy auth URL: " + auth_url);
- var request = new pzHttpRequest(auth_url);
+ var request = new pzHttpRequest(auth_url, function(err) {
+ alert("HTTP call for authentication failed: " + err)
+ return;
+ });
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 +825,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('?', '');
@@ -840,16 +844,16 @@ jQuery.extend({
// service-proxy or pazpar2
pazpar2: function(config) {
+ var id_popup = config.id_popup || "#mkwsPopup";
+ id_popup = id_popup.replace(/^#/, "");
+
// simple layout
var div = '\
\
\
\
\
- ';
+ ';
// new table layout
var table = '\
@@ -899,23 +903,21 @@ jQuery.extend({
var popup = '\
\
- '
if (config && config.layout == 'div') {
this.debug2("jquery plugin layout: div");
document.write(div);
} else if (config && config.layout == 'popup') {
- this.debug2("jquery plugin layout: popup");
+ this.debug2("jquery plugin layout: popup with id: " + id_popup);
document.write(popup);
+ $(document).ready( function() { init_popup(config); } );
} else {
this.debug2("jquery plugin layout: table");
document.write(table);
@@ -923,12 +925,28 @@ jQuery.extend({
}
});
-function init_popup(config) {
- $("#mkwsPopup").dialog({
+function init_popup(obj) {
+ var config = obj ? obj : {};
+
+ var height = config.height || 760;
+ var width = config.width || 880;
+ 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.:
+ //
+ 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,
autoOpen: false,
- height: 760,
- width: 880,
+ height: height,
+ width: width,
modal: true,
resizable: true,
buttons: {
@@ -936,15 +954,13 @@ function init_popup(config) {
$(this).dialog("close");
}
},
- close: function() {
- // allFields.val( "" ).removeClass( "ui-state-error" );
- }
+ close: function() { }
});
- $("input#mkwsButton")
+ $(id_button)
.button()
.click(function() {
- $("#mkwsPopup").dialog("open");
+ $(id_popup).dialog("open");
});
};