Changeset 1588

Timestamp:

10/05/06 09:50:47 (3 years ago)

Author:

sderle

Message:

Merged r1559:r1587 from source:/sandbox/crschmidt/noprototype. OpenLayers is now Prototype-free(tm).

Files:

• trunk/openlayers/build/license.txt (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Ajax.js (modified) (3 diffs)
• trunk/openlayers/lib/OpenLayers/BaseTypes.js (modified) (11 diffs)
• trunk/openlayers/lib/OpenLayers/Control.js (modified) (2 diffs)
• trunk/openlayers/lib/OpenLayers/Control/KeyboardDefaults.js (modified) (3 diffs)
• trunk/openlayers/lib/OpenLayers/Control/LayerSwitcher.js (modified) (11 diffs)
• trunk/openlayers/lib/OpenLayers/Control/MouseDefaults.js (modified) (9 diffs)
• trunk/openlayers/lib/OpenLayers/Control/MouseToolbar.js (modified) (8 diffs)
• trunk/openlayers/lib/OpenLayers/Control/PanZoom.js (modified) (4 diffs)
• trunk/openlayers/lib/OpenLayers/Control/PanZoomBar.js (modified) (8 diffs)
• trunk/openlayers/lib/OpenLayers/Control/Permalink.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Control/Scale.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Events.js (modified) (5 diffs)
• trunk/openlayers/lib/OpenLayers/Feature.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Feature/WFS.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Icon.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer.js (modified) (3 diffs)
• trunk/openlayers/lib/OpenLayers/Layer/Boxes.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/Canvas.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/EventPane.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/FixedZoomLevels.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/GeoRSS.js (modified) (3 diffs)
• trunk/openlayers/lib/OpenLayers/Layer/Google.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/Grid.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/HTTPRequest.js (modified) (4 diffs)
• trunk/openlayers/lib/OpenLayers/Layer/KaMap.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/MapServer.js (modified) (2 diffs)
• trunk/openlayers/lib/OpenLayers/Layer/Markers.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/MultiMap.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/Text.js (modified) (2 diffs)
• trunk/openlayers/lib/OpenLayers/Layer/VirtualEarth.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/WFS.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/WMS.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/WMS/Untiled.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/WorldWind.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/Yahoo.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Map.js (modified) (5 diffs)
• trunk/openlayers/lib/OpenLayers/Marker.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Marker/Box.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Popup.js (modified) (5 diffs)
• trunk/openlayers/lib/OpenLayers/Popup/Anchored.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Popup/AnchoredBubble.js (modified) (2 diffs)
• trunk/openlayers/lib/OpenLayers/Tile.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Tile/Image.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Tile/WFS.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Util.js (modified) (8 diffs)
• trunk/openlayers/lib/Prototype.js (deleted)
• trunk/openlayers/lib/Rico/Color.js (modified) (1 diff)
• trunk/openlayers/lib/Rico/Corner.js (modified) (1 diff)
• trunk/openlayers/tests/test_Layer_WMS.html (modified) (1 diff)

trunk/openlayers/build/license.txt

@@ -14 +14 @@
-*/
-
-
+
+
+
- *  (c) 2005 Sam Stephenson <sam@conio.net>
- *

trunk/openlayers/lib/OpenLayers.js

@@ -49 +49 @@
-    (function() {
-    var jsfiles=new Array(
-
+
+
+
-        "Rico/Corner.js",
-        "Rico/Color.js",
-        "OpenLayers/BaseTypes.js",
-        "OpenLayers/Util.js",
-        "OpenLayers/Ajax.js",
-        "OpenLayers/Events.js",

trunk/openlayers/lib/OpenLayers/Ajax.js

@@ -61 +61 @@
-
-    // from prototype.js
-
+OpenLayers.
-                     {   method: 'get', 
-                         parameters: params,
@@ -84 +84 @@
-    }
-
-Try.these
+OpenLayers.Util.Try
-        function() {
-            var xmldom = new ActiveXObject('Microsoft.XMLDOM');
@@ -107 +107 @@
-    return ajaxResponse;
-};
+
+OpenLayers.Ajax = {
+  emptyFunction: function () {},
+
+  getTransport: function() {
+    return OpenLayers.Util.Try(
+      function() {return new ActiveXObject('Msxml2.XMLHTTP')},
+      function() {return new ActiveXObject('Microsoft.XMLHTTP')},
+      function() {return new XMLHttpRequest()}
+    ) || false;
+  },
+
+  activeRequestCount: 0
+};
+
+OpenLayers.Ajax.Responders = {
+  responders: [],
+
+  register: function(responderToAdd) {
+    for (var i = 0; i < this.responders.length; i++)
+        if (responderToAdd == this.responders[i])
+            return;
+    this.responders.push(responderToAdd);
+  },
+
+  dispatch: function(callback, request, transport, json) {
+    for (var i = 0; i < this.responders.length; i++) {
+      responder = this.responders[i];
+      if (responder[callback] && typeof responder[callback] == 'function') {
+        try {
+          responder[callback].apply(responder, [request, transport, json]);
+        } catch (e) {}
+      }
+    }
+  }
+};
+
+OpenLayers.Ajax.Responders.register({
+  onCreate: function() {
+    OpenLayers.Ajax.activeRequestCount++;
+  },
+
+  onComplete: function() {
+    OpenLayers.Ajax.activeRequestCount--;
+  }
+});
+
+OpenLayers.Ajax.Base = function() {};
+OpenLayers.Ajax.Base.prototype = {
+  setOptions: function(options) {
+    this.options = {
+      method:       'post',
+      asynchronous: true,
+      parameters:   ''
+    }
+    OpenLayers.Util.extend(this.options, options || {});
+  },
+
+  responseIsSuccess: function() {
+    return this.transport.status == undefined
+        || this.transport.status == 0
+        || (this.transport.status >= 200 && this.transport.status < 300);
+  },
+
+  responseIsFailure: function() {
+    return !this.responseIsSuccess();
+  }
+}
+
+OpenLayers.Ajax.Request = OpenLayers.Class.create();
+OpenLayers.Ajax.Request.Events =
+  ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
+
+OpenLayers.Ajax.Request.prototype = OpenLayers.Util.extend(new OpenLayers.Ajax.Base(), {
+  initialize: function(url, options) {
+    this.transport = OpenLayers.Ajax.getTransport();
+    this.setOptions(options);
+    this.request(url);
+  },
+
+  request: function(url) {
+    var parameters = this.options.parameters || '';
+    if (parameters.length > 0) parameters += '&_=';
+
+    try {
+      this.url = url;
+      if (this.options.method == 'get' && parameters.length > 0)
+        this.url += (this.url.match(/\?/) ? '&' : '?') + parameters;
+
+      OpenLayers.Ajax.Responders.dispatch('onCreate', this, this.transport);
+
+      this.transport.open(this.options.method, this.url,
+        this.options.asynchronous);
+
+      if (this.options.asynchronous) {
+        this.transport.onreadystatechange = this.onStateChange.bind(this);
+        setTimeout((function() {this.respondToReadyState(1)}).bind(this), 10);
+      }
+
+      this.setRequestHeaders();
+
+      var body = this.options.postBody ? this.options.postBody : parameters;
+      this.transport.send(this.options.method == 'post' ? body : null);
+
+    } catch (e) {
+      this.dispatchException(e);
+    }
+  },
+
+  setRequestHeaders: function() {
+    var requestHeaders =
+      ['X-Requested-With', 'XMLHttpRequest',
+       'X-Prototype-Version', 'OpenLayers'];
+
+    if (this.options.method == 'post') {
+      requestHeaders.push('Content-type',
+        'application/x-www-form-urlencoded');
+
+      /* Force "Connection: close" for Mozilla browsers to work around
+       * a bug where XMLHttpReqeuest sends an incorrect Content-length
+       * header. See Mozilla Bugzilla #246651.
+       */
+      if (this.transport.overrideMimeType)
+        requestHeaders.push('Connection', 'close');
+    }
+
+    if (this.options.requestHeaders)
+      requestHeaders.push.apply(requestHeaders, this.options.requestHeaders);
+
+    for (var i = 0; i < requestHeaders.length; i += 2)
+      this.transport.setRequestHeader(requestHeaders[i], requestHeaders[i+1]);
+  },
+
+  onStateChange: function() {
+    var readyState = this.transport.readyState;
+    if (readyState != 1)
+      this.respondToReadyState(this.transport.readyState);
+  },
+
+  header: function(name) {
+    try {
+      return this.transport.getResponseHeader(name);
+    } catch (e) {}
+  },
+
+  evalJSON: function() {
+    try {
+      return eval(this.header('X-JSON'));
+    } catch (e) {}
+  },
+
+  evalResponse: function() {
+    try {
+      return eval(this.transport.responseText);
+    } catch (e) {
+      this.dispatchException(e);
+    }
+  },
+
+  respondToReadyState: function(readyState) {
+    var event = OpenLayers.Ajax.Request.Events[readyState];
+    var transport = this.transport, json = this.evalJSON();
+
+    if (event == 'Complete') {
+      try {
+        (this.options['on' + this.transport.status]
+         || this.options['on' + (this.responseIsSuccess() ? 'Success' : 'Failure')]
+         || OpenLayers.Ajax.emptyFunction)(transport, json);
+      } catch (e) {
+        this.dispatchException(e);
+      }
+
+      if ((this.header('Content-type') || '').match(/^text\/javascript/i))
+        this.evalResponse();
+    }
+
+    try {
+      (this.options['on' + event] || OpenLayers.Ajax.emptyFunction)(transport, json);
+      OpenLayers.Ajax.Responders.dispatch('on' + event, this, transport, json);
+    } catch (e) {
+      this.dispatchException(e);
+    }
+
+    /* Avoid memory leak in MSIE: clean up the oncomplete event handler */
+    if (event == 'Complete')
+      this.transport.onreadystatechange = OpenLayers.Ajax.emptyFunction;
+  },
+
+  dispatchException: function(exception) {
+    (this.options.onException || OpenLayers.Ajax.emptyFunction)(this, exception);
+    OpenLayers.Ajax.Responders.dispatch('onException', this, exception);
+  }
+});
+

trunk/openlayers/lib/OpenLayers/BaseTypes.js

@@ -3 +3 @@
- * text of the license. */
-
+/* OpenLayers.Class metaclass */
+OpenLayers.Class = {
+  create: function() {
+    return function() {
+      this.initialize.apply(this, arguments);
+    }
+  }
+};
-
-/*********************
@@ -10 +18 @@
- *********************/
-
-
-/**
- * @class 
@@ -16 +23 @@
- * This class represents a screen coordinate, in x and y coordinates
- */
-
+OpenLayers.
-OpenLayers.Pixel.prototype = {
-    
@@ -107 +114 @@
-* This class represents a width and height pair
-*/
-
+OpenLayers.
-OpenLayers.Size.prototype = {
-
@@ -178 +185 @@
-* This class represents a longitude and latitude pair
-*/
-
+OpenLayers.
-OpenLayers.LonLat.prototype = {
-
@@ -291 +298 @@
-* Data stored as left, bottom, right, top floats
-*/
-
+OpenLayers.
-OpenLayers.Bounds.prototype = {
-
@@ -653 +660 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/*********************
@@ -661 +749 @@
- *********************/
-
-
-
-/**
-* @param {String} sStart
@@ -703 +789 @@
-};
-
+
+String.indexOf = function(object) {
+ for (var i = 0; i < this.length; i++)
+     if (this[i] == object) return i;
+ return -1;
+};
+
+String.prototype.camelize = function() {
+    var oStringList = this.split('-');
+    if (oStringList.length == 1) return oStringList[0];
+
+    var camelizedString = this.indexOf('-') == 0
+      ? oStringList[0].charAt(0).toUpperCase() + oStringList[0].substring(1)
+      : oStringList[0];
+
+    for (var i = 1, len = oStringList.length; i < len; i++) {
+      var s = oStringList[i];
+      camelizedString += s.charAt(0).toUpperCase() + s.substring(1);
+    }
+
+    return camelizedString;
+};
-
-
@@ -756 +864 @@
- *                   * 
- *********************/
-
-
-
-/** NOTE: Works only with integer values does *not* work with floats!
@@ -775 +881 @@
-    return parseInt(number);
-}
+
+
+/*********************
+ *                   *
+ *      FUNCTION     * 
+ *                   * 
+ *********************/
+
+Function.prototype.bind = function() {
+  var __method = this, args = [], object = arguments[0];
+  for (var i = 1; i < arguments.length; i++)
+    args.push(arguments[i]);
+  return function(moreargs) {
+    for (var i = 0; i < arguments.length; i++)
+      args.push(arguments[i]);
+    return __method.apply(object, args);
+  }
+};
+
+Function.prototype.bindAsEventListener = function(object) {
+  var __method = this;
+  return function(event) {
+    return __method.call(object, event || window.event);
+  }
+};

trunk/openlayers/lib/OpenLayers/Control.js

@@ -6 +6 @@
-* @class
-*/
-
+OpenLayers.
-OpenLayers.Control.prototype = {
-
@@ -31 +31 @@
-     */
-    initialize: function (options) {
-bject
+penLayers.Util
-        
-        this.id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_");

trunk/openlayers/lib/OpenLayers/Control/KeyboardDefaults.js

@@ -8 +8 @@
- * @requires OpenLayers/Control.js
- */
-
+OpenLayers.
-OpenLayers.Control.KeyboardDefaults.prototype = 
-bject
+penLayers.Util
-
-    /** @type int */
@@ -26 +26 @@
-     */
-    draw: function() {
-
+OpenLayers.
-                      'keypress', 
-                      this.defaultKeyDown.bind(this));
@@ -36 +36 @@
-    defaultKeyDown: function (evt) {
-        switch(evt.keyCode) {
-
+OpenLayers.
-                this.map.pan(-50, 0);
-                break;
-
+OpenLayers.
-                this.map.pan(50, 0);
-                break;
-
+OpenLayers.
-                this.map.pan(0, -50);
-                break;
-
+OpenLayers.
-                this.map.pan(0, 50);
-                break;

trunk/openlayers/lib/OpenLayers/Control/LayerSwitcher.js

@@ -8 +8 @@
- * @requires OpenLayers/Control.js
- */
-
+OpenLayers.
-OpenLayers.Control.LayerSwitcher.prototype = 
-bject
+penLayers.Util
-
-    /** @type String */
@@ -130 +130 @@
-                inputElem.layer = layer;
-                inputElem.control = this;
+
-                if (!baseLayer && !layer.inRange()) {
-                    inputElem.disabled = true;
-                }
-
+OpenLayers.
-                              this.onInputClick.bindAsEventListener(inputElem));
-                
@@ -143 +144 @@
-                labelSpan.innerHTML = layer.name;
-                labelSpan.style.verticalAlign = (baseLayer) ? "bottom" : "baseline";
-
+OpenLayers.
-                              this.onInputClick.bindAsEventListener(inputElem));
-                // create line break
@@ -186 +187 @@
-            }
-        }
-
+OpenLayers.
-    },
-    
@@ -238 +239 @@
-
-        if (e != null) {
-
+OpenLayers.
-        }
-    },
@@ -255 +256 @@
-
-        if (e != null) {
-
+OpenLayers.
-        }
-    },
@@ -293 +294 @@
-        this.div.style.backgroundColor = "transparent";
-    
-
+OpenLayers.
-                      this.mouseUp.bindAsEventListener(this));
-
+OpenLayers.
-                      this.ignoreEvent);
-
+OpenLayers.
-                      this.mouseDown.bindAsEventListener(this));
-
+OpenLayers.
-
-
@@ -326 +327 @@
-        this.baseLayersDiv = document.createElement("div");
-        this.baseLayersDiv.style.paddingLeft = "10px";
-
+OpenLayers.
-                      this.onLayerClick.bindAsEventListener(this));
-        */
@@ -376 +377 @@
-        this.maximizeDiv.style.left = "";
-        this.maximizeDiv.style.display = "none";
-
+OpenLayers.
-                      "click", 
-                      this.maximizeControl.bindAsEventListener(this));
@@ -395 +396 @@
-        this.minimizeDiv.style.left = "";
-        this.minimizeDiv.style.display = "none";
-
+OpenLayers.
-                      "click", 
-                      this.minimizeControl.bindAsEventListener(this));
@@ -408 +409 @@
-     */
-    ignoreEvent: function(evt) {
-
+OpenLayers.
-    },
-

trunk/openlayers/lib/OpenLayers/Control/MouseDefaults.js

@@ -8 +8 @@
- * @requires OpenLayers/Control.js
- */
-
+OpenLayers.
-OpenLayers.Control.MouseDefaults.prototype = 
-bject
+penLayers.Util
-
-    /** @type Boolean */
@@ -22 +22 @@
-
-        //register mousewheel events specifically on the window and document
-
+OpenLayers.
-                      this.onWheelEvent.bindAsEventListener(this));
-
+OpenLayers.
-                      this.onWheelEvent.bindAsEventListener(this));
-
+OpenLayers.
-                      this.onWheelEvent.bindAsEventListener(this));
-    },
@@ -48 +48 @@
-     */
-    defaultClick: function (evt) {
-
+OpenLayers.
-        var notAfterDrag = !this.performedDrag;
-        this.performedDrag = false;
@@ -60 +60 @@
-        var newCenter = this.map.getLonLatFromViewPortPx( evt.xy ); 
-        this.map.setCenter(newCenter, this.map.zoom + 1);
-
+OpenLayers.
-        return false;
-    },
@@ -68 +68 @@
-    */
-    defaultMouseDown: function (evt) {
-
+OpenLayers.
-        this.mouseDragStart = evt.xy.clone();
-        this.performedDrag  = false;
@@ -87 +87 @@
-        }
-        document.onselectstart=function() { return false; }
-
+OpenLayers.
-    },
-
@@ -125 +125 @@
-    */
-    defaultMouseUp: function (evt) {
-
+OpenLayers.
-        if (this.zoomBox) {
-            this.zoomBoxEnd(evt);    
@@ -218 +218 @@
-        // first determine whether or not the wheeling was inside the map
-        var inMap = false;
-
+OpenLayers.
-        while(elem != null) {
-            if (this.map && elem == this.map.div) {
@@ -250 +250 @@
-            
-            //only wheel the map, not the window
-
+OpenLayers.
-        }
-    },

trunk/openlayers/lib/OpenLayers/Control/MouseToolbar.js

@@ -9 +9 @@
- * @requires OpenLayers/Control/MouseDefaults.js
- */
-
+OpenLayers.
-OpenLayers.Control.MouseToolbar.X = 6;
-OpenLayers.Control.MouseToolbar.Y = 300;
-OpenLayers.Control.MouseToolbar.prototype = 
-bject
-bject
+penLayers.Util
+penLayers.Util
-    
-    mode: null,
@@ -69 +69 @@
-        btn.events.register("mousedown", this, this.buttonDown); 
-        btn.events.register("mouseup", this, this.buttonUp); 
-
+OpenLayers.
-        btn.action = id;
-        btn.title = title;
@@ -84 +84 @@
-     */
-    buttonDown: function(evt) {
-
+OpenLayers.
-        this.buttonClicked = evt.element.action;
-
+OpenLayers.
-    },
-
@@ -93 +93 @@
-     */
-    buttonUp: function(evt) {
-
+OpenLayers.
-        if (this.buttonClicked != null) {
-            if (this.buttonClicked == evt.element.action) {
-                this.switchModeTo(evt.element.action);
-            }
-
+OpenLayers.
-            this.buttonClicked = null;
-        }
@@ -111 +111 @@
-        var newCenter = this.map.getLonLatFromViewPortPx( evt.xy ); 
-        this.map.setCenter(newCenter, this.map.zoom + 1);
-
+OpenLayers.
-        return false;
-    },
@@ -119 +119 @@
-    */
-    defaultMouseDown: function (evt) {
-
+OpenLayers.
-        this.mouseDragStart = evt.xy.clone();
-        this.performedDrag = false;
@@ -195 +195 @@
-        }
-        document.onselectstart = function() { return false; } 
-
+OpenLayers.
-    },
-
@@ -270 +270 @@
-    */
-    defaultMouseUp: function (evt) {
-
+OpenLayers.
-        switch (this.mode) {
-            case "zoombox":

trunk/openlayers/lib/OpenLayers/Control/PanZoom.js

@@ -8 +8 @@
- * @requires OpenLayers/Control.js
- */
-
+OpenLayers.
-OpenLayers.Control.PanZoom.X = 4;
-OpenLayers.Control.PanZoom.Y = 4;
-OpenLayers.Control.PanZoom.prototype = 
-bject
+penLayers.Util
-
-    /** @type int */
@@ -102 +102 @@
-     */
-    doubleClick: function (evt) {
-
+OpenLayers.
-        return false;
-    },
@@ -110 +110 @@
-     */
-    buttonDown: function (evt) {
-
+OpenLayers.
-
-        switch (this.action) {
@@ -136 +136 @@
-        }
-
-
+OpenLayers.
-    },
-

trunk/openlayers/lib/OpenLayers/Control/PanZoomBar.js

@@ -8 +8 @@
- * @requires OpenLayers/Control/PanZoom.js
- */
-
+OpenLayers.
-OpenLayers.Control.PanZoomBar.X = 4;
-OpenLayers.Control.PanZoomBar.Y = 4;
-OpenLayers.Control.PanZoomBar.prototype = 
-bject
+penLayers.Util
-
-    /** @type Array(...) */
@@ -148 +148 @@
-     */
-    divClick: function (evt) {
-
+OpenLayers.
-        var y = evt.xy.y;
-Position.page
+OpenLayers.Util.pagePosition
-        var levels = Math.floor((y - top)/this.zoomStopHeight);
-        this.map.zoomTo((this.map.getNumZoomLevels() -1) -  levels);
-
+OpenLayers.
-    },
-    
@@ -161 +161 @@
-     */
-    zoomBarDown:function(evt) {
-
+OpenLayers.
-        this.map.events.register("mousemove", this, this.passEventToSlider);
-        this.map.events.register("mouseup", this, this.passEventToSlider);
@@ -167 +167 @@
-        this.zoomStart = evt.xy.clone();
-        this.div.style.cursor = "move";
-
+OpenLayers.
-    },
-    
@@ -179 +179 @@
-        if (this.mouseDragStart != null) {
-            var deltaY = this.mouseDragStart.y - evt.xy.y
-Position.page
+OpenLayers.Util.pagePosition
-            if ((evt.clientY - offsets[1]) > 0 && 
-                (evt.clientY - offsets[1]) < parseInt(this.zoombarDiv.style.height) - 2) {
@@ -186 +186 @@
-            }
-            this.mouseDragStart = evt.xy.clone();
-
+OpenLayers.
-        }
-    },
@@ -196 +196 @@
-     */
-    zoomBarUp:function(evt) {
-
+OpenLayers.
-        if (this.zoomStart) {
-            this.div.style.cursor="default";
@@ -205 +205 @@
-            this.moveZoomBar();
-            this.mouseDragStart = null;
-
+OpenLayers.
-        }
-    },

trunk/openlayers/lib/OpenLayers/Control/Permalink.js

@@ -8 +8 @@
- * @requires OpenLayers/Control.js
- */
-
+OpenLayers.
-OpenLayers.Control.Permalink.prototype = 
-bject
+penLayers.Util
-
-    /** @type DOMElement */

trunk/openlayers/lib/OpenLayers/Control/Scale.js

@@ -8 +8 @@
- * @requires OpenLayers/Control.js
- */
-
+OpenLayers.
-OpenLayers.Control.Scale.prototype = 
-bject
+penLayers.Util
-    /** @type DOMElement */
-    element: null,

trunk/openlayers/lib/OpenLayers/Events.js

@@ -3 +3 @@
- * text of the license. */
-
+OpenLayers.Event = {
+  KEY_BACKSPACE: 8,
+  KEY_TAB:       9,
+  KEY_RETURN:   13,
+  KEY_ESC:      27,
+  KEY_LEFT:     37,
+  KEY_UP:       38,
+  KEY_RIGHT:    39,
+  KEY_DOWN:     40,
+  KEY_DELETE:   46,
+
+  element: function(event) {
+    return event.target || event.srcElement;
+  },
+
+  isLeftClick: function(event) {
+    return (((event.which) && (event.which == 1)) ||
+            ((event.button) && (event.button == 1)));
+  },
+
+  pointerX: function(event) {
+    return event.pageX || (event.clientX +
+      (document.documentElement.scrollLeft || document.body.scrollLeft));
+  },
+
+  pointerY: function(event) {
+    return event.pageY || (event.clientY +
+      (document.documentElement.scrollTop || document.body.scrollTop));
+  },
+
+  stop: function(event) {
+    if (event.preventDefault) {
+      event.preventDefault();
+      event.stopPropagation();
+    } else {
+      event.returnValue = false;
+      event.cancelBubble = true;
+    }
+  },
+
+  // find the first node with the given tagName, starting from the
+  // node the event was triggered on; traverses the DOM upwards
+  findElement: function(event, tagName) {
+    var element = OpenLayers.Event.element(event);
+    while (element.parentNode && (!element.tagName ||
+        (element.tagName.toUpperCase() != tagName.toUpperCase())))
+      element = element.parentNode;
+    return element;
+  },
+
+  observers: false,
+
+  _observeAndCache: function(element, name, observer, useCapture) {
+    if (!this.observers) this.observers = [];
+    if (element.addEventListener) {
+      this.observers.push([element, name, observer, useCapture]);
+      element.addEventListener(name, observer, useCapture);
+    } else if (element.attachEvent) {
+      this.observers.push([element, name, observer, useCapture]);
+      element.attachEvent('on' + name, observer);
+    }
+  },
+
+  unloadCache: function() {
+    if (!OpenLayers.Event.observers) return;
+    for (var i = 0; i < OpenLayers.Event.observers.length; i++) {
+      OpenLayers.Event.stopObserving.apply(this, OpenLayers.Event.observers[i]);
+      OpenLayers.Event.observers[i][0] = null;
+    }
+    OpenLayers.Event.observers = false;
+  },
+
+  observe: function(elementParam, name, observer, useCapture) {
+    var element = $(elementParam);
+    useCapture = useCapture || false;
+
+    if (name == 'keypress' &&
+        (navigator.appVersion.match(/Konqueror|Safari|KHTML/)
+        || element.attachEvent))
+      name = 'keydown';
+
+    this._observeAndCache(element, name, observer, useCapture);
+  },
+
+  stopObserving: function(elementParam, name, observer, useCapture) {
+    var element = $(elementParam);
+    useCapture = useCapture || false;
+
+    if (name == 'keypress' &&
+        (navigator.appVersion.match(/Konqueror|Safari|KHTML/)
+        || element.detachEvent))
+      name = 'keydown';
+
+    if (element.removeEventListener) {
+      element.removeEventListener(name, observer, useCapture);
+    } else if (element.detachEvent) {
+      element.detachEvent('on' + name, observer);
+    }
+  }
+};
+/* prevent memory leaks in IE */
+OpenLayers.Event.observe(window, 'unload', OpenLayers.Event.unloadCache, false);
+
+if (window.Event) {
+  OpenLayers.Util.extend(window.Event, OpenLayers.Event);
+} else {
+  var Event = OpenLayers.Event;
+}
+
+
+
-/**
- * @class
- */
-
+OpenLayers.
-OpenLayers.Events.prototype = {
-
@@ -30 +141 @@
-    eventTypes: null,
-
-
-    /**
-     * @constructor 
@@ -73 +183 @@
-
-            // use Prototype to register the event cross-browser
-
+OpenLayers.
-                this.handleBrowserEvent.bindAsEventListener(this));
-        }
-        // disable dragstart in IE so that mousedown/move/up works normally
-Event.observe(element, "dragstart", 
+OpenLayers.Event.observe(element, "dragstart", OpenLayers.
-    },
-
@@ -181 +291 @@
-            // don't fall through to other DOM elements
-            if (!this.fallThrough) {            
-
+OpenLayers.
-            }
-        }
@@ -209 +319 @@
-    getMousePosition: function (evt) {
-        if (!this.element.offsets) {
-Position.page
+OpenLayers.Util.pagePosition
-        }
-        return new OpenLayers.Pixel(
-
-
-
+
+
+
+
+
-    },
-

trunk/openlayers/lib/OpenLayers/Feature.js

@@ -8 +8 @@
- * @requires OpenLayers/Util.js
- */
-
+OpenLayers.
-OpenLayers.Feature.prototype= {
-

trunk/openlayers/lib/OpenLayers/Feature/WFS.js

@@ -8 +8 @@
- * @requires OpenLayers/Feature.js
- */
-
+OpenLayers.
-OpenLayers.Feature.WFS.prototype = 
-bject
+penLayers.Util
-      
-    /** 

trunk/openlayers/lib/OpenLayers/Icon.js

@@ -6 +6 @@
- * @class
- */
-
+OpenLayers.
-OpenLayers.Icon.prototype = {
-    

trunk/openlayers/lib/OpenLayers/Layer.js

@@ -6 +6 @@
- * @class
- */
-
+OpenLayers.
-OpenLayers.Layer.prototype = {
-
@@ -100 +100 @@
-
-            //store a copy of the custom options for later cloning
-bject
+penLayers.Util
-            
-            //add options to layer
-bject
+penLayers.Util
-
-            this.name = name;
@@ -167 +167 @@
-        
-        // update our copy for clone
-bject
+penLayers.Util
-
-        // add new options to this
-bject
+penLayers.Util
-    },
-    

trunk/openlayers/lib/OpenLayers/Layer/Boxes.js

@@ -9 +9 @@
- * @requires OpenLayers/Layer/Markers.js
- */
-
+OpenLayers.
-OpenLayers.Layer.Boxes.prototype = 
-bject
+penLayers.Util
-
-    initialize: function () {

trunk/openlayers/lib/OpenLayers/Layer/Canvas.js

@@ -8 +8 @@
- * @requires OpenLayers/Layer.js
- */
-
+OpenLayers.
-OpenLayers.Layer.Canvas.prototype = 
-bject
+penLayers.Util
-    
-    /** Canvas layer is never a base layer. 

trunk/openlayers/lib/OpenLayers/Layer/EventPane.js

@@ -9 +9 @@
- * @requires OpenLayers/Util.js
- */
-
+OpenLayers.
-OpenLayers.Layer.EventPane.prototype = 
-bject
+penLayers.Util
-
-    /** EventPaned layers are always base layers, by necessity.

trunk/openlayers/lib/OpenLayers/Layer/FixedZoomLevels.js

@@ -45 +45 @@
- * @class
- */
-
+OpenLayers.
-OpenLayers.Layer.FixedZoomLevels.prototype = {
-      

trunk/openlayers/lib/OpenLayers/Layer/GeoRSS.js

@@ -8 +8 @@
- * @requires OpenLayers/Layer/Markers.js
- */
-
+OpenLayers.
-OpenLayers.Layer.GeoRSS.prototype = 
-bject
+penLayers.Util
-
-    /** store url of text file
@@ -131 +131 @@
-        if (!sameMarkerClicked) {
-            var popup = this.createPopup();
-
+OpenLayers.
-            function() { 
-              for(var i=0; i < this.layer.map.popups.length; i++) { 
@@ -139 +139 @@
-            this.layer.map.addPopup(popup); 
-        }
-
+OpenLayers.
-    },
-

trunk/openlayers/lib/OpenLayers/Layer/Google.js

@@ -11 +11 @@
- * @requires OpenLayers/Layer/EventPane.js
- */
-
+OpenLayers.
-OpenLayers.Layer.Google.prototype =
-bject
-bject
+penLayers.Util
+penLayers.Util
-    
-    /** @type Boolean */

trunk/openlayers/lib/OpenLayers/Layer/Grid.js

@@ -8 +8 @@
- * @requires OpenLayers/Layer/HTTPRequest.js
- */
-
+OpenLayers.
-OpenLayers.Layer.Grid.prototype = 
-bject
+penLayers.Util
-    
-    /** @type OpenLayers.Size */

trunk/openlayers/lib/OpenLayers/Layer/HTTPRequest.js

@@ -8 +8 @@
- * @requires OpenLayers/Layer.js
- */
-
+OpenLayers.
-OpenLayers.Layer.HTTPRequest.prototype = 
-bject
+penLayers.Util
-
-    /** @type String */
@@ -34 +34 @@
-        OpenLayers.Layer.prototype.initialize.apply(this, newArguments);
-        this.url = url;
-bject
+penLayers.Util
-    },
-
@@ -80 +80 @@
-     */
-    mergeNewParams:function(newParams) {
-bject
+penLayers.Util
-    },
-    
@@ -107 +107 @@
-        // create a new params hashtable with all the layer params and the 
-        // new params together. then convert to string
-bject
-bject
+penLayers.Util
+penLayers.Util
-        var paramsString = OpenLayers.Util.getParameterString(allParams);
-

trunk/openlayers/lib/OpenLayers/Layer/KaMap.js

@@ -8 +8 @@
- * @requires OpenLayers/Layer/Grid.js
- */
-
+OpenLayers.
-OpenLayers.Layer.KaMap.prototype = 
-bject
+penLayers.Util
-
-    /** KaMap Layer is always a base layer 

trunk/openlayers/lib/OpenLayers/Layer/MapServer.js

@@ -6 +6 @@
-* @class
-*/
-
+OpenLayers.
-OpenLayers.Layer.MapServer.prototype =
-bject
+penLayers.Util
-
-    /** @final @type hash */
@@ -58 +58 @@
-    clone: function (name, params) {
-        var mergedParams = {};
-bject
-bject
+penLayers.Util
+penLayers.Util
-        var obj = new OpenLayers.Layer.MapServer(name, this.url, mergedParams);
-        obj.setTileSize(this.tileSize);

trunk/openlayers/lib/OpenLayers/Layer/Markers.js

@@ -8 +8 @@
- * @requires OpenLayers/Layer.js
- */
-
+OpenLayers.
-OpenLayers.Layer.Markers.prototype = 
-bject
+penLayers.Util
-    
-    /** Markers layer is never a base layer. 

trunk/openlayers/lib/OpenLayers/Layer/MultiMap.js

@@ -8 +8 @@
- * @requires OpenLayers/Layer/EventPane.js
- */
-
+OpenLayers.
-OpenLayers.Layer.MultiMap.prototype = 
-bject
+penLayers.Util
-
-    /** @type MMMap */

trunk/openlayers/lib/OpenLayers/Layer/Text.js

@@ -8 +8 @@
- * @requires OpenLayers/Layer/Markers.js
- */
-
+OpenLayers.
-OpenLayers.Layer.Text.prototype = 
-bject
+penLayers.Util
-
-    /** store url of text file - this should be specified in the 
@@ -146 +146 @@
-            this.layer.map.addPopup(this.createPopup()); 
-        }
-
+OpenLayers.
-    },
-

trunk/openlayers/lib/OpenLayers/Layer/VirtualEarth.js

@@ -8 +8 @@
- * @requires OpenLayers/Layer/EventPane.js
- */
-
+OpenLayers.
-OpenLayers.Layer.VirtualEarth.prototype = 
-bject
-bject
+penLayers.Util
+penLayers.Util
-        
-    /** @type VEMap */

trunk/openlayers/lib/OpenLayers/Layer/WFS.js

@@ -9 +9 @@
- * @requires OpenLayers/Layer/Markers.js
- */
-
+OpenLayers.
-OpenLayers.Layer.WFS.prototype = 
-bject
-bject
+penLayers.Util
+penLayers.Util
-
-    /** WFS layer is never a base layer. 

trunk/openlayers/lib/OpenLayers/Layer/WMS.js

@@ -8 +8 @@
- * @requires OpenLayers/Layer/Grid.js
- */
-
+OpenLayers.
-OpenLayers.Layer.WMS.prototype = 
-bject
+penLayers.Util
-
-    /** Hashtable of default parameter key/value pairs 

trunk/openlayers/lib/OpenLayers/Layer/WMS/Untiled.js

@@ -9 +9 @@
- * @requires OpenLayers/Layer/WMS.js
- */
-
+OpenLayers.
-OpenLayers.Layer.WMS.Untiled.prototype = 
-bject
+penLayers.Util
-
-    /** Hashtable of default parameter key/value pairs

trunk/openlayers/lib/OpenLayers/Layer/WorldWind.js

@@ -8 +8 @@
- * @requires OpenLayers/Layer/Grid.js
- */
-
+OpenLayers.
-OpenLayers.Layer.WorldWind.prototype = 
-bject
+penLayers.Util
-    
-    DEFAULT_PARAMS: {

trunk/openlayers/lib/OpenLayers/Layer/Yahoo.js

@@ -8 +8 @@
- * @requires OpenLayers/Layer/EventPane.js
- */
-
+OpenLayers.
-OpenLayers.Layer.Yahoo.prototype = 
-bject
+penLayers.Util
-
-    /** @type YMap */

trunk/openlayers/lib/OpenLayers/Map.js

@@ -9 +9 @@
- * @requires OpenLayers/Events.js
- */
-
+OpenLayers.
-OpenLayers.Map.TILE_WIDTH = 256;
-OpenLayers.Map.TILE_HEIGHT = 256;
@@ -153 +153 @@
-            //  Note that this is ok, as updateSize() does nothing if the 
-            //  map's size has not actually changed.
-
+OpenLayers.
-                          this.updateSize.bindAsEventListener(this));
-        }
@@ -174 +174 @@
-
-        // always call map.destroy()
-
+OpenLayers.
-                      'unload', 
-                      this.destroy.bindAsEventListener(this));
@@ -214 +214 @@
-        // now add the options declared by the user
-        //  (these will override defaults)
-bject
+penLayers.Util
-    },
-
@@ -514 +514 @@
-        // Workaround for the fact that hidden elements return 0 for size.
-        if (size.w == 0 && size.h == 0) {
-
+OpenLayers.
-            size.w = dim.width;
-            size.h = dim.height;

trunk/openlayers/lib/OpenLayers/Marker.js

@@ -6 +6 @@
- * @class
- */
-
+OpenLayers.
-OpenLayers.Marker.prototype = {
-    

trunk/openlayers/lib/OpenLayers/Marker/Box.js

@@ -8 +8 @@
- * @requires OpenLayers/Marker.js
- */
-
-bject
+OpenLayers.
+penLayers.Util
-    /** @type OpenLayers.LonLat */
-    bounds: null,

trunk/openlayers/lib/OpenLayers/Popup.js

@@ -6 +6 @@
- * @class
- */
-
+OpenLayers.
-
-OpenLayers.Popup.WIDTH = 200;
@@ -138 +138 @@
-     */
-    visible: function() {
-
+OpenLayers.
-    },
-
@@ -145 +145 @@
-     */
-    toggle: function() {
-
+OpenLayers.
-    },
-
@@ -152 +152 @@
-     */
-    show: function() {
-
+OpenLayers.
-    },
-
@@ -159 +159 @@
-     */
-    hide: function() {
-
+OpenLayers.
-    },
-

trunk/openlayers/lib/OpenLayers/Popup/Anchored.js

@@ -8 +8 @@
- * @requires OpenLayers/Popup.js
- */
-
+OpenLayers.
-OpenLayers.Popup.Anchored.prototype =
-bject
+penLayers.Util
-
-    /** "lr", "ll", "tr", "tl" - relative position of the popup.

trunk/openlayers/lib/OpenLayers/Popup/AnchoredBubble.js

@@ -8 +8 @@
- * @requires OpenLayers/Popup/Anchored.js
- */
-
+OpenLayers.
-
-//Border space for the rico corners
@@ -14 +14 @@
-
-OpenLayers.Popup.AnchoredBubble.prototype =
-bject
+penLayers.Util
-
-    /** @type DOMElement */

trunk/openlayers/lib/OpenLayers/Tile.js

@@ -12 +12 @@
- * example.
- */
-
+OpenLayers.
-OpenLayers.Tile.prototype = {
-    

trunk/openlayers/lib/OpenLayers/Tile/Image.js

@@ -8 +8 @@
- * @requires OpenLayers/Tile.js
- */
-
+OpenLayers.
-OpenLayers.Tile.Image.prototype = 
-bject
+penLayers.Util
-    
-    /** @type DOMElement img */

trunk/openlayers/lib/OpenLayers/Tile/WFS.js

@@ -8 +8 @@
- * @requires OpenLayers/Tile.js
- */
-
+OpenLayers.
-OpenLayers.Tile.WFS.prototype = 
-bject
+penLayers.Util
-
-    /** @type Array(OpenLayers.Feature)*/ 

trunk/openlayers/lib/OpenLayers/Util.js

@@ -7 +7 @@
- */
-OpenLayers.Util = new Object();
+
+/* from Prototype.js */
+if ($ == null) {
+    var $ = function () {
+      var elements = new Array();
+
+      for (var i = 0; i < arguments.length; i++) {
+        var element = arguments[i];
+        if (typeof element == 'string')
+          element = document.getElementById(element);
+
+        if (arguments.length == 1)
+          return element;
+
+        elements.push(element);
+      }
+
+      return elements;
+    }
+} 
+
+/* from Prototype.js */
+OpenLayers.Util.extend = function(destination, source) {
+    for (property in source) {
+      destination[property] = source[property];
+    }
+    return destination;
+};
-
-/**
@@ -106 +134 @@
-    if(delayDisplay) {
-        image.style.display = "none";
-
+OpenLayers.
-                      OpenLayers.Util.onImageLoad.bindAsEventListener(image));
-
+OpenLayers.
-                      OpenLayers.Util.onImageLoadError.bindAsEventListener(image));
-        
@@ -245 +273 @@
-    if (delayDisplay) {
-        img.style.display = "none";
-
+OpenLayers.
-                      OpenLayers.Util.onImageLoad.bindAsEventListener(div));
-
+OpenLayers.
-                      OpenLayers.Util.onImageLoadError.bindAsEventListener(div));
-    }
@@ -276 +304 @@
-
-/** Takes a hashtable and copies any keys that don't exist from
-bject
+penLayers.Util
-*   Prototype.js.
-*
@@ -319 +347 @@
-};
-
+/* Originally from Prototype */
+
+OpenLayers.Util.Try = function() {
+    var returnValue;
+
+    for (var i = 0; i < arguments.length; i++) {
+      var lambda = arguments[i];
+      try {
+        returnValue = lambda();
+        break;
+      } catch (e) {}
+    }
+
+    return returnValue;
+}
-
-
@@ -329 +372 @@
-*/
-OpenLayers.Util.getNodes=function(p, tagName) {
-Try.these
+OpenLayers.Util.Try
-        function () {
-            return OpenLayers.Util._getNodes(p.documentElement.childNodes,
@@ -393 +436 @@
-OpenLayers.Util.getXmlNodeValue = function(node) {
-    var val = null;
-Try.these
+OpenLayers.Util.Try
-        function() {
-            val = node.text;
@@ -574 +617 @@
-    evt.cancelBubble = true;    
-};
+
+OpenLayers.Util.pagePosition = function(forElement) {
+    var valueT = 0, valueL = 0;
+
+    var element = forElement;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+
+      // Safari fix
+      if (element.offsetParent==document.body)
+        if (OpenLayers.Element.getStyle(element,'position')=='absolute') break;
+
+    } while (element = element.offsetParent);
+
+    element = forElement;
+    do {
+      valueT -= element.scrollTop  || 0;
+      valueL -= element.scrollLeft || 0;
+    } while (element = element.parentNode);
+
+    return [valueL, valueT];
+};

trunk/openlayers/lib/Rico/Color.js

@@ -1 @@
-
+OpenLayers.
-
-Rico.Color.prototype = {

trunk/openlayers/lib/Rico/Corner.js

@@ -189 +189 @@
-         compact : false
-      }
-bject
+penLayers.Util
-
-      this.options.numSlices = this.options.compact ? 2 : 4;

trunk/openlayers/tests/test_Layer_WMS.html

@@ -100 +100 @@
-        t.ok( layer.isBaseLayer, "baselayer is true by default");
-
-bject
+penLayers.Util
-        newParams.transparent = "true";
-        layer = new OpenLayers.Layer.WMS(name, url, newParams);