Remove use of goog.dom.createDom

This commit is contained in:
Frederic Junod
2016-02-15 16:20:52 +01:00
parent 34392b464c
commit 296ec9799f
5 changed files with 23 additions and 13 deletions

View File

@@ -2,7 +2,6 @@
goog.provide('ol.control.MousePosition'); goog.provide('ol.control.MousePosition');
goog.require('goog.dom');
goog.require('ol.events'); goog.require('ol.events');
goog.require('ol.events.EventType'); goog.require('ol.events.EventType');
goog.require('ol.CoordinateFormatType'); goog.require('ol.CoordinateFormatType');
@@ -40,10 +39,8 @@ ol.control.MousePosition = function(opt_options) {
var options = opt_options ? opt_options : {}; var options = opt_options ? opt_options : {};
var className = options.className !== undefined ? options.className : var element = document.createElement('DIV');
'ol-mouse-position'; element.className = options.className !== undefined ? options.className : 'ol-mouse-position'
var element = goog.dom.createDom('DIV', className);
var render = options.render ? var render = options.render ?
options.render : ol.control.MousePosition.render; options.render : ol.control.MousePosition.render;

View File

@@ -86,7 +86,8 @@ ol.control.OverviewMap = function(opt_options) {
ol.events.listen(button, ol.events.EventType.CLICK, ol.events.listen(button, ol.events.EventType.CLICK,
this.handleClick_, this); this.handleClick_, this);
var ovmapDiv = goog.dom.createDom('DIV', 'ol-overviewmap-map'); var ovmapDiv = document.createElement('DIV');
ovmapDiv.className = 'ol-overviewmap-map';
/** /**
* @type {ol.Map} * @type {ol.Map}

View File

@@ -3,7 +3,6 @@ goog.provide('ol.control.ScaleLineProperty');
goog.provide('ol.control.ScaleLineUnits'); goog.provide('ol.control.ScaleLineUnits');
goog.require('goog.asserts'); goog.require('goog.asserts');
goog.require('goog.dom');
goog.require('ol.events'); goog.require('ol.events');
goog.require('goog.style'); goog.require('goog.style');
goog.require('ol'); goog.require('ol');
@@ -61,14 +60,16 @@ ol.control.ScaleLine = function(opt_options) {
* @private * @private
* @type {Element} * @type {Element}
*/ */
this.innerElement_ = goog.dom.createDom('DIV', className + '-inner'); this.innerElement_ = document.createElement('DIV');
this.innerElement_.className = className + '-inner';
/** /**
* @private * @private
* @type {Element} * @type {Element}
*/ */
this.element_ = goog.dom.createDom('DIV', this.element_ = document.createElement('DIV');
className + ' ' + ol.css.CLASS_UNSELECTABLE, this.innerElement_); this.element_.className = className + ' ' + ol.css.CLASS_UNSELECTABLE;
this.element_.appendChild(this.innerElement_);
/** /**
* @private * @private

View File

@@ -7,7 +7,7 @@ describe('ol.control.Control', function() {
map = new ol.Map({ map = new ol.Map({
target: document.createElement('div') target: document.createElement('div')
}); });
var element = goog.dom.createDom('DIV'); var element = document.createElement('DIV');
control = new ol.control.Control({element: element}); control = new ol.control.Control({element: element});
control.setMap(map); control.setMap(map);
}); });
@@ -27,14 +27,16 @@ describe('ol.control.Control', function() {
describe('ol.control.Control\'s target', function() { describe('ol.control.Control\'s target', function() {
describe('target as string or element', function() { describe('target as string or element', function() {
it('transforms target from string to element', function() { it('transforms target from string to element', function() {
var target = goog.dom.createDom('div', {'id': 'mycontrol'}); var target = document.createElement('div');
target.id = 'mycontrol';
document.body.appendChild(target); document.body.appendChild(target);
var ctrl = new ol.control.Control({target: 'mycontrol'}); var ctrl = new ol.control.Control({target: 'mycontrol'});
expect(ctrl.target_.id).to.equal('mycontrol'); expect(ctrl.target_.id).to.equal('mycontrol');
goog.dispose(ctrl); goog.dispose(ctrl);
}); });
it('accepts element for target', function() { it('accepts element for target', function() {
var target = goog.dom.createDom('div', {'id': 'mycontrol'}); var target = document.createElement('div');
target.id = 'mycontrol';
document.body.appendChild(target); document.body.appendChild(target);
var ctrl = new ol.control.Control({target: target}); var ctrl = new ol.control.Control({target: target});
expect(ctrl.target_.id).to.equal('mycontrol'); expect(ctrl.target_.id).to.equal('mycontrol');

View File

@@ -7,6 +7,15 @@ describe('ol.control.MousePosition', function() {
it('can be constructed without arguments', function() { it('can be constructed without arguments', function() {
var instance = new ol.control.MousePosition(); var instance = new ol.control.MousePosition();
expect(instance).to.be.an(ol.control.MousePosition); expect(instance).to.be.an(ol.control.MousePosition);
expect(instance.element.className).to.be('ol-mouse-position');
});
it('creates the element with the provided class name', function() {
var className = 'foobar';
var instance = new ol.control.MousePosition({
className: className
});
expect(instance.element.className).to.be(className);
}); });
}); });