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

Remove use of goog.isString()

Browse Source
This commit is contained in:
Marc Jansen
2016-02-05 15:12:00 +01:00
parent 057633c2c4
commit efa82dccf9
20 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ol/color/color.js
View File

@@ -106,7 +106,7 @@ ol.color.asArray = function(color) {
if (goog.isArray(color)) {
return color;
} else {
goog.asserts.assert(goog.isString(color), 'Color should be a string');
goog.asserts.assert(typeof color === 'string', 'Color should be a string');
return ol.color.fromString(color);
}
};
@@ -119,7 +119,7 @@ ol.color.asArray = function(color) {
* @api
*/
ol.color.asString = function(color) {
if (goog.isString(color)) {
if (typeof color === 'string') {
return color;
} else {
goog.asserts.assert(goog.isArray(color), 'Color should be an array');
@@ -322,10 +322,10 @@ ol.color.stringOrColorEquals = function(color1, color2) {
if (color1 === color2 || color1 == color2) {
return true;
}
if (goog.isString(color1)) {
if (typeof color1 === 'string') {
color1 = ol.color.fromString(color1);
}
if (goog.isString(color2)) {
if (typeof color2 === 'string') {
color2 = ol.color.fromString(color2);
}
return ol.color.equals(color1, color2);