Merge pull request #423 from marcjansen/no-$

Remove the aliasing of OpenLayers.Util.getElement to window.$

lib/OpenLayers/Util.js

@@ -74,13 +74,6 @@ OpenLayers.Util.isArray = function(a) {
     return (Object.prototype.toString.call(a) === '[object Array]');
 };
 
-/** 
- * Maintain existing definition of $.
- */
-if(typeof window.$  === "undefined") {
-    window.$ = OpenLayers.Util.getElement;
-}
-
 /** 
  * Function: removeItem
  * Remove an object from an array. Iterates through the array

lib/deprecated.js

@@ -164,6 +164,17 @@ OpenLayers.Util.getArgs = function(url) {
     return OpenLayers.Util.getParameters(url);
 };
 
+/** 
+ * Maintain existing definition of $.
+ * 
+ * The use of our $-method is deprecated and the mapping of 
+ * OpenLayers.Util.getElement will eventually be removed. Do not depend on 
+ * window.$ being defined by OpenLayers.
+ */
+if(typeof window.$  === "undefined") {
+    window.$ = OpenLayers.Util.getElement;
+}
+
 /**
  * Namespace: OpenLayers.Ajax
  */