ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove usage of goog.dom.TagName enum

Browse Source
This commit is contained in:
Marc Jansen
2015-10-12 20:42:34 +02:00
parent e111e30f33
commit 9386415633
27 changed files with 58 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/control/attributioncontrol.js
+9 -10
View File
@@ -4,7 +4,6 @@ goog.provide('ol.control.Attribution');
goog.require('goog.asserts');
goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('goog.dom.classlist');
goog.require('goog.events');
goog.require('goog.events.EventType');
@@ -38,13 +37,13 @@ ol.control.Attribution = function(opt_options) {
* @private
* @type {Element}
*/
this.ulElement_ = goog.dom.createElement(goog.dom.TagName.UL);
this.ulElement_ = goog.dom.createElement('UL');
/**
* @private
* @type {Element}
*/
this.logoLi_ = goog.dom.createElement(goog.dom.TagName.LI);
this.logoLi_ = goog.dom.createElement('LI');
this.ulElement_.appendChild(this.logoLi_);
goog.style.setElementShown(this.logoLi_, false);
@@ -77,7 +76,7 @@ ol.control.Attribution = function(opt_options) {
* @type {Node}
*/
this.collapseLabel_ = goog.isString(collapseLabel) ?
goog.dom.createDom(goog.dom.TagName.SPAN, {}, collapseLabel) :
goog.dom.createDom('SPAN', {}, collapseLabel) :
collapseLabel;
var label = options.label ? options.label : 'i';
@@ -87,12 +86,12 @@ ol.control.Attribution = function(opt_options) {
* @type {Node}
*/
this.label_ = goog.isString(label) ?
goog.dom.createDom(goog.dom.TagName.SPAN, {}, label) :
goog.dom.createDom('SPAN', {}, label) :
label;
var activeLabel = (this.collapsible_ && !this.collapsed_) ?
this.collapseLabel_ : this.label_;
var button = goog.dom.createDom(goog.dom.TagName.BUTTON, {
var button = goog.dom.createDom('BUTTON', {
'type': 'button',
'title': tipLabel
}, activeLabel);
@@ -111,7 +110,7 @@ ol.control.Attribution = function(opt_options) {
ol.css.CLASS_CONTROL +
(this.collapsed_ && this.collapsible_ ? ' ol-collapsed' : '') +
(this.collapsible_ ? '' : ' ol-uncollapsible');
var element = goog.dom.createDom(goog.dom.TagName.DIV,
var element = goog.dom.createDom('DIV',
cssClasses, this.ulElement_, button);
var render = options.render ? options.render : ol.control.Attribution.render;
@@ -262,7 +261,7 @@ ol.control.Attribution.prototype.updateElement_ = function(frameState) {
}
}
for (attributionKey in visibleAttributions) {
attributionElement = goog.dom.createElement(goog.dom.TagName.LI);
attributionElement = goog.dom.createElement('LI');
attributionElement.innerHTML =
visibleAttributions[attributionKey].getHTML();
this.ulElement_.appendChild(attributionElement);
@@ -270,7 +269,7 @@ ol.control.Attribution.prototype.updateElement_ = function(frameState) {
this.attributionElementRenderedVisible_[attributionKey] = true;
}
for (attributionKey in hiddenAttributions) {
attributionElement = goog.dom.createElement(goog.dom.TagName.LI);
attributionElement = goog.dom.createElement('LI');
attributionElement.innerHTML =
hiddenAttributions[attributionKey].getHTML();
goog.style.setElementShown(attributionElement, false);
@@ -323,7 +322,7 @@ ol.control.Attribution.prototype.insertLogos_ = function(frameState) {
if (logoValue === '') {
logoElement = image;
} else {
logoElement = goog.dom.createDom(goog.dom.TagName.A, {
logoElement = goog.dom.createDom('A', {
'href': logoValue
});
logoElement.appendChild(image);
src/ol/control/fullscreencontrol.js
+2 -3
View File
@@ -2,7 +2,6 @@ goog.provide('ol.control.FullScreen');
goog.require('goog.asserts');
goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('goog.dom.classlist');
goog.require('goog.dom.fullscreen');
goog.require('goog.dom.fullscreen.EventType');
@@ -56,7 +55,7 @@ ol.control.FullScreen = function(opt_options) {
goog.dom.createTextNode(labelActive) : labelActive;
var tipLabel = options.tipLabel ? options.tipLabel : 'Toggle full-screen';
var button = goog.dom.createDom(goog.dom.TagName.BUTTON, {
var button = goog.dom.createDom('BUTTON', {
'class': this.cssClassName_ + '-' + goog.dom.fullscreen.isFullScreen(),
'type': 'button',
'title': tipLabel
@@ -72,7 +71,7 @@ ol.control.FullScreen = function(opt_options) {
var cssClasses = this.cssClassName_ + ' ' + ol.css.CLASS_UNSELECTABLE +
' ' + ol.css.CLASS_CONTROL + ' ' +
(!goog.dom.fullscreen.isSupported() ? ol.css.CLASS_UNSUPPORTED : '');
var element = goog.dom.createDom(goog.dom.TagName.DIV, cssClasses, button);
var element = goog.dom.createDom('DIV', cssClasses, button);
goog.base(this, {
element: element,
src/ol/control/mousepositioncontrol.js
+1 -2
View File
@@ -3,7 +3,6 @@
goog.provide('ol.control.MousePosition');
goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('goog.events');
goog.require('goog.events.EventType');
goog.require('ol.CoordinateFormatType');
@@ -44,7 +43,7 @@ ol.control.MousePosition = function(opt_options) {
var className = options.className ? options.className : 'ol-mouse-position';
var element = goog.dom.createDom(goog.dom.TagName.DIV, className);
var element = goog.dom.createDom('DIV', className);
var render = options.render ?
options.render : ol.control.MousePosition.render;
src/ol/control/overviewmapcontrol.js
+6 -7
View File
@@ -2,7 +2,6 @@ goog.provide('ol.control.OverviewMap');
goog.require('goog.asserts');
goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('goog.dom.classlist');
goog.require('goog.events');
goog.require('goog.events.EventType');
@@ -65,7 +64,7 @@ ol.control.OverviewMap = function(opt_options) {
* @type {Node}
*/
this.collapseLabel_ = goog.isString(collapseLabel) ?
goog.dom.createDom(goog.dom.TagName.SPAN, {}, collapseLabel) :
goog.dom.createDom('SPAN', {}, collapseLabel) :
collapseLabel;
var label = options.label ? options.label : '\u00BB';
@@ -75,12 +74,12 @@ ol.control.OverviewMap = function(opt_options) {
* @type {Node}
*/
this.label_ = goog.isString(label) ?
goog.dom.createDom(goog.dom.TagName.SPAN, {}, label) :
goog.dom.createDom('SPAN', {}, label) :
label;
var activeLabel = (this.collapsible_ && !this.collapsed_) ?
this.collapseLabel_ : this.label_;
var button = goog.dom.createDom(goog.dom.TagName.BUTTON, {
var button = goog.dom.createDom('BUTTON', {
'type': 'button',
'title': tipLabel
}, activeLabel);
@@ -88,7 +87,7 @@ ol.control.OverviewMap = function(opt_options) {
goog.events.listen(button, goog.events.EventType.CLICK,
this.handleClick_, false, this);
var ovmapDiv = goog.dom.createDom(goog.dom.TagName.DIV, 'ol-overviewmap-map');
var ovmapDiv = goog.dom.createDom('DIV', 'ol-overviewmap-map');
/**
* @type {ol.Map}
@@ -112,7 +111,7 @@ ol.control.OverviewMap = function(opt_options) {
}, this);
}
var box = goog.dom.createDom(goog.dom.TagName.DIV, 'ol-overviewmap-box');
var box = goog.dom.createDom('DIV', 'ol-overviewmap-box');
/**
* @type {ol.Overlay}
@@ -129,7 +128,7 @@ ol.control.OverviewMap = function(opt_options) {
ol.css.CLASS_CONTROL +
(this.collapsed_ && this.collapsible_ ? ' ol-collapsed' : '') +
(this.collapsible_ ? '' : ' ol-uncollapsible');
var element = goog.dom.createDom(goog.dom.TagName.DIV,
var element = goog.dom.createDom('DIV',
cssClasses, ovmapDiv, button);
var render = options.render ? options.render : ol.control.OverviewMap.render;
src/ol/control/rotatecontrol.js
+3 -4
View File
@@ -1,7 +1,6 @@
goog.provide('ol.control.Rotate');
goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('goog.dom.classlist');
goog.require('goog.events');
goog.require('goog.events.EventType');
@@ -40,7 +39,7 @@ ol.control.Rotate = function(opt_options) {
this.label_ = null;
if (goog.isString(label)) {
this.label_ = goog.dom.createDom(goog.dom.TagName.SPAN,
this.label_ = goog.dom.createDom('SPAN',
'ol-compass', label);
} else {
this.label_ = label;
@@ -49,7 +48,7 @@ ol.control.Rotate = function(opt_options) {
var tipLabel = options.tipLabel ? options.tipLabel : 'Reset rotation';
var button = goog.dom.createDom(goog.dom.TagName.BUTTON, {
var button = goog.dom.createDom('BUTTON', {
'class': className + '-reset',
'type' : 'button',
'title': tipLabel
@@ -60,7 +59,7 @@ ol.control.Rotate = function(opt_options) {
var cssClasses = className + ' ' + ol.css.CLASS_UNSELECTABLE + ' ' +
ol.css.CLASS_CONTROL;
var element = goog.dom.createDom(goog.dom.TagName.DIV, cssClasses, button);
var element = goog.dom.createDom('DIV', cssClasses, button);
var render = options.render ? options.render : ol.control.Rotate.render;
src/ol/control/scalelinecontrol.js
+2 -3
View File
@@ -4,7 +4,6 @@ goog.provide('ol.control.ScaleLineUnits');
goog.require('goog.asserts');
goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('goog.events');
goog.require('goog.math');
goog.require('goog.style');
@@ -67,14 +66,14 @@ ol.control.ScaleLine = function(opt_options) {
* @private
* @type {Element}
*/
this.innerElement_ = goog.dom.createDom(goog.dom.TagName.DIV,
this.innerElement_ = goog.dom.createDom('DIV',
className + '-inner');
/**
* @private
* @type {Element}
*/
this.element_ = goog.dom.createDom(goog.dom.TagName.DIV,
this.element_ = goog.dom.createDom('DIV',
className + ' ' + ol.css.CLASS_UNSELECTABLE, this.innerElement_);
/**
src/ol/control/zoomcontrol.js
+3 -4
View File
@@ -1,7 +1,6 @@
goog.provide('ol.control.Zoom');
goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('goog.events');
goog.require('goog.events.EventType');
goog.require('ol.animation');
@@ -38,7 +37,7 @@ ol.control.Zoom = function(opt_options) {
var zoomOutTipLabel = options.zoomOutTipLabel ?
options.zoomOutTipLabel : 'Zoom out';
var inElement = goog.dom.createDom(goog.dom.TagName.BUTTON, {
var inElement = goog.dom.createDom('BUTTON', {
'class': className + '-in',
'type' : 'button',
'title': zoomInTipLabel
@@ -48,7 +47,7 @@ ol.control.Zoom = function(opt_options) {
goog.events.EventType.CLICK, goog.partial(
ol.control.Zoom.prototype.handleClick_, delta), false, this);
var outElement = goog.dom.createDom(goog.dom.TagName.BUTTON, {
var outElement = goog.dom.createDom('BUTTON', {
'class': className + '-out',
'type' : 'button',
'title': zoomOutTipLabel
@@ -60,7 +59,7 @@ ol.control.Zoom = function(opt_options) {
var cssClasses = className + ' ' + ol.css.CLASS_UNSELECTABLE + ' ' +
ol.css.CLASS_CONTROL;
var element = goog.dom.createDom(goog.dom.TagName.DIV, cssClasses, inElement,
var element = goog.dom.createDom('DIV', cssClasses, inElement,
outElement);
goog.base(this, {
src/ol/control/zoomslidercontrol.js
+2 -3
View File
@@ -4,7 +4,6 @@ goog.provide('ol.control.ZoomSlider');
goog.require('goog.asserts');
goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('goog.events');
goog.require('goog.events.Event');
goog.require('goog.events.EventType');
@@ -79,11 +78,11 @@ ol.control.ZoomSlider = function(opt_options) {
this.duration_ = options.duration ? options.duration : 200;
var className = options.className ? options.className : 'ol-zoomslider';
var thumbElement = goog.dom.createDom(goog.dom.TagName.BUTTON, {
var thumbElement = goog.dom.createDom('BUTTON', {
'type': 'button',
'class': className + '-thumb ' + ol.css.CLASS_UNSELECTABLE
});
var containerElement = goog.dom.createDom(goog.dom.TagName.DIV,
var containerElement = goog.dom.createDom('DIV',
[className, ol.css.CLASS_UNSELECTABLE, ol.css.CLASS_CONTROL],
thumbElement);
src/ol/control/zoomtoextentcontrol.js
+2 -3
View File
@@ -2,7 +2,6 @@ goog.provide('ol.control.ZoomToExtent');
goog.require('goog.asserts');
goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('goog.events');
goog.require('goog.events.EventType');
goog.require('ol.control.Control');
@@ -35,7 +34,7 @@ ol.control.ZoomToExtent = function(opt_options) {
var label = options.label ? options.label : 'E';
var tipLabel = options.tipLabel ?
options.tipLabel : 'Fit to extent';
var button = goog.dom.createDom(goog.dom.TagName.BUTTON, {
var button = goog.dom.createDom('BUTTON', {
'type': 'button',
'title': tipLabel
}, label);
@@ -45,7 +44,7 @@ ol.control.ZoomToExtent = function(opt_options) {
var cssClasses = className + ' ' + ol.css.CLASS_UNSELECTABLE + ' ' +
ol.css.CLASS_CONTROL;
var element = goog.dom.createDom(goog.dom.TagName.DIV, cssClasses, button);
var element = goog.dom.createDom('DIV', cssClasses, button);
goog.base(this, {
element: element,