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

Remove goog.isDef from attributioncontrol.js (-33 B)

Browse Source
This commit is contained in:
Tim Schaub
2015-09-18 16:24:33 +09:00
parent 4c0d857f41
commit 007194a18f
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ goog.require('goog.events');
goog.require('goog.events.EventType'); goog.require('goog.events.EventType');
goog.require('goog.object'); goog.require('goog.object');
goog.require('goog.style'); goog.require('goog.style');
goog.require('ol');
goog.require('ol.Attribution'); goog.require('ol.Attribution');
goog.require('ol.control.Control'); goog.require('ol.control.Control');
goog.require('ol.css'); goog.require('ol.css');
@@ -31,7 +32,7 @@ goog.require('ol.source.Tile');
*/ */
ol.control.Attribution = function(opt_options) { ol.control.Attribution = function(opt_options) {
var options = goog.isDef(opt_options) ? opt_options : {}; var options = opt_options ? opt_options : {};
/** /**
* @private * @private
@@ -52,27 +53,25 @@ ol.control.Attribution = function(opt_options) {
* @private * @private
* @type {boolean} * @type {boolean}
*/ */
this.collapsed_ = goog.isDef(options.collapsed) ? options.collapsed : true; this.collapsed_ = ol.isDef(options.collapsed) ?
/** @type {boolean} */ (options.collapsed) : true;
/** /**
* @private * @private
* @type {boolean} * @type {boolean}
*/ */
this.collapsible_ = goog.isDef(options.collapsible) ? this.collapsible_ = ol.isDef(options.collapsible) ?
options.collapsible : true; /** @type {boolean} */ (options.collapsible) : true;
if (!this.collapsible_) { if (!this.collapsible_) {
this.collapsed_ = false; this.collapsed_ = false;
} }
var className = goog.isDef(options.className) ? var className = options.className ? options.className : 'ol-attribution';
options.className : 'ol-attribution';
var tipLabel = goog.isDef(options.tipLabel) ? var tipLabel = options.tipLabel ? options.tipLabel : 'Attributions';
options.tipLabel : 'Attributions';
var collapseLabel = goog.isDef(options.collapseLabel) ? var collapseLabel = options.collapseLabel ? options.collapseLabel : '\u00BB';
options.collapseLabel : '\u00BB';
/** /**
* @private * @private
@@ -82,7 +81,7 @@ ol.control.Attribution = function(opt_options) {
goog.dom.createDom(goog.dom.TagName.SPAN, {}, collapseLabel) : goog.dom.createDom(goog.dom.TagName.SPAN, {}, collapseLabel) :
collapseLabel); collapseLabel);
var label = goog.isDef(options.label) ? options.label : 'i'; var label = options.label ? options.label : 'i';
/** /**
* @private * @private
@@ -116,8 +115,7 @@ ol.control.Attribution = function(opt_options) {
var element = goog.dom.createDom(goog.dom.TagName.DIV, var element = goog.dom.createDom(goog.dom.TagName.DIV,
cssClasses, this.ulElement_, button); cssClasses, this.ulElement_, button);
var render = goog.isDef(options.render) ? var render = options.render ? options.render : ol.control.Attribution.render;
options.render : ol.control.Attribution.render;
goog.base(this, { goog.base(this, {
element: element, element: element,
@@ -185,7 +183,7 @@ ol.control.Attribution.prototype.getSourceAttributions = function(frameState) {
continue; continue;
} }
tileRanges = frameState.usedTiles[sourceKey]; tileRanges = frameState.usedTiles[sourceKey];
if (goog.isDef(tileRanges)) { if (tileRanges) {
goog.asserts.assertInstanceof(source, ol.source.Tile, goog.asserts.assertInstanceof(source, ol.source.Tile,
'source should be an ol.source.Tile'); 'source should be an ol.source.Tile');
var tileGrid = source.getTileGridForProjection(projection); var tileGrid = source.getTileGridForProjection(projection);