From 64654e1e72f3ae53e2733a80e2a70a019ce40bd9 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Thu, 24 Mar 2016 16:38:34 +0100 Subject: [PATCH] Remove goog.dom.classlist usage --- src/ol/control/fullscreencontrol.js | 7 ++----- src/ol/map.js | 6 +----- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/ol/control/fullscreencontrol.js b/src/ol/control/fullscreencontrol.js index 0d13862e1c..2885544958 100644 --- a/src/ol/control/fullscreencontrol.js +++ b/src/ol/control/fullscreencontrol.js @@ -2,7 +2,6 @@ goog.provide('ol.control.FullScreen'); goog.require('goog.asserts'); goog.require('goog.dom'); -goog.require('goog.dom.classlist'); goog.require('goog.dom.fullscreen'); goog.require('goog.dom.fullscreen.EventType'); goog.require('ol.events'); @@ -134,15 +133,13 @@ ol.control.FullScreen.prototype.handleFullScreen_ = function() { * @private */ ol.control.FullScreen.prototype.handleFullScreenChange_ = function() { - var opened = this.cssClassName_ + '-true'; - var closed = this.cssClassName_ + '-false'; var button = this.element.firstElementChild; var map = this.getMap(); if (goog.dom.fullscreen.isFullScreen()) { - goog.dom.classlist.swap(button, closed, opened); + button.className = this.cssClassName_ + '-true'; goog.dom.replaceNode(this.labelActiveNode_, this.labelNode_); } else { - goog.dom.classlist.swap(button, opened, closed); + button.className = this.cssClassName_ + '-false'; goog.dom.replaceNode(this.labelNode_, this.labelActiveNode_); } if (map) { diff --git a/src/ol/map.js b/src/ol/map.js index 940e85ff9e..7166974bcb 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -8,7 +8,6 @@ goog.provide('ol.MapProperty'); goog.require('goog.asserts'); goog.require('goog.async.nextTick'); goog.require('goog.dom'); -goog.require('goog.dom.classlist'); goog.require('goog.functions'); goog.require('goog.style'); goog.require('goog.vec.Mat4'); @@ -255,7 +254,7 @@ ol.Map = function(options) { * @type {Element} */ this.viewport_ = document.createElement('DIV'); - this.viewport_.className = 'ol-viewport'; + this.viewport_.className = 'ol-viewport' + (ol.has.TOUCH ? ' ol-touch' : ''); this.viewport_.style.position = 'relative'; this.viewport_.style.overflow = 'hidden'; this.viewport_.style.width = '100%'; @@ -263,9 +262,6 @@ ol.Map = function(options) { // prevent page zoom on IE >= 10 browsers this.viewport_.style.msTouchAction = 'none'; this.viewport_.style.touchAction = 'none'; - if (ol.has.TOUCH) { - goog.dom.classlist.add(this.viewport_, 'ol-touch'); - } /** * @private