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

Merge branch 'vector' of github.com:openlayers/ol3 into vector

Browse Source 
Conflicts:
	src/ol/style/shape.js
This commit is contained in:
Tim Schaub
2013-03-06 02:28:33 +01:00
parent ac10bb6ca5 ab19d255c7
commit 060edb2070
5 changed files with 308 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/style/shape.js
View File

@@ -43,11 +43,11 @@ ol.style.ShapeLiteral = function(config) {
/** @type {number} */
this.size = config.size;
/** @type {string|undefined} */
this.fillStyle = config.fillStyle;
if (goog.isDef(config.fillStyle)) {
goog.asserts.assertString(config.fillStyle, 'fillStyle must be a string');
}
/** @type {string|undefined} */
this.fillStyle = config.fillStyle;
/** @type {string|undefined} */
this.strokeStyle = config.strokeStyle;