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

Merge pull request #2893 from fredj/simplify-createDom

Browse Source 
Don't pass an object to goog.dom.createDom for the class name
This commit is contained in:
Frédéric Junod
2014-10-30 17:57:44 +01:00
parent 2d53eb7667 6ca1640659
commit 127818f9b7
5 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ol/control/attributioncontrol.js
View File

@@ -111,12 +111,12 @@ ol.control.Attribution = function(opt_options) {
this.blur();
}, false);
var element = goog.dom.createDom(goog.dom.TagName.DIV, {
'class': className + ' ' + ol.css.CLASS_UNSELECTABLE + ' ' +
ol.css.CLASS_CONTROL +
(this.collapsed_ && this.collapsible_ ? ' ol-collapsed' : '') +
(this.collapsible_ ? '' : ' ol-uncollapsible')
}, this.ulElement_, button);
var cssClasses = className + ' ' + ol.css.CLASS_UNSELECTABLE + ' ' +
ol.css.CLASS_CONTROL +
(this.collapsed_ && this.collapsible_ ? ' ol-collapsed' : '') +
(this.collapsible_ ? '' : ' ol-uncollapsible');
var element = goog.dom.createDom(goog.dom.TagName.DIV,
cssClasses, this.ulElement_, button);
goog.base(this, {
element: element,

4
src/ol/control/mousepositioncontrol.js
View File

@@ -46,9 +46,7 @@ ol.control.MousePosition = function(opt_options) {
var className = goog.isDef(options.className) ?
options.className : 'ol-mouse-position';
var element = goog.dom.createDom(goog.dom.TagName.DIV, {
'class': className
});
var element = goog.dom.createDom(goog.dom.TagName.DIV, className);
goog.base(this, {
element: element,

12
src/ol/control/overviewmapcontrol.js
View File

@@ -134,12 +134,12 @@ ol.control.OverviewMap = function(opt_options) {
});
this.ovmap_.addOverlay(this.boxOverlay_);
var element = goog.dom.createDom(goog.dom.TagName.DIV, {
'class': className + ' ' + ol.css.CLASS_UNSELECTABLE + ' ' +
ol.css.CLASS_CONTROL +
(this.collapsed_ && this.collapsible_ ? ' ol-collapsed' : '') +
(this.collapsible_ ? '' : ' ol-uncollapsible')
}, ovmapDiv, button);
var cssClasses = className + ' ' + ol.css.CLASS_UNSELECTABLE + ' ' +
ol.css.CLASS_CONTROL +
(this.collapsed_ && this.collapsible_ ? ' ol-collapsed' : '') +
(this.collapsible_ ? '' : ' ol-uncollapsible');
var element = goog.dom.createDom(goog.dom.TagName.DIV,
cssClasses, ovmapDiv, button);
goog.base(this, {
element: element,

3
src/ol/control/rotatecontrol.js
View File

@@ -38,8 +38,7 @@ ol.control.Rotate = function(opt_options) {
* @private
*/
this.label_ = goog.dom.createDom(goog.dom.TagName.SPAN,
{ 'class': 'ol-compass' },
goog.isDef(options.label) ? options.label : '\u21E7');
'ol-compass', goog.isDef(options.label) ? options.label : '\u21E7');
var tipLabel = goog.isDef(options.tipLabel) ?
options.tipLabel : 'Reset rotation';

10
src/ol/control/scalelinecontrol.js
View File

@@ -66,17 +66,15 @@ ol.control.ScaleLine = function(opt_options) {
* @private
* @type {Element}
*/
this.innerElement_ = goog.dom.createDom(goog.dom.TagName.DIV, {
'class': className + '-inner'
});
this.innerElement_ = goog.dom.createDom(goog.dom.TagName.DIV,
className + '-inner');
/**
* @private
* @type {Element}
*/
this.element_ = goog.dom.createDom(goog.dom.TagName.DIV, {
'class': className + ' ' + ol.css.CLASS_UNSELECTABLE
}, this.innerElement_);
this.element_ = goog.dom.createDom(goog.dom.TagName.DIV,
className + ' ' + ol.css.CLASS_UNSELECTABLE, this.innerElement_);
/**
* @private