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

Merge pull request #7632 from marcjansen/renames

Browse Source 
Named exports from ol/css module
This commit is contained in:
Marc Jansen
2017-12-19 15:44:36 +01:00
committed by GitHub
parent 1aa7313a7b a7c5897bdb
commit 3cef7cd5cd
14 changed files with 40 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/Overlay.js
View File

@@ -5,7 +5,7 @@ import {inherits} from './index.js';
import MapEventType from './MapEventType.js';
import _ol_Object_ from './Object.js';
import OverlayPositioning from './OverlayPositioning.js';
import _ol_css_ from './css.js';
import {CLASS_SELECTABLE} from './css.js';
import {removeNode, removeChildren, outerWidth, outerHeight} from './dom.js';
import _ol_events_ from './events.js';
import {containsExtent} from './extent.js';
@@ -80,7 +80,7 @@ var Overlay = function(options) {
*/
this.element = document.createElement('DIV');
this.element.className = options.className !== undefined ?
options.className : 'ol-overlay-container ' + _ol_css_.CLASS_SELECTABLE;
options.className : 'ol-overlay-container ' + CLASS_SELECTABLE;
this.element.style.position = 'absolute';
/**

5
src/ol/control/Attribution.js
View File

@@ -4,7 +4,7 @@
import {inherits} from '../index.js';
import _ol_array_ from '../array.js';
import Control from '../control/Control.js';
import _ol_css_ from '../css.js';
import {CLASS_CONTROL, CLASS_UNSELECTABLE} from '../css.js';
import {removeChildren, replaceNode} from '../dom.js';
import _ol_events_ from '../events.js';
import EventType from '../events/EventType.js';
@@ -89,8 +89,7 @@ var Attribution = function(opt_options) {
_ol_events_.listen(button, EventType.CLICK, this.handleClick_, this);
var cssClasses = className + ' ' + _ol_css_.CLASS_UNSELECTABLE + ' ' +
_ol_css_.CLASS_CONTROL +
var cssClasses = className + ' ' + CLASS_UNSELECTABLE + ' ' + CLASS_CONTROL +
(this.collapsed_ && this.collapsible_ ? ' ol-collapsed' : '') +
(this.collapsible_ ? '' : ' ol-uncollapsible');
var element = document.createElement('div');

8
src/ol/control/FullScreen.js
View File

@@ -3,7 +3,7 @@
*/
import {inherits} from '../index.js';
import Control from '../control/Control.js';
import _ol_css_ from '../css.js';
import {CLASS_CONTROL, CLASS_UNSELECTABLE, CLASS_UNSUPPORTED} from '../css.js';
import {replaceNode} from '../dom.js';
import _ol_events_ from '../events.js';
import EventType from '../events/EventType.js';
@@ -64,9 +64,9 @@ var FullScreen = function(opt_options) {
_ol_events_.listen(button, EventType.CLICK,
this.handleClick_, this);
var cssClasses = this.cssClassName_ + ' ' + _ol_css_.CLASS_UNSELECTABLE +
' ' + _ol_css_.CLASS_CONTROL + ' ' +
(!FullScreen.isFullScreenSupported() ? _ol_css_.CLASS_UNSUPPORTED : '');
var cssClasses = this.cssClassName_ + ' ' + CLASS_UNSELECTABLE +
' ' + CLASS_CONTROL + ' ' +
(!FullScreen.isFullScreenSupported() ? CLASS_UNSUPPORTED : '');
var element = document.createElement('div');
element.className = cssClasses;
element.appendChild(button);

5
src/ol/control/OverviewMap.js
View File

@@ -13,7 +13,7 @@ import OverlayPositioning from '../OverlayPositioning.js';
import _ol_ViewProperty_ from '../ViewProperty.js';
import Control from '../control/Control.js';
import _ol_coordinate_ from '../coordinate.js';
import _ol_css_ from '../css.js';
import {CLASS_CONTROL, CLASS_UNSELECTABLE} from '../css.js';
import {replaceNode} from '../dom.js';
import _ol_events_ from '../events.js';
import EventType from '../events/EventType.js';
@@ -147,8 +147,7 @@ var OverviewMap = function(opt_options) {
});
this.ovmap_.addOverlay(this.boxOverlay_);
var cssClasses = className + ' ' + _ol_css_.CLASS_UNSELECTABLE + ' ' +
_ol_css_.CLASS_CONTROL +
var cssClasses = className + ' ' + CLASS_UNSELECTABLE + ' ' + CLASS_CONTROL +
(this.collapsed_ && this.collapsible_ ? ' ol-collapsed' : '') +
(this.collapsible_ ? '' : ' ol-uncollapsible');
var element = document.createElement('div');

13
src/ol/control/Rotate.js
View File

@@ -3,7 +3,7 @@
*/
import Control from '../control/Control.js';
import _ol_css_ from '../css.js';
import {CLASS_CONTROL, CLASS_HIDDEN, CLASS_UNSELECTABLE} from '../css.js';
import {easeOut} from '../easing.js';
import _ol_events_ from '../events.js';
import EventType from '../events/EventType.js';
@@ -54,8 +54,7 @@ var Rotate = function(opt_options) {
_ol_events_.listen(button, EventType.CLICK,
Rotate.prototype.handleClick_, this);
var cssClasses = className + ' ' + _ol_css_.CLASS_UNSELECTABLE + ' ' +
_ol_css_.CLASS_CONTROL;
var cssClasses = className + ' ' + CLASS_UNSELECTABLE + ' ' + CLASS_CONTROL;
var element = document.createElement('div');
element.className = cssClasses;
element.appendChild(button);
@@ -89,7 +88,7 @@ var Rotate = function(opt_options) {
this.rotation_ = undefined;
if (this.autoHide_) {
this.element.classList.add(_ol_css_.CLASS_HIDDEN);
this.element.classList.add(CLASS_HIDDEN);
}
};
@@ -151,11 +150,11 @@ Rotate.render = function(mapEvent) {
if (rotation != this.rotation_) {
var transform = 'rotate(' + rotation + 'rad)';
if (this.autoHide_) {
var contains = this.element.classList.contains(_ol_css_.CLASS_HIDDEN);
var contains = this.element.classList.contains(CLASS_HIDDEN);
if (!contains && rotation === 0) {
this.element.classList.add(_ol_css_.CLASS_HIDDEN);
this.element.classList.add(CLASS_HIDDEN);
} else if (contains && rotation !== 0) {
this.element.classList.remove(_ol_css_.CLASS_HIDDEN);
this.element.classList.remove(CLASS_HIDDEN);
}
}
this.label_.style.msTransform = transform;

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

@@ -6,7 +6,7 @@ import _ol_Object_ from '../Object.js';
import {assert} from '../asserts.js';
import Control from '../control/Control.js';
import ScaleLineUnits from '../control/ScaleLineUnits.js';
import _ol_css_ from '../css.js';
import {CLASS_UNSELECTABLE} from '../css.js';
import _ol_events_ from '../events.js';
import {getPointResolution, METERS_PER_UNIT} from '../proj.js';
import _ol_proj_Units_ from '../proj/Units.js';
@@ -44,7 +44,7 @@ var ScaleLine = function(opt_options) {
* @type {Element}
*/
this.element_ = document.createElement('DIV');
this.element_.className = className + ' ' + _ol_css_.CLASS_UNSELECTABLE;
this.element_.className = className + ' ' + CLASS_UNSELECTABLE;
this.element_.appendChild(this.innerElement_);
/**

5
src/ol/control/Zoom.js
View File

@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
import _ol_events_ from '../events.js';
import EventType from '../events/EventType.js';
import Control from '../control/Control.js';
import _ol_css_ from '../css.js';
import {CLASS_CONTROL, CLASS_UNSELECTABLE} from '../css.js';
import {easeOut} from '../easing.js';
/**
@@ -57,8 +57,7 @@ var Zoom = function(opt_options) {
_ol_events_.listen(outElement, EventType.CLICK,
Zoom.prototype.handleClick_.bind(this, -delta));
var cssClasses = className + ' ' + _ol_css_.CLASS_UNSELECTABLE + ' ' +
_ol_css_.CLASS_CONTROL;
var cssClasses = className + ' ' + CLASS_UNSELECTABLE + ' ' + CLASS_CONTROL;
var element = document.createElement('div');
element.className = cssClasses;
element.appendChild(inElement);

6
src/ol/control/ZoomSlider.js
View File

@@ -6,7 +6,7 @@
import {inherits} from '../index.js';
import _ol_ViewHint_ from '../ViewHint.js';
import Control from '../control/Control.js';
import _ol_css_ from '../css.js';
import {CLASS_CONTROL, CLASS_UNSELECTABLE} from '../css.js';
import {easeOut} from '../easing.js';
import _ol_events_ from '../events.js';
import Event from '../events/Event.js';
@@ -103,9 +103,9 @@ var ZoomSlider = function(opt_options) {
var className = options.className !== undefined ? options.className : 'ol-zoomslider';
var thumbElement = document.createElement('button');
thumbElement.setAttribute('type', 'button');
thumbElement.className = className + '-thumb ' + _ol_css_.CLASS_UNSELECTABLE;
thumbElement.className = className + '-thumb ' + CLASS_UNSELECTABLE;
var containerElement = document.createElement('div');
containerElement.className = className + ' ' + _ol_css_.CLASS_UNSELECTABLE + ' ' + _ol_css_.CLASS_CONTROL;
containerElement.className = className + ' ' + CLASS_UNSELECTABLE + ' ' + CLASS_CONTROL;
containerElement.appendChild(thumbElement);
/**
* @type {ol.pointer.PointerEventHandler}

5
src/ol/control/ZoomToExtent.js
View File

@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
import _ol_events_ from '../events.js';
import EventType from '../events/EventType.js';
import Control from '../control/Control.js';
import _ol_css_ from '../css.js';
import {CLASS_CONTROL, CLASS_UNSELECTABLE} from '../css.js';
/**
* @classdesc
@@ -42,8 +42,7 @@ var ZoomToExtent = function(opt_options) {
_ol_events_.listen(button, EventType.CLICK,
this.handleClick_, this);
var cssClasses = className + ' ' + _ol_css_.CLASS_UNSELECTABLE + ' ' +
_ol_css_.CLASS_CONTROL;
var cssClasses = className + ' ' + CLASS_UNSELECTABLE + ' ' + CLASS_CONTROL;
var element = document.createElement('div');
element.className = cssClasses;
element.appendChild(button);

15
src/ol/css.js
View File

@@ -1,7 +1,6 @@
/**
* @module ol/css
*/
var _ol_css_ = {};
/**
@@ -10,7 +9,7 @@ var _ol_css_ = {};
* @const
* @type {string}
*/
_ol_css_.CLASS_HIDDEN = 'ol-hidden';
export var CLASS_HIDDEN = 'ol-hidden';
/**
@@ -19,7 +18,8 @@ _ol_css_.CLASS_HIDDEN = 'ol-hidden';
* @const
* @type {string}
*/
_ol_css_.CLASS_SELECTABLE = 'ol-selectable';
export var CLASS_SELECTABLE = 'ol-selectable';
/**
* The CSS class that we'll give the DOM elements to have them unselectable.
@@ -27,7 +27,7 @@ _ol_css_.CLASS_SELECTABLE = 'ol-selectable';
* @const
* @type {string}
*/
_ol_css_.CLASS_UNSELECTABLE = 'ol-unselectable';
export var CLASS_UNSELECTABLE = 'ol-unselectable';
/**
@@ -36,7 +36,7 @@ _ol_css_.CLASS_UNSELECTABLE = 'ol-unselectable';
* @const
* @type {string}
*/
_ol_css_.CLASS_UNSUPPORTED = 'ol-unsupported';
export var CLASS_UNSUPPORTED = 'ol-unsupported';
/**
@@ -45,7 +45,7 @@ _ol_css_.CLASS_UNSUPPORTED = 'ol-unsupported';
* @const
* @type {string}
*/
_ol_css_.CLASS_CONTROL = 'ol-control';
export var CLASS_CONTROL = 'ol-control';
/**
@@ -54,7 +54,7 @@ _ol_css_.CLASS_CONTROL = 'ol-control';
* @param {string} The CSS font property.
* @return {Object.<string>} The font families (or null if the input spec is invalid).
*/
_ol_css_.getFontFamilies = (function() {
export var getFontFamilies = (function() {
var style;
var cache = {};
return function(font) {
@@ -73,4 +73,3 @@ _ol_css_.getFontFamilies = (function() {
return cache[font];
};
})();
export default _ol_css_;

4
src/ol/render/canvas.js
View File

@@ -1,7 +1,7 @@
/**
* @module ol/render/canvas
*/
import _ol_css_ from '../css.js';
import {getFontFamilies} from '../css.js';
import {createCanvasContext2D} from '../dom.js';
import _ol_obj_ from '../obj.js';
import LRUCache from '../structs/LRUCache.js';
@@ -168,7 +168,7 @@ _ol_render_canvas_.checkFont = (function() {
}
return function(fontSpec) {
var fontFamilies = _ol_css_.getFontFamilies(fontSpec);
var fontFamilies = getFontFamilies(fontSpec);
if (!fontFamilies) {
return;
}

4
src/ol/renderer/canvas/Map.js
View File

@@ -6,7 +6,7 @@
import _ol_transform_ from '../../transform.js';
import {inherits} from '../../index.js';
import _ol_array_ from '../../array.js';
import _ol_css_ from '../../css.js';
import {CLASS_UNSELECTABLE} from '../../css.js';
import {createCanvasContext2D} from '../../dom.js';
import _ol_layer_Layer_ from '../../layer/Layer.js';
import _ol_render_Event_ from '../../render/Event.js';
@@ -43,7 +43,7 @@ var _ol_renderer_canvas_Map_ = function(container, map) {
this.canvas_.style.width = '100%';
this.canvas_.style.height = '100%';
this.canvas_.style.display = 'block';
this.canvas_.className = _ol_css_.CLASS_UNSELECTABLE;
this.canvas_.className = CLASS_UNSELECTABLE;
container.insertBefore(this.canvas_, container.childNodes[0] || null);
/**

4
src/ol/renderer/webgl/Map.js
View File

@@ -4,7 +4,7 @@
import {inherits} from '../../index.js';
import _ol_array_ from '../../array.js';
import _ol_css_ from '../../css.js';
import {CLASS_UNSELECTABLE} from '../../css.js';
import {createCanvasContext2D} from '../../dom.js';
import _ol_events_ from '../../events.js';
import _ol_has_ from '../../has.js';
@@ -47,7 +47,7 @@ var _ol_renderer_webgl_Map_ = function(container, map) {
this.canvas_.style.width = '100%';
this.canvas_.style.height = '100%';
this.canvas_.style.display = 'block';
this.canvas_.className = _ol_css_.CLASS_UNSELECTABLE;
this.canvas_.className = CLASS_UNSELECTABLE;
container.insertBefore(this.canvas_, container.childNodes[0] || null);
/**

4
test/spec/ol/css.test.js
View File

@@ -1,4 +1,4 @@
import _ol_css_ from '../../../src/ol/css.js';
import {getFontFamilies} from '../../../src/ol/css.js';
describe('ol.css', function() {
@@ -25,7 +25,7 @@ describe('ol.css', function() {
cases.forEach(function(c, i) {
it('works for ' + c.font, function() {
var families = _ol_css_.getFontFamilies(c.font);
var families = getFontFamilies(c.font);
if (c.families === null) {
expect(families).to.be(null);
return;