Merge pull request #352 from marcjansen/unselectable-css-const

Use constant for CSS class 'ol-unselectable'.
This commit is contained in:
Marc Jansen
2013-03-12 03:30:38 -07:00
7 changed files with 22 additions and 7 deletions

View File

@@ -8,6 +8,7 @@ goog.require('goog.dom.TagName');
goog.require('goog.events'); goog.require('goog.events');
goog.require('goog.object'); goog.require('goog.object');
goog.require('goog.style'); goog.require('goog.style');
goog.require('ol');
goog.require('ol.Attribution'); goog.require('ol.Attribution');
goog.require('ol.FrameState'); goog.require('ol.FrameState');
goog.require('ol.MapEvent'); goog.require('ol.MapEvent');
@@ -30,7 +31,7 @@ ol.control.Attribution = function(opt_options) {
this.ulElement_ = goog.dom.createElement(goog.dom.TagName.UL); this.ulElement_ = goog.dom.createElement(goog.dom.TagName.UL);
var element = goog.dom.createDom(goog.dom.TagName.DIV, { var element = goog.dom.createDom(goog.dom.TagName.DIV, {
'class': 'ol-attribution ol-unselectable' 'class': 'ol-attribution ' + ol.CSS_CLASS_UNSELECTABLE
}, this.ulElement_); }, this.ulElement_);
goog.base(this, { goog.base(this, {

View File

@@ -3,6 +3,7 @@ goog.provide('ol.control.ScaleLineUnits');
goog.require('goog.dom'); goog.require('goog.dom');
goog.require('goog.style'); goog.require('goog.style');
goog.require('ol');
goog.require('ol.FrameState'); goog.require('ol.FrameState');
goog.require('ol.MapEvent'); goog.require('ol.MapEvent');
goog.require('ol.MapEventType'); goog.require('ol.MapEventType');
@@ -48,7 +49,7 @@ ol.control.ScaleLine = function(opt_options) {
* @type {Element} * @type {Element}
*/ */
this.element_ = goog.dom.createDom(goog.dom.TagName.DIV, { this.element_ = goog.dom.createDom(goog.dom.TagName.DIV, {
'class': 'ol-scale-line ol-unselectable' 'class': 'ol-scale-line ' + ol.CSS_CLASS_UNSELECTABLE
}, this.innerElement_); }, this.innerElement_);
/** /**

View File

@@ -6,6 +6,7 @@ goog.require('goog.dom');
goog.require('goog.dom.TagName'); goog.require('goog.dom.TagName');
goog.require('goog.events'); goog.require('goog.events');
goog.require('goog.events.EventType'); goog.require('goog.events.EventType');
goog.require('ol');
goog.require('ol.control.Control'); goog.require('ol.control.Control');
@@ -43,8 +44,9 @@ ol.control.Zoom = function(opt_options) {
goog.events.EventType.CLICK goog.events.EventType.CLICK
], this.handleOut_, false, this); ], this.handleOut_, false, this);
var element = goog.dom.createDom( var cssClasses = 'ol-zoom ' + ol.CSS_CLASS_UNSELECTABLE;
goog.dom.TagName.DIV, 'ol-zoom ol-unselectable', inElement, outElement); var element = goog.dom.createDom(goog.dom.TagName.DIV, cssClasses, inElement,
outElement);
goog.base(this, { goog.base(this, {
element: element, element: element,

View File

@@ -7,3 +7,11 @@ if (goog.DEBUG) {
var logger = goog.debug.Logger.getLogger('ol'); var logger = goog.debug.Logger.getLogger('ol');
logger.setLevel(goog.debug.Logger.Level.FINEST); logger.setLevel(goog.debug.Logger.Level.FINEST);
} }
/**
* The CSS class that we'll give the DOM elements to have them unselectable.
*
* @const {string}
*/
ol.CSS_CLASS_UNSELECTABLE = 'ol-unselectable';

View File

@@ -6,6 +6,7 @@ goog.require('goog.array');
goog.require('goog.dom'); goog.require('goog.dom');
goog.require('goog.style'); goog.require('goog.style');
goog.require('goog.vec.Mat4'); goog.require('goog.vec.Mat4');
goog.require('ol');
goog.require('ol.Size'); goog.require('ol.Size');
goog.require('ol.layer.ImageLayer'); goog.require('ol.layer.ImageLayer');
goog.require('ol.layer.TileLayer'); goog.require('ol.layer.TileLayer');
@@ -38,7 +39,7 @@ ol.renderer.canvas.Map = function(container, map) {
this.canvas_ = goog.dom.createElement(goog.dom.TagName.CANVAS); this.canvas_ = goog.dom.createElement(goog.dom.TagName.CANVAS);
this.canvas_.height = this.canvasSize_.height; this.canvas_.height = this.canvasSize_.height;
this.canvas_.width = this.canvasSize_.width; this.canvas_.width = this.canvasSize_.width;
this.canvas_.className = 'ol-unselectable'; this.canvas_.className = ol.CSS_CLASS_UNSELECTABLE;
goog.dom.insertChildAt(container, this.canvas_, 0); goog.dom.insertChildAt(container, this.canvas_, 0);
/** /**

View File

@@ -5,6 +5,7 @@ goog.require('goog.asserts');
goog.require('goog.dom'); goog.require('goog.dom');
goog.require('goog.dom.TagName'); goog.require('goog.dom.TagName');
goog.require('goog.style'); goog.require('goog.style');
goog.require('ol');
goog.require('ol.layer.ImageLayer'); goog.require('ol.layer.ImageLayer');
goog.require('ol.layer.TileLayer'); goog.require('ol.layer.TileLayer');
goog.require('ol.renderer.Map'); goog.require('ol.renderer.Map');
@@ -28,7 +29,7 @@ ol.renderer.dom.Map = function(container, map) {
* @private * @private
*/ */
this.layersPane_ = goog.dom.createElement(goog.dom.TagName.DIV); this.layersPane_ = goog.dom.createElement(goog.dom.TagName.DIV);
this.layersPane_.className = 'ol-layers ol-unselectable'; this.layersPane_.className = 'ol-layers ' + ol.CSS_CLASS_UNSELECTABLE;
var style = this.layersPane_.style; var style = this.layersPane_.style;
style.position = 'absolute'; style.position = 'absolute';
style.width = '100%'; style.width = '100%';

View File

@@ -11,6 +11,7 @@ goog.require('goog.events');
goog.require('goog.events.Event'); goog.require('goog.events.Event');
goog.require('goog.style'); goog.require('goog.style');
goog.require('goog.webgl'); goog.require('goog.webgl');
goog.require('ol');
goog.require('ol.FrameState'); goog.require('ol.FrameState');
goog.require('ol.Size'); goog.require('ol.Size');
goog.require('ol.Tile'); goog.require('ol.Tile');
@@ -122,7 +123,7 @@ ol.renderer.webgl.Map = function(container, map) {
this.canvas_ = goog.dom.createElement(goog.dom.TagName.CANVAS); this.canvas_ = goog.dom.createElement(goog.dom.TagName.CANVAS);
this.canvas_.height = container.clientHeight; this.canvas_.height = container.clientHeight;
this.canvas_.width = container.clientWidth; this.canvas_.width = container.clientWidth;
this.canvas_.className = 'ol-unselectable'; this.canvas_.className = ol.CSS_CLASS_UNSELECTABLE;
goog.dom.insertChildAt(container, this.canvas_, 0); goog.dom.insertChildAt(container, this.canvas_, 0);
/** /**