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
src/ol/control/attributioncontrol.js
+6 -6
View File
@@ -111,12 +111,12 @@ ol.control.Attribution = function(opt_options) {
this.blur(); this.blur();
}, false); }, false);
var element = goog.dom.createDom(goog.dom.TagName.DIV, { var cssClasses = className + ' ' + ol.css.CLASS_UNSELECTABLE + ' ' +
'class': className + ' ' + ol.css.CLASS_UNSELECTABLE + ' ' + ol.css.CLASS_CONTROL +
ol.css.CLASS_CONTROL + (this.collapsed_ && this.collapsible_ ? ' ol-collapsed' : '') +
(this.collapsed_ && this.collapsible_ ? ' ol-collapsed' : '') + (this.collapsible_ ? '' : ' ol-uncollapsible');
(this.collapsible_ ? '' : ' ol-uncollapsible') var element = goog.dom.createDom(goog.dom.TagName.DIV,
}, this.ulElement_, button); cssClasses, this.ulElement_, button);
goog.base(this, { goog.base(this, {
element: element, element: element,
src/ol/control/mousepositioncontrol.js
+1 -3
View File
@@ -46,9 +46,7 @@ ol.control.MousePosition = function(opt_options) {
var className = goog.isDef(options.className) ? var className = goog.isDef(options.className) ?
options.className : 'ol-mouse-position'; options.className : 'ol-mouse-position';
var element = goog.dom.createDom(goog.dom.TagName.DIV, { var element = goog.dom.createDom(goog.dom.TagName.DIV, className);
'class': className
});
goog.base(this, { goog.base(this, {
element: element, element: element,
src/ol/control/overviewmapcontrol.js
+6 -6
View File
@@ -134,12 +134,12 @@ ol.control.OverviewMap = function(opt_options) {
}); });
this.ovmap_.addOverlay(this.boxOverlay_); this.ovmap_.addOverlay(this.boxOverlay_);
var element = goog.dom.createDom(goog.dom.TagName.DIV, { var cssClasses = className + ' ' + ol.css.CLASS_UNSELECTABLE + ' ' +
'class': className + ' ' + ol.css.CLASS_UNSELECTABLE + ' ' + ol.css.CLASS_CONTROL +
ol.css.CLASS_CONTROL + (this.collapsed_ && this.collapsible_ ? ' ol-collapsed' : '') +
(this.collapsed_ && this.collapsible_ ? ' ol-collapsed' : '') + (this.collapsible_ ? '' : ' ol-uncollapsible');
(this.collapsible_ ? '' : ' ol-uncollapsible') var element = goog.dom.createDom(goog.dom.TagName.DIV,
}, ovmapDiv, button); cssClasses, ovmapDiv, button);
goog.base(this, { goog.base(this, {
element: element, element: element,
src/ol/control/rotatecontrol.js
+1 -2
View File
@@ -38,8 +38,7 @@ ol.control.Rotate = function(opt_options) {
* @private * @private
*/ */
this.label_ = goog.dom.createDom(goog.dom.TagName.SPAN, this.label_ = goog.dom.createDom(goog.dom.TagName.SPAN,
{ 'class': 'ol-compass' }, 'ol-compass', goog.isDef(options.label) ? options.label : '\u21E7');
goog.isDef(options.label) ? options.label : '\u21E7');
var tipLabel = goog.isDef(options.tipLabel) ? var tipLabel = goog.isDef(options.tipLabel) ?
options.tipLabel : 'Reset rotation'; options.tipLabel : 'Reset rotation';
src/ol/control/scalelinecontrol.js
+4 -6
View File
@@ -66,17 +66,15 @@ ol.control.ScaleLine = function(opt_options) {
* @private * @private
* @type {Element} * @type {Element}
*/ */
this.innerElement_ = goog.dom.createDom(goog.dom.TagName.DIV, { this.innerElement_ = goog.dom.createDom(goog.dom.TagName.DIV,
'class': className + '-inner' className + '-inner');
});
/** /**
* @private * @private
* @type {Element} * @type {Element}
*/ */
this.element_ = goog.dom.createDom(goog.dom.TagName.DIV, { this.element_ = goog.dom.createDom(goog.dom.TagName.DIV,
'class': className + ' ' + ol.css.CLASS_UNSELECTABLE className + ' ' + ol.css.CLASS_UNSELECTABLE, this.innerElement_);
}, this.innerElement_);
/** /**
* @private * @private