Rename _ol_style_Stroke_ to Stroke

This commit is contained in:
Tim Schaub
2018-01-11 13:24:13 -07:00
parent dc6ae2293d
commit f4484455aa
75 changed files with 333 additions and 333 deletions
+12 -12
View File
@@ -1,7 +1,7 @@
import AtlasManager from '../../../../src/ol/style/AtlasManager.js';
import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js';
import Fill from '../../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../src/ol/style/Stroke.js';
describe('ol.style.Circle', function() {
@@ -88,7 +88,7 @@ describe('ol.style.Circle', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
}),
radius: 5,
@@ -110,7 +110,7 @@ describe('ol.style.Circle', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});
@@ -161,7 +161,7 @@ describe('ol.style.Circle', function() {
});
var style2 = new _ol_style_Circle_({
radius: 5,
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});
@@ -174,7 +174,7 @@ describe('ol.style.Circle', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3',
lineCap: 'round',
lineDash: [5, 15, 25],
@@ -188,7 +188,7 @@ describe('ol.style.Circle', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3',
lineCap: 'round',
lineDash: [5, 15, 25],
@@ -206,7 +206,7 @@ describe('ol.style.Circle', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3',
lineCap: 'round',
lineDash: [5, 15, 25],
@@ -220,7 +220,7 @@ describe('ol.style.Circle', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3',
lineCap: 'round',
lineDash: [5, 15, 25],
@@ -238,7 +238,7 @@ describe('ol.style.Circle', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});
@@ -247,7 +247,7 @@ describe('ol.style.Circle', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});
@@ -263,7 +263,7 @@ describe('ol.style.Circle', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});
@@ -272,7 +272,7 @@ describe('ol.style.Circle', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});
+12 -12
View File
@@ -1,7 +1,7 @@
import AtlasManager from '../../../../src/ol/style/AtlasManager.js';
import _ol_style_RegularShape_ from '../../../../src/ol/style/RegularShape.js';
import Fill from '../../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../src/ol/style/Stroke.js';
describe('ol.style.RegularShape', function() {
@@ -122,7 +122,7 @@ describe('ol.style.RegularShape', function() {
radius2: 6,
angle: 1,
snapToPixel: false,
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
}),
rotation: 2,
@@ -149,7 +149,7 @@ describe('ol.style.RegularShape', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});
@@ -210,7 +210,7 @@ describe('ol.style.RegularShape', function() {
});
var style2 = new _ol_style_RegularShape_({
radius: 5,
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});
@@ -226,7 +226,7 @@ describe('ol.style.RegularShape', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3',
lineCap: 'round',
lineDash: [5, 15, 25],
@@ -243,7 +243,7 @@ describe('ol.style.RegularShape', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3',
lineCap: 'round',
lineDash: [5, 15, 25],
@@ -264,7 +264,7 @@ describe('ol.style.RegularShape', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3',
lineCap: 'round',
lineDash: [5, 15, 25],
@@ -281,7 +281,7 @@ describe('ol.style.RegularShape', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3',
lineCap: 'round',
lineDash: [5, 15, 25],
@@ -299,7 +299,7 @@ describe('ol.style.RegularShape', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});
@@ -308,7 +308,7 @@ describe('ol.style.RegularShape', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});
@@ -324,7 +324,7 @@ describe('ol.style.RegularShape', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});
@@ -333,7 +333,7 @@ describe('ol.style.RegularShape', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});
+5 -5
View File
@@ -1,18 +1,18 @@
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../src/ol/style/Stroke.js';
describe('ol.style.Stroke', function() {
describe('#clone', function() {
it('creates a new ol.style.Stroke', function() {
var original = new _ol_style_Stroke_();
var original = new Stroke();
var clone = original.clone();
expect(clone).to.be.an(_ol_style_Stroke_);
expect(clone).to.be.an(Stroke);
expect(clone).to.not.be(original);
});
it('copies all values', function() {
var original = new _ol_style_Stroke_({
var original = new Stroke({
color: '#319FD3',
lineCap: 'square',
lineJoin: 'miter',
@@ -32,7 +32,7 @@ describe('ol.style.Stroke', function() {
});
it('the clone does not reference the same objects as the original', function() {
var original = new _ol_style_Stroke_({
var original = new Stroke({
color: [1, 2, 3, 0.4],
lineDash: [1, 2, 3]
});
+5 -5
View File
@@ -3,7 +3,7 @@ import Point from '../../../../src/ol/geom/Point.js';
import Style from '../../../../src/ol/style/Style.js';
import Fill from '../../../../src/ol/style/Fill.js';
import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../src/ol/style/Stroke.js';
import _ol_style_Text_ from '../../../../src/ol/style/Text.js';
@@ -13,7 +13,7 @@ describe('ol.style.Style', function() {
color: 'rgba(255, 255, 255, 0.6)'
});
var testStroke = new _ol_style_Stroke_({
var testStroke = new Stroke({
color: '#319FD3',
width: 1
});
@@ -23,7 +23,7 @@ describe('ol.style.Style', function() {
fill: new Fill({
color: '#000'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#fff',
width: 3
})
@@ -51,7 +51,7 @@ describe('ol.style.Style', function() {
image: new _ol_style_Circle_({
radius: 5
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
}),
text: new _ol_style_Text_({
@@ -77,7 +77,7 @@ describe('ol.style.Style', function() {
image: new _ol_style_Circle_({
radius: 5
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
}),
text: new _ol_style_Text_({
+4 -4
View File
@@ -1,5 +1,5 @@
import Fill from '../../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../src/ol/style/Stroke.js';
import _ol_style_Text_ from '../../../../src/ol/style/Text.js';
@@ -50,13 +50,13 @@ describe('ol.style.Text', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
}),
backgroundFill: new Fill({
color: 'white'
}),
backgroundStroke: new _ol_style_Stroke_({
backgroundStroke: new Stroke({
color: 'black'
})
});
@@ -81,7 +81,7 @@ describe('ol.style.Text', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});