--- trunk2/eurovoc/abecedno.html	2004/10/19 15:50:13	526
+++ trunk2/eurovoc/abecedno.html	2004/10/24 11:20:12	539
@@ -11,6 +11,19 @@
 <script type="text/javascript" src="js/cookies.js"></script>
 <script type="text/javascript">
 // <!--
+
+var lang2thes = {
+	'hr' : 'DescriptorHR.js',
+	'en' : 'DescriptorEN.js',
+	'fr' : 'DescriptorFR.js',
+	'ge' : 'DescriptorGE.js'
+};
+
+var lang = get_cookie('w2_lang');
+
+var headlines = null;
+self.document.myfilter = null;
+
 function myfilter() {
 //	self.document.getElementById('textfilter').focus();
 //	self.document.getElementById('textfilter').caretPos=1;
@@ -22,11 +35,13 @@
 		if (r_div) {
 			var li = self.document.createElement("li");
 			var e = self.document.createElement("a");
+			var pic = null;
+			
 			e.setAttribute("href","hijerarhija.html?o="+arr[1]+"#mfn"+arr[1]);
 			var regex = new RegExp(/ *\* */);
 			if (arr[0].match(regex)) {
 				e.appendChild(self.document.createTextNode(arr[0].replace(regex,' ')));
-				var pic = self.document.createElement("img");
+				pic = self.document.createElement("img");
 				pic.src = 'img/crovoc.png';
 				pic.border = 0;
 				e.appendChild(pic);
@@ -41,7 +56,7 @@
 			e.setAttribute("href","thes/"+arr[1]+".html");
 			e.setAttribute("target","popup");
 			e.onclick = function() { return popup(e) };
-			var pic = self.document.createElement("img");
+			pic = self.document.createElement("img");
 			pic.src = 'img/listic.png';
 			pic.border = 0;
 			e.appendChild(pic);
@@ -77,7 +92,7 @@
 			html = "Nije pronađen niti jedan zapis";
 		}
 		if (! status) {
-			html = "Unesite "+this.min_len+" znakova za pretraživanje.";
+			html = "Unesite "+this.min_len+" znaka za pretraživanje.";
 			status = "";
 		} else {
 			status = " za <em>"+status+"</em>.";
@@ -88,40 +103,39 @@
 	}
 }
 
-var lang2thes = {
-	'hr' : 'DescriptorHR.js',
-	'en' : 'DescriptorEN.js',
-	'fr' : 'DescriptorFR.js',
-	'ge' : 'DescriptorGE.js'
-};
-
-var lang = get_cookie('w2_lang');
-if (! lang) lang = 'hr';
-
-var headlines = null;
-self.document.myfilter = null;
-
 function load_lang(lang) {
 	// reset results
 	if (self.document.myfilter) element_id('results').innerHTML = "";
 
+	// default language or fallback from all to hr
+	if (! lang || lang == 'all') lang = 'hr';
+
+	if (! lang2thes[lang]) {
+		alert("Jezik "+lang+" nije podržan");
+	}
+
 	set_cookie('w2_lang', lang);
 	element_id('lang').disabled = true;
 	element_id('textfilter').disabled = true;
-	element_id('status').innerHTML = "Učitavanje podataka za jezik. Molimo, pričekate";
+	element_id('status').innerHTML = "Učitavanje podataka za jezik. Molimo, pričekate...";
 
 	self.document.myfilter = null;
 
 	load_js(lang2thes[lang], 'headlines', 'load_lang_finished();' );
 }
 
+function do_filter(filter) {
+	element_id('status').innerHTML = "Pretraživanje u tijeku...";
+	if (self.document.myfilter) self.document.myfilter.filter(filter);
+}
+
 function load_lang_finished() {
 	//alert("loaded "+lang);
 	myfilter();
 	self.document.myfilter.arr=headlines;
 	element_id('lang').disabled = false;
 	element_id('textfilter').disabled = false;
-	if (self.document.myfilter) self.document.myfilter.filter(element_id('textfilter').value);
+	do_filter(element_id('textfilter').value);
 	return false;
 }
 
@@ -312,7 +326,7 @@
 	// -->
   </script>
 
-	<input autocomplete="off" class="filters" id="textfilter" title="enter a regular expression to filter by" onkeyup="self.document.myfilter.filter(this.value);" />
+	<input autocomplete="off" class="filters" id="textfilter" title="enter a regular expression to filter by" onkeyup="do_filter(this.value);" />
 	<!-- this button is strictly for looks -->
 	<input class="filters" value="filter" type="button" disabled="true"/>
 </div>