Browse Source

jetzt schein t die auswahl via enter zu funktionieren, ausserdem ein paar kleine cleanups die mir aufgefallen sind.

master
Georg Hopp 18 years ago
parent
commit
a7c4ee1105
  1. 20
      js/personAdmin/personSearch1.js

20
js/personAdmin/personSearch1.js

@ -117,7 +117,7 @@ function c_personSearch1 (fname, sname, fnameAlt, snameAlt, names, person)
} }
if (this.person != null) if (this.person != null)
if (this.fNameBest[1] == 0)
if (this.sNameBest[1] == 0 && this.fNameBest[1] == 0)
this.person.update ( this.person.update (
this.persons[this.sNameBest[2]][this.fNameBest[2]]); this.persons[this.sNameBest[2]][this.fNameBest[2]]);
else else
@ -157,7 +157,7 @@ function c_personSearch1 (fname, sname, fnameAlt, snameAlt, names, person)
len < dists.lenth) len < dists.lenth)
len++; len++;
else else
len = dists.length - 1;
len = dists.length;
for (var i=0; i<len; i++) for (var i=0; i<len; i++)
// walk through all matches // walk through all matches
@ -188,7 +188,7 @@ function c_personSearch1 (fname, sname, fnameAlt, snameAlt, names, person)
return len; return len;
} }
this.altSurnames = function (_event)
this.altSurnames = function ()
{ {
var surname = document.getElementById (this.surname); var surname = document.getElementById (this.surname);
var sNameAlt = document.getElementById (this.sNameAlt); var sNameAlt = document.getElementById (this.sNameAlt);
@ -279,8 +279,6 @@ function personSearch1AltFirstnameHandler (_event)
else if (_event.keyCode) else if (_event.keyCode)
var keycode = _event.keyCode; var keycode = _event.keyCode;
var dists = pSearch1.fnameDists;
// pSearch1 wird im php personSearch1.js angelegt. // pSearch1 wird im php personSearch1.js angelegt.
switch (keycode) switch (keycode)
{ {
@ -291,13 +289,12 @@ function personSearch1AltFirstnameHandler (_event)
pSearch1.incFnameIdx (); pSearch1.incFnameIdx ();
break; break;
case 13: case 13:
pSearch1.hide ('personSearch1_fBestFit');
break;
return pSearch1.hide ('personSearch1_fBestFit');
default: default:
pSearch1.fnameIdx = -1; pSearch1.fnameIdx = -1;
} }
pSearch1.altFirstnames ();
return pSearch1.altFirstnames ();
} }
function personSearch1AltSurnameHandler (_event) function personSearch1AltSurnameHandler (_event)
@ -310,8 +307,6 @@ function personSearch1AltSurnameHandler (_event)
else if (_event.keyCode) else if (_event.keyCode)
var keycode = _event.keyCode; var keycode = _event.keyCode;
var dists = pSearch1.snameDists;
// pSearch1 wird im php personSearch1.js angelegt. // pSearch1 wird im php personSearch1.js angelegt.
switch (keycode) switch (keycode)
{ {
@ -322,11 +317,10 @@ function personSearch1AltSurnameHandler (_event)
pSearch1.incSnameIdx (); pSearch1.incSnameIdx ();
break; break;
case 13: case 13:
pSearch1.hide ('personSearch1_sBestFit');
break;
return pSearch1.hide ('personSearch1_sBestFit');
default: default:
pSearch1.snameIdx = -1; pSearch1.snameIdx = -1;
} }
pSearch1.altSurnames ();
return pSearch1.altSurnames ();
} }
Loading…
Cancel
Save