0

Remove jQuery and underscore dependencies

- replace $.each with .forEach
- replace _.each with .forEach
- replace _.isFunction with typeof comparison
This commit is contained in:
Richard Kuhnt
2018-06-13 20:11:46 +02:00
parent cd9a0d6c68
commit c6e674e6ce
3 changed files with 6 additions and 36 deletions

View File

@@ -249,7 +249,7 @@ overviewer.util = {
overviewer.coord_box = new overviewer.coordBoxClass(); overviewer.coord_box = new overviewer.coordBoxClass();
$.each(overviewerConfig.worlds, function(idx, world_name) { overviewerConfig.worlds.forEach(function(world_name, idx) {
overviewer.collections.mapTypes[world_name] = {} overviewer.collections.mapTypes[world_name] = {}
overviewer.collections.overlays[world_name] = {} overviewer.collections.overlays[world_name] = {}
overviewer.worldCtrl.addWorld(world_name); overviewer.worldCtrl.addWorld(world_name);
@@ -263,7 +263,7 @@ overviewer.util = {
overviewer.coord_box.render(ev.latlng); overviewer.coord_box.render(ev.latlng);
}); });
$.each(overviewerConfig.tilesets, function(idx, obj) { overviewerConfig.tilesets.forEach(function(obj, idx) {
var myLayer = new L.tileLayer('', { var myLayer = new L.tileLayer('', {
tileSize: overviewerConfig.CONST.tileSize, tileSize: overviewerConfig.CONST.tileSize,
noWrap: true, noWrap: true,
@@ -426,7 +426,7 @@ overviewer.util = {
* *
*/ */
'ready': function(callback){ 'ready': function(callback){
if (!callback || !_.isFunction(callback)) return; if (typeof callback !== 'function') return;
if (overviewer.util.isReady){ // run instantly if overviewer already is ready if (overviewer.util.isReady){ // run instantly if overviewer already is ready
overviewer.util.readyQueue.push(callback); overviewer.util.readyQueue.push(callback);
overviewer.util.runReadyQueue(); overviewer.util.runReadyQueue();
@@ -435,10 +435,11 @@ overviewer.util = {
} }
}, },
'runReadyQueue': function(){ 'runReadyQueue': function(){
_.each(overviewer.util.readyQueue, function(callback){ if(overviewer.util.readyQueue.length === 0) return;
overviewer.util.readyQueue.forEach(function(callback){
callback(); callback();
}); });
overviewer.util.readyQueue.length = 0; overviewer.util.readyQueue = [];
}, },
/** /**
* Quote an arbitrary string for use in a regex matcher. * Quote an arbitrary string for use in a regex matcher.

View File

@@ -8,8 +8,6 @@
<meta name="generator" content="Minecraft-Overviewer {version}" /> <meta name="generator" content="Minecraft-Overviewer {version}" />
<meta name="viewport" content="initial-scale=1.0, user-scalable=no" /> <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
<script type="text/javascript" src="jquery.min.js"></script>
<script type="text/javascript" src="overviewerConfig.js"></script> <script type="text/javascript" src="overviewerConfig.js"></script>
<script type="text/javascript" src="overviewer.js"></script> <script type="text/javascript" src="overviewer.js"></script>
<script type="text/javascript" src="baseMarkers.js"></script> <script type="text/javascript" src="baseMarkers.js"></script>

File diff suppressed because one or more lines are too long