Merging scribus and nighthawk branches
authorDan
Thu, 31 Jan 2008 22:28:40 -0500
changeset 455 43b908c9b2e2
parent 453 881b77f880fb (diff)
parent 454 7b984f924dcd (current diff)
child 456 e133d321fce4
Merging scribus and nighthawk branches
--- a/includes/clientside/static/dropdown.js	Thu Jan 31 21:52:39 2008 -0500
+++ b/includes/clientside/static/dropdown.js	Thu Jan 31 22:28:40 2008 -0500
@@ -351,12 +351,14 @@
   fieldUL['right'] = off['left'] + dim['w'];
   fieldUL['bottom'] = off['top'] + dim['h'];
   
-  //document.getElementById('debug').innerHTML = '<br /><br /><br /><br /><br />Mouse: x: '+mouseX+', y:' + mouseY + '<br />'; // + document.getElementById('debug').innerHTML;
+  var mouseY_local = mouseY + getScrollOffset();
+  
+  // document.getElementById('debug').innerHTML = '<br />Mouse: x: '+mouseX+', y:' + mouseY + '<br />' + document.getElementById('debug').innerHTML;
   
   if(bias)
   {
     if ( ( mouseX < fieldUL['left'] + 2 || mouseX > fieldUL['right']  - 5 ) ||
-         ( mouseY < fieldUL['top']  - 2 || mouseY > fieldUL['bottom'] - 2 ) )
+         ( mouseY_local < fieldUL['top']  - 2 || mouseY_local > fieldUL['bottom'] - 2 ) )
     {
        return false;
     }
@@ -364,23 +366,11 @@
   else
   {
     if ( ( mouseX < fieldUL['left'] || mouseX > fieldUL['right']  ) ||
-         ( mouseY < fieldUL['top']  || mouseY > fieldUL['bottom'] ) )
+         ( mouseY_local < fieldUL['top']  || mouseY_local > fieldUL['bottom'] ) )
        return false;
   }
      
   return true;
-  
-  /*
-  var tgt = event.target;
-  if ( !tgt )
-    return false;
-  do {
-    if ( tgt == obj )
-      return true;
-    tgt = tgt.parentNode;
-  } while (tgt.tagName.toLowerCase() != 'body' );
-  return false;
-  */
 }
 
 function jBoxGarbageCollection(e)