Merge pull request #423 from marcjansen/no-$

Remove the aliasing of OpenLayers.Util.getElement to window.$
2012-05-29 12:52:27 -07:00
parent 989259c87f acb9f950df
commit 366faf6871
19 changed files with 109 additions and 75 deletions
@@ -748,7 +748,7 @@
    function test_Map_double_addLayer(t) {
        t.plan(2);

-        map = new OpenLayers.Map($('map'));
+        map = new OpenLayers.Map('map');
        layer = new OpenLayers.Layer.WMS('Test Layer', 
                    "http://octo.metacarta.com/cgi-bin/mapserv", 
                    {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'} 
@@ -1,10 +1,6 @@
 <html>
 <head>
  <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-  <script>
-    var custom$ = function() {};
-    window.$ = custom$;
-  </script>
  <script>
    var OpenLayers = [
        "OpenLayers/BaseTypes/Class.js",
@@ -77,11 +73,6 @@
        t.eq(OpenLayers.Util.isArray(testArray), true, "isArray works");
    }
    
-    function test_$(t) {
-        t.plan(1);
-        t.ok($ === custom$, "OpenLayers doesn't clobber existing definition of $.");
-    }
-    
    function test_Util_getImagesLocation (t) {
        t.plan( 1 );
        t.ok( OpenLayers.Util.getImagesLocation(), "../img/",
@@ -0,0 +1,20 @@
+<html>
+    <head>
+        <script>
+var custom$ = function() {};
+window.$ = custom$;
+        </script>
+        <script src="../OLLoader.js"></script>
+        <script src="../../lib/deprecated.js"></script>
+        <script>
+        
+function test_$(t) {
+    t.plan(1);
+    t.ok($ === custom$, "OpenLayers doesn't clobber existing definition of $.");
+}
+            
+        </script>
+    </head>
+    <body>
+    </body>
+</html>
@@ -231,6 +231,7 @@
    <li>Kinetic.html</li>
    <li>Util.html</li>
    <li>deprecated/Ajax.html</li>
+    <li>deprecated/Util.html</li>
    <li>deprecated/BaseTypes/Class.html</li>
    <li>deprecated/BaseTypes/Element.html</li>
    <li>deprecated/Control/MouseToolbar.html</li>