From a2209496e6581a3c5568fa8ac15f1b532eaee058 Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Thu, 31 May 2012 20:50:46 +0000 Subject: [PATCH] Corrige a opção de zoom por box na interface googlemaps --- classesjs/classe_interface.js | 4 ++-- css/geral.css | 13 +++++++++++++ css/i3geo46.css | 11 +++++++++++ css/i3geo46.css.php | 11 +++++++++++ pacotes/google/keydragzoom.js.php | 16 ++++++++-------- 5 files changed, 45 insertions(+), 10 deletions(-) diff --git a/classesjs/classe_interface.js b/classesjs/classe_interface.js index 95836c9..9592414 100644 --- a/classesjs/classe_interface.js +++ b/classesjs/classe_interface.js @@ -227,7 +227,7 @@ i3GEO.Interface = { {i3GEO.Interface.atual2gm.initemp();} } catch(e){ - i3GEO.util.scriptTag("http://www.google.com/jsapi?callback=i3GEO.Interface.atual2gm.loadMaps","","",true); + i3GEO.util.scriptTag("http://www.google.com/jsapi?callback=i3GEO.Interface.atual2gm.loadMaps","","",false); } }, loadMaps: function(){ @@ -263,7 +263,7 @@ i3GEO.Interface = { {i3GEO.Interface.atual2ol.initemp();} } catch(e){ - i3GEO.util.scriptTag(i3GEO.configura.locaplic+"/pacotes/openlayers/OpenLayers211.js.php","i3GEO.Interface.atual2ol.initemp()","",true); + i3GEO.util.scriptTag(i3GEO.configura.locaplic+"/pacotes/openlayers/OpenLayers211.js.php","i3GEO.Interface.atual2ol.initemp()","",false); } }, initemp: function(){ diff --git a/css/geral.css b/css/geral.css index f0426a4..679ecb1 100644 --- a/css/geral.css +++ b/css/geral.css @@ -202,6 +202,19 @@ h1 {padding:.25em .5em;background-color:#ccc;} background: url(../pacotes/yui270/build/container/img/corner_resize.gif) left bottom no-repeat; cursor: se-resize; } +#googlemapsdiv { + -moz-user-select: -moz-none; + -khtml-user-select: none; + -webkit-user-select: none; + /* + Introduced in IE 10. + See http://ie.microsoft.com/testdrive/HTML5/msUserSelect/ + */ + -ms-user-select: none; + user-select: none; +} + + /*hack opera */ @media all and (-webkit-min-device-pixel-ratio:10000), not all and (-webkit-min-device-pixel-ratio:0) { .inputsb {border:1px solid black} } diff --git a/css/i3geo46.css b/css/i3geo46.css index b502407..1b2a1dd 100644 --- a/css/i3geo46.css +++ b/css/i3geo46.css @@ -193,6 +193,17 @@ z-index: 3000; background: url(../pacotes/yui270/build/container/img/corner_resize.gif) left bottom no-repeat; cursor: se-resize; } +#googlemapsdiv { +-moz-user-select: -moz-none; +-khtml-user-select: none; +-webkit-user-select: none; +/* +Introduced in IE 10. +See http://ie.microsoft.com/testdrive/HTML5/msUserSelect/ +*/ +-ms-user-select: none; +user-select: none; +} /*hack opera */ @media all and (-webkit-min-device-pixel-ratio:10000), not all and (-webkit-min-device-pixel-ratio:0) { .inputsb {border:1px solid black} } diff --git a/css/i3geo46.css.php b/css/i3geo46.css.php index 45a5ccf..504f6a6 100644 --- a/css/i3geo46.css.php +++ b/css/i3geo46.css.php @@ -193,6 +193,17 @@ z-index: 3000; background: url(../pacotes/yui270/build/container/img/corner_resize.gif) left bottom no-repeat; cursor: se-resize; } +#googlemapsdiv { +-moz-user-select: -moz-none; +-khtml-user-select: none; +-webkit-user-select: none; +/* +Introduced in IE 10. +See http://ie.microsoft.com/testdrive/HTML5/msUserSelect/ +*/ +-ms-user-select: none; +user-select: none; +} /*hack opera */ @media all and (-webkit-min-device-pixel-ratio:10000), not all and (-webkit-min-device-pixel-ratio:0) { .inputsb {border:1px solid black} } diff --git a/pacotes/google/keydragzoom.js.php b/pacotes/google/keydragzoom.js.php index d3efa53..89c492d 100644 --- a/pacotes/google/keydragzoom.js.php +++ b/pacotes/google/keydragzoom.js.php @@ -66,19 +66,19 @@ computedStyle = h.ownerDocument.defaultView.getComputedStyle(h, ""); if (computedStyle) { // The computed styles are always in pixel units (good!) - bw.top = parseInt(computedStyle.borderTopWidth, 10) + "px" || 0 + "px"; - bw.bottom = parseInt(computedStyle.borderBottomWidth, 10) + "px" || 0 + "px"; - bw.left = parseInt(computedStyle.borderLeftWidth, 10) + "px" || 0 + "px"; - bw.right = parseInt(computedStyle.borderRightWidth, 10) + "px" || 0 + "px"; + bw.top = parseInt(computedStyle.borderTopWidth, 10) || 0; + bw.bottom = parseInt(computedStyle.borderBottomWidth, 10) || 0; + bw.left = parseInt(computedStyle.borderLeftWidth, 10) || 0; + bw.right = parseInt(computedStyle.borderRightWidth, 10) || 0; return bw; } } else if (document.documentElement.currentStyle) { // MSIE if (h.currentStyle) { // The current styles may not be in pixel units so try to convert (bad!) - bw.top = parseInt(toPixels(h.currentStyle.borderTopWidth), 10) + "px" || 0 + "px"; - bw.bottom = parseInt(toPixels(h.currentStyle.borderBottomWidth), 10) + "px" || 0 + "px"; - bw.left = parseInt(toPixels(h.currentStyle.borderLeftWidth), 10) + "px" || 0 + "px"; - bw.right = parseInt(toPixels(h.currentStyle.borderRightWidth), 10) + "px" || 0 + "px"; + bw.top = parseInt(toPixels(h.currentStyle.borderTopWidth), 10) || 0; + bw.bottom = parseInt(toPixels(h.currentStyle.borderBottomWidth), 10) || 0; + bw.left = parseInt(toPixels(h.currentStyle.borderLeftWidth), 10) || 0; + bw.right = parseInt(toPixels(h.currentStyle.borderRightWidth), 10) || 0; return bw; } } -- libgit2 0.21.2