From ce8d805201dc8c866b780276ea367ac21a8cba77 Mon Sep 17 00:00:00 2001
From: Tim Schaub <tim.schaub@gmail.com>
Date: Thu, 20 Mar 2014 08:18:06 -0600
Subject: [PATCH] Rename loadingFunction to loader

---
 examples/vector-osm.js              | 2 +-
 src/objectliterals.jsdoc            | 2 +-
 src/ol/source/servervectorsource.js | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/vector-osm.js b/examples/vector-osm.js
index d0c69abc5c..8b5bcf90f4 100644
--- a/examples/vector-osm.js
+++ b/examples/vector-osm.js
@@ -89,7 +89,7 @@ var styles = {
 
 var vectorSource = new ol.source.ServerVector({
   format: new ol.format.OSMXML(),
-  loadingFunction: function(extent, resolution, projection) {
+  loader: function(extent, resolution, projection) {
     var transform = ol.proj.getTransform(projection, 'EPSG:4326');
     var epsg4326Extent = transform(extent, []);
     var url = 'http://overpass-api.de/api/xapi?map?bbox=' +
diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc
index cf1995025b..c9e90714e7 100644
--- a/src/objectliterals.jsdoc
+++ b/src/objectliterals.jsdoc
@@ -909,7 +909,7 @@
  * @property {Array.<ol.Attribution>|undefined} attributions Attributions.
  * @property {ol.Extent|undefined} extent Extent.
  * @property {ol.format.Feature} format Format.
- * @property {function(this: ol.source.ServerVector, ol.Extent, number, ol.proj.Projection)} loadingFunction Loading function.
+ * @property {function(this: ol.source.ServerVector, ol.Extent, number, ol.proj.Projection)} loader Loading function.
  * @property {function(ol.Extent, number): Array.<ol.Extent>|undefined} loadingStrategy Loading strategy.  Default is `ol.loadingstrategy.bbox`.
  * @property {string|undefined} logo Logo.
  * @property {ol.proj.ProjectionLike} projection Projection.
diff --git a/src/ol/source/servervectorsource.js b/src/ol/source/servervectorsource.js
index e804659b06..34f8752bf4 100644
--- a/src/ol/source/servervectorsource.js
+++ b/src/ol/source/servervectorsource.js
@@ -35,7 +35,7 @@ ol.source.ServerVector = function(options) {
    * @type {function(this: ol.source.ServerVector, ol.Extent, number,
    *                 ol.proj.Projection): string}
    */
-  this.loadingFunction_ = options.loadingFunction;
+  this.loader_ = options.loader;
 
   /**
    * @private
@@ -92,7 +92,7 @@ ol.source.ServerVector.prototype.loadFeatures =
           return ol.extent.containsExtent(object.extent, extentToLoad);
         });
     if (!alreadyLoaded) {
-      this.loadingFunction_.call(this, extentToLoad, resolution, projection);
+      this.loader_.call(this, extentToLoad, resolution, projection);
       loadedExtents.insert(extentToLoad, {extent: extentToLoad.slice()});
     }
   }