[Mapbender-commits] r8656 - branches/2.7/http/javascripts

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2013-06-14 01:48:22 -0700 (Fri, 14 Jun 2013)
New Revision: 8656

Modified:
   branches/2.7/http/javascripts/mod_key.php
Log:
correct event and key handling for current browsers

Modified: branches/2.7/http/javascripts/mod_key.php
===================================================================
--- branches/2.7/http/javascripts/mod_key.php	2013-06-14 08:47:55 UTC (rev 8655)
+++ branches/2.7/http/javascripts/mod_key.php	2013-06-14 08:48:22 UTC (rev 8656)
@@ -46,16 +46,17 @@
 }
 echo ");";
 ?>
-if(ie){
+//if(ie){
    mb_registerInitFunctions('mod_key_init()'); 
-}
+//}
 function mod_key_init(){
 	for(var i=0; i<mb_key_elements.length; i++){
 		if(mb_key_elements[i] == "body"){
-			$('body').live('keydown', function(e) {
-      			var tag = e.target.tagName.toLowerCase();
+			$('body').focus();
+			$(document).bind('keydown', function(e) {
+				var tag = e.target.tagName.toLowerCase();
     			if (tag != 'input' && tag != 'textarea') {
-        			mod_key_Keyhandler();
+        			mod_key_Keyhandler(e);
         		}
  			});
  		}
@@ -64,13 +65,13 @@
 				var currentKeyId = mb_key_ids[i]; 
 				var tag = e.target.tagName.toLowerCase();
 				if (tag != 'input' && tag != 'textarea') {
-					mod_key_Keyhandler(currentKeyId);
+					mod_key_Keyhandler(e, currentKeyId);
         		}
  			});
 		} 
 	}  
 }
-function mod_key_Keyhandler(frameName){
+function mod_key_Keyhandler(event, frameName){
 	if(frameName){
 		var code = eval("window.frames['"+frameName+"'].event.keyCode");
 		focus();
@@ -78,10 +79,11 @@
 	else{
 		var code = event.keyCode;
 	}
-	if(code == 187 || code == 107){
+	//console.log(code);
+	if(code == 187 || code == 107 || code == 171){
 		zoom(mod_key_map,true, '2.0');
 	}
-	if(code == 189 || code == 109){
+	if(code == 189 || code == 109 || code == 173){
 		zoom(mod_key_map,false, '2.0');
 	}
 	if(code == 32 || code == 13){