[OpenLayers-Commits] r12262 - in sandbox/mpriour/temporal_map/openlayers: examples lib/OpenLayers/Filter lib/OpenLayers/Format/WFSCapabilities lib/OpenLayers/Tile

[commits-20090109 at openlayers.org]

Author: mpriour
Date: 2011-08-18 08:51:45 -0700 (Thu, 18 Aug 2011)
New Revision: 12262

Modified:
   sandbox/mpriour/temporal_map/openlayers/examples/arcgiscache_jsonp.html
   sandbox/mpriour/temporal_map/openlayers/lib/OpenLayers/Filter/FeatureId.js
   sandbox/mpriour/temporal_map/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1_0_0.js
   sandbox/mpriour/temporal_map/openlayers/lib/OpenLayers/Tile/BackBufferable.js
Log:
Merge with Trunk

Modified: sandbox/mpriour/temporal_map/openlayers/examples/arcgiscache_jsonp.html
===================================================================
--- sandbox/mpriour/temporal_map/openlayers/examples/arcgiscache_jsonp.html	2011-08-18 14:16:44 UTC (rev 12261)
+++ sandbox/mpriour/temporal_map/openlayers/examples/arcgiscache_jsonp.html	2011-08-18 15:51:45 UTC (rev 12262)
@@ -7,20 +7,17 @@
     <link rel="stylesheet" href="style.css" type="text/css">
 
     <script src="../lib/OpenLayers.js"></script>
-    <script src="../lib/OpenLayers/Layer/ArcGISCache.js" type="text/javascript"></script>
     
-    <!-- This is to simplify making the JSONP request for this example -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
-    
     <script type="text/javascript">
         var map,
             layerURL = "http://services.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer";
         
         function init() {
-            var jsonp_url = layerURL + '?f=json&pretty=true&callback=?';
-            $.getJSON(jsonp_url, function(data) {                
-                initMap(data);
-            });
+            var jsonp = new OpenLayers.Protocol.Script();
+            jsonp.createRequest(layerURL, {
+                f: 'json', 
+                pretty: 'true'
+            }, initMap);
         }
 
         function initMap(layerInfo){
@@ -93,7 +90,7 @@
         <p>
         This method automatically configures the layer using the capabilities object 
         generated by the server itself.  This page shows how to construct the url for the server capabilities object,
-        retrieve it using JSONP (and jQuery), and pass it in during construction.  Note that in this case, 
+        retrieve it using JSONP, and pass it in during construction.  Note that in this case, 
         the layer is constructed before the map.  This approach greatly simplifies the
         configuration of your map, and works best when all your tiles / overlays are similarly laid out.
         If you are using a live AGS map server for your layer, it can be helpful to check your

Modified: sandbox/mpriour/temporal_map/openlayers/lib/OpenLayers/Filter/FeatureId.js
===================================================================
--- sandbox/mpriour/temporal_map/openlayers/lib/OpenLayers/Filter/FeatureId.js	2011-08-18 14:16:44 UTC (rev 12261)
+++ sandbox/mpriour/temporal_map/openlayers/lib/OpenLayers/Filter/FeatureId.js	2011-08-18 15:51:45 UTC (rev 12262)
@@ -20,8 +20,8 @@
 
     /** 
      * APIProperty: fids
-     * {Array(String)} Feature Ids to evaluate this rule against. To be passed
-     * To be passed inside the params object.
+     * {Array(String)} Feature Ids to evaluate this rule against. 
+     *     To be passed inside the params object.
      */
     fids: null,
     

Modified: sandbox/mpriour/temporal_map/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1_0_0.js
===================================================================
--- sandbox/mpriour/temporal_map/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1_0_0.js	2011-08-18 14:16:44 UTC (rev 12261)
+++ sandbox/mpriour/temporal_map/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1_0_0.js	2011-08-18 15:51:45 UTC (rev 12262)
@@ -12,7 +12,7 @@
  * Read WFS Capabilities version 1.0.0.
  * 
  * Inherits from:
- *  - <OpenLayers.Format.WFSCapabilities>
+ *  - <OpenLayers.Format.WFSCapabilities.v1>
  */
 OpenLayers.Format.WFSCapabilities.v1_0_0 = OpenLayers.Class(
     OpenLayers.Format.WFSCapabilities.v1, {

Modified: sandbox/mpriour/temporal_map/openlayers/lib/OpenLayers/Tile/BackBufferable.js
===================================================================
--- sandbox/mpriour/temporal_map/openlayers/lib/OpenLayers/Tile/BackBufferable.js	2011-08-18 14:16:44 UTC (rev 12261)
+++ sandbox/mpriour/temporal_map/openlayers/lib/OpenLayers/Tile/BackBufferable.js	2011-08-18 15:51:45 UTC (rev 12262)
@@ -131,7 +131,7 @@
             // (3) we don't have a tile available that we could use as buffer
             noTile = !(tile && tile.childNodes.length > 0),
             // (4) no backbuffer is displayed for a tile that's still loading
-            noBackBuffer = data.tile && !this.isLoading;            
+            noBackBuffer = !backBuffer && this.isLoading;            
         if (notNeeded || noParent || noTile || noBackBuffer) {
             this.setBackBufferData();
             return;