Merge branch 'master' of https://github.com/openlayers/openlayers into vendor-prefixes

2012-06-24 02:38:05 +02:00
parent 6d5f5c37df 78d07c8d8a
commit da3495beac
92 changed files with 1201 additions and 447 deletions
@@ -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/",