From faef6a316d03a6dc99f996175434333e396a60e3 Mon Sep 17 00:00:00 2001 From: Austin Hyde Date: Tue, 26 Nov 2013 14:52:11 -0500 Subject: [PATCH] Prevent the default image dragging behavior in IE < 9 --- css/ol.css | 5 +++++ src/ol/renderer/dom/dommaprenderer.js | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/css/ol.css b/css/ol.css index 8c32566298d..79d5385efe1 100644 --- a/css/ol.css +++ b/css/ol.css @@ -159,6 +159,11 @@ a.ol-full-screen-true:after { -ms-user-select: none; user-select: none; -webkit-tap-highlight-color: rgba(0,0,0,0); + + cursor: default; +} +.ol-viewport .ol-unselectable:not([ie8andbelow]) { + cursor: auto; } .ol-zoom { position: absolute; diff --git a/src/ol/renderer/dom/dommaprenderer.js b/src/ol/renderer/dom/dommaprenderer.js index 53b8867ec66..a518a04036e 100644 --- a/src/ol/renderer/dom/dommaprenderer.js +++ b/src/ol/renderer/dom/dommaprenderer.js @@ -3,7 +3,9 @@ goog.provide('ol.renderer.dom.Map'); goog.require('goog.asserts'); goog.require('goog.dom'); goog.require('goog.dom.TagName'); +goog.require('goog.functions'); goog.require('goog.style'); +goog.require('goog.userAgent'); goog.require('ol.css'); goog.require('ol.layer.Image'); goog.require('ol.layer.Tile'); @@ -36,6 +38,14 @@ ol.renderer.dom.Map = function(container, map) { style.width = '100%'; style.height = '100%'; + // in IE < 9, we need to return false from ondragstart to cancel the default + // behavior of dragging images, which is interfering with the custom handler + // in the Drag interaction subclasses + if (goog.userAgent.IE && !goog.userAgent.isVersionOrHigher('9.0')) { + this.layersPane_.ondragstart = goog.functions.FALSE; + this.layersPane_.onselectstart = goog.functions.FALSE; + } + goog.dom.insertChildAt(container, this.layersPane_, 0); /**