remove jquery dependencies

simonebt92 · Jul 18, 2017 · 5d776fd · 5d776fd
1 parent bf37576
commit 5d776fd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/example/main.js b/example/main.js
@@ -1,16 +1,14 @@
-var wwd;
 var markerClusterUSCities;
-var cluster;
-var layerManager;
 requirejs(['../libraries/WorldWind/WorldWind',
-        'js/LayerManager', '../src/MarkerCluster'],
+        '../example/js/LayerManager', '../src/MarkerCluster'],
     function (ww,
               LayerManager, MarkerCluster) {
         "use strict";
 
+
         WorldWind.Logger.setLoggingLevel(WorldWind.Logger.LEVEL_WARNING);
-        WorldWind.configuration.baseUrl = "libraries/WorldWind/"
-        wwd = new WorldWind.WorldWindow("canvasOne");
+        WorldWind.configuration.baseUrl = "libraries/WorldWind/";
+        var wwd = new WorldWind.WorldWindow("canvasOne");
 
         var layers = [
             {layer: new WorldWind.BingAerialWithLabelsLayer(null), enabled: true},
@@ -62,7 +60,11 @@ requirejs(['../libraries/WorldWind/WorldWind',
          });
          */
 
-        markerClusterUSCities = new MarkerCluster(wwd, {name: "US Cities", controls: viewControlsLayer, maxLevel: 7});
+        markerClusterUSCities = new MarkerCluster(wwd, {
+            name: "US Cities",
+            controls: viewControlsLayer,
+            maxLevel: 7
+        });
 
         getJSON('example/usCities.json', function (results) {
             results.forEach(function (city) {
@@ -88,7 +90,8 @@ requirejs(['../libraries/WorldWind/WorldWind',
         markerClusterAllGlobe.generateCluster();
         markerClusterAllGlobe.off();
 
-        layerManager = new LayerManager(wwd);
+        var layerManager = new LayerManager(wwd);
+
         function getJSON(url, callback) {
             var xhr = new XMLHttpRequest();
             xhr.open('GET', url, true);

diff --git a/index.html b/index.html
@@ -9,7 +9,6 @@
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js" type="text/javascript"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
-    <!--<script src="../libraries/supercluster.min.js"></script>-->
     <script data-main="example/main" src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.17/require.min.js"></script>
 </head>
 <body>

diff --git a/src/MarkerCluster.js b/src/MarkerCluster.js
@@ -265,8 +265,9 @@ define(['../libraries/supercluster.min', '../libraries/WorldWind/WorldWind'], fu
      * @param level: Integer. Current level of the camera (matched clusters levels)
      */
     MarkerCluster.prototype.showInRange = function (level) {
-        var h = $("#canvasOne").height();
-        var w = $("#canvasOne").width();
+        var h = document.getElementById("canvasOne").height;
+        var w = document.getElementById("canvasOne").width;
+        var wwd = this.globe;
         if (wwd.pickTerrain(new WorldWind.Vec2(w / 2, h / 2)).objects) {
 
             var center = wwd.pickTerrain(new WorldWind.Vec2(w / 2, h / 2));