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

Using a renderIntent lib function instead of this identifier

Browse Source 
A 'this' identifier is quite useless with compressed JavaScript,
and in fact it turned out to fail in advanced mode when trying
to access a feature's renderIntent property with it. The added
renderIntent lib function as a Call expression does the job
well.
This commit is contained in:
ahocevar
2013-08-28 18:00:09 +02:00
parent 526dbebadc
commit 0fbf07fef1
7 changed files with 32 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
test/spec/ol/expr/expression.test.js
View File

@@ -92,12 +92,6 @@ describe('ol.expr.parse()', function() {
expect(expr.evaluate(scope)).to.be(42);
});
it('parses member expressions in the \'this\' scope', function() {
var expr = ol.expr.parse('this.foo');
var thisScope = {foo: 'bar'};
expect(expr.evaluate(undefined, undefined, thisScope)).to.be('bar');
});
it('consumes whitespace as expected', function() {
var expr = ol.expr.parse(' foo . bar . baz ');
expect(expr).to.be.a(ol.expr.Member);
@@ -878,6 +872,24 @@ describe('ol.expr.lib', function() {
});
describe('renderIntent()', function() {
var feature = new ol.Feature();
feature.renderIntent = 'foo';
var isFoo = parse('renderIntent("foo")');
var isBar = parse('renderIntent("bar")');
it('True when renderIntent matches', function() {
expect(evaluate(isFoo, feature), true);
});
it('False when renderIntent does not match', function() {
expect(evaluate(isBar, feature), false);
});
});
});
describe('ol.expr.register()', function() {

20
test/spec/ol/expr/expressions.test.js
View File

@@ -624,25 +624,6 @@ describe('ol.expr.Not', function() {
});
describe('ol.expr.ThisIdentifier', function() {
describe('#getInstance()', function() {
it('has a getInstance method to return the singleton', function() {
expect(ol.expr.ThisIdentifier.getInstance())
.to.be.a(ol.expr.ThisIdentifier);
});
});
describe('#evaluate()', function() {
it('evaluates to the passed scope', function() {
expect(ol.expr.ThisIdentifier.getInstance()
.evaluate(undefined, undefined, 'foo')).to.be('foo');
});
});
});
goog.require('ol.expr.Call');
goog.require('ol.expr.Comparison');
goog.require('ol.expr.ComparisonOp');
@@ -655,4 +636,3 @@ goog.require('ol.expr.Math');
goog.require('ol.expr.MathOp');
goog.require('ol.expr.Member');
goog.require('ol.expr.Not');
goog.require('ol.expr.ThisIdentifier');