Rename currentFillColor to currentFillStyle

This commit is contained in:
Éric Lemoine
2013-11-21 16:03:11 +01:00
parent d3ad1a7506
commit 2a122f057c
+4 -4
View File
@@ -605,7 +605,7 @@ ol.render.canvas.PolygonReplay = function() {
/** /**
* @private * @private
* @type {{currentFillColor: (string|undefined), * @type {{currentFillStyle: (string|undefined),
* currentStrokeStyle: (string|undefined), * currentStrokeStyle: (string|undefined),
* currentLineWidth: (number|undefined), * currentLineWidth: (number|undefined),
* fillStyle: (string|undefined), * fillStyle: (string|undefined),
@@ -613,7 +613,7 @@ ol.render.canvas.PolygonReplay = function() {
* lineWidth: (number|undefined)}|null} * lineWidth: (number|undefined)}|null}
*/ */
this.state_ = { this.state_ = {
currentFillColor: undefined, currentFillStyle: undefined,
currentStrokeStyle: undefined, currentStrokeStyle: undefined,
currentLineWidth: undefined, currentLineWidth: undefined,
fillStyle: undefined, fillStyle: undefined,
@@ -754,10 +754,10 @@ ol.render.canvas.PolygonReplay.prototype.setFillStrokeStyles_ = function() {
var fillStyle = state.fillStyle; var fillStyle = state.fillStyle;
var strokeStyle = state.strokeStyle; var strokeStyle = state.strokeStyle;
var lineWidth = state.lineWidth; var lineWidth = state.lineWidth;
if (goog.isDef(fillStyle) && state.currentFillColor != fillStyle) { if (goog.isDef(fillStyle) && state.currentFillStyle != fillStyle) {
this.instructions.push( this.instructions.push(
[ol.render.canvas.Instruction.SET_FILL_STYLE, fillStyle]); [ol.render.canvas.Instruction.SET_FILL_STYLE, fillStyle]);
state.currentFillColor = state.fillStyle; state.currentFillStyle = state.fillStyle;
} }
if (goog.isDef(strokeStyle)) { if (goog.isDef(strokeStyle)) {
goog.asserts.assert(goog.isDef(lineWidth)); goog.asserts.assert(goog.isDef(lineWidth));