From ed34caa25aa1f84873aa98a53885a332d6a4127e Mon Sep 17 00:00:00 2001 From: Peter Robins Date: Sat, 7 May 2016 19:03:02 +0000 Subject: [PATCH] Fix ogc/filter This only compiles if there is goog.provide('ol.Extent') in the typedefs file, and goog.require('ol.Extent') in this file. An alternative is to add an assert statement, but this means an extra dependency. With this change there is no longer a need for the change to tasks/build.js --- src/ol/format/ogc/filter.js | 1 + src/ol/typedefs.js | 1 + tasks/build.js | 3 --- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/ol/format/ogc/filter.js b/src/ol/format/ogc/filter.js index 0af819fc19..c4c5422f13 100644 --- a/src/ol/format/ogc/filter.js +++ b/src/ol/format/ogc/filter.js @@ -18,6 +18,7 @@ goog.provide('ol.format.ogc.filter.IsNull'); goog.provide('ol.format.ogc.filter.IsBetween'); goog.provide('ol.format.ogc.filter.IsLike'); +goog.require('ol.Extent'); goog.require('ol.Object'); diff --git a/src/ol/typedefs.js b/src/ol/typedefs.js index 50d2e24bf5..38863528d9 100644 --- a/src/ol/typedefs.js +++ b/src/ol/typedefs.js @@ -2,6 +2,7 @@ * File for all top-level (in the `ol` namespace) typedefs used by the compiler, * and referenced by JSDoc. */ +goog.provide('ol.Extent'); /** diff --git a/tasks/build.js b/tasks/build.js index 8573ac5b30..445d780589 100644 --- a/tasks/build.js +++ b/tasks/build.js @@ -207,9 +207,6 @@ function build(config, paths, callback) { } else { log.info('ol', 'Compiling ' + paths.length + ' sources'); options.compile.js = paths.concat(options.compile.js || []); - // typedefs file has no `goog.provide`s, so is ignored by closure-util - // when calculating dependencies. So it's added here as a compiler option. - options.compile.js.push('src/ol/typedefs.js'); closure.compile(options, callback); } }