From e371e897a7a67d96e5ba52d7e2a9e775ec4de0e5 Mon Sep 17 00:00:00 2001 From: Aaron Lidman Date: Wed, 18 Mar 2015 09:36:48 -0400 Subject: [PATCH] Use current.loader.next instead of self.next --- dist/bundle.js | 151 ++++++++++++++++++------------------- lib/loaders/keepright.js | 3 +- lib/loaders/unconnected.js | 6 +- 3 files changed, 77 insertions(+), 83 deletions(-) diff --git a/dist/bundle.js b/dist/bundle.js index a273f09..01e41e9 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -1,4 +1,4 @@ -(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o= N) return EOF; // special case: end of file\n if (eol) return eol = false, EOL; // special case: end of line\n\n // special case: quotes\n var j = I;\n if (text.charCodeAt(j) === 34) {\n var i = j;\n while (i++ < N) {\n if (text.charCodeAt(i) === 34) {\n if (text.charCodeAt(i + 1) !== 34) break;\n ++i;\n }\n }\n I = i + 2;\n var c = text.charCodeAt(i + 1);\n if (c === 13) {\n eol = true;\n if (text.charCodeAt(i + 2) === 10) ++I;\n } else if (c === 10) {\n eol = true;\n }\n return text.substring(j + 1, i).replace(/\"\"/g, \"\\\"\");\n }\n\n // common case: find next delimiter or newline\n while (I < N) {\n var c = text.charCodeAt(I++), k = 1;\n if (c === 10) eol = true; // \\n\n else if (c === 13) { eol = true; if (text.charCodeAt(I) === 10) ++I, ++k; } // \\r|\\r\\n\n else if (c !== delimiterCode) continue;\n return text.substring(j, I - k);\n }\n\n // special case: last token before EOF\n return text.substring(j);\n }\n\n while ((t = token()) !== EOF) {\n var a = [];\n while (t !== EOL && t !== EOF) {\n a.push(t);\n t = token();\n }\n if (f && !(a = f(a, n++))) continue;\n rows.push(a);\n }\n\n return rows;\n };\n\n dsv.format = function(rows) {\n if (Array.isArray(rows[0])) return dsv.formatRows(rows); // deprecated; use formatRows\n var fieldSet = {}, fields = [];\n\n // Compute unique fields in order of discovery.\n rows.forEach(function(row) {\n for (var field in row) {\n if (!(field in fieldSet)) {\n fields.push(fieldSet[field] = field);\n }\n }\n });\n\n return [fields.map(formatValue).join(delimiter)].concat(rows.map(function(row) {\n return fields.map(function(field) {\n return formatValue(row[field]);\n }).join(delimiter);\n })).join(\"\\n\");\n };\n\n dsv.formatRows = function(rows) {\n return rows.map(formatRow).join(\"\\n\");\n };\n\n function formatRow(row) {\n return row.map(formatValue).join(delimiter);\n }\n\n function formatValue(text) {\n return reFormat.test(text) ? \"\\\"\" + text.replace(/\\\"/g, \"\\\"\\\"\") + \"\\\"\" : text;\n }\n\n return dsv;\n}\n" + ";return dsv")(); -},{}],"/Users/aaron/totofix/node_modules/leaflet-omnivore/node_modules/csv2geojson/node_modules/sexagesimal/index.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/leaflet-omnivore/node_modules/csv2geojson/node_modules/sexagesimal/index.js":[function(require,module,exports){ module.exports = function(x, dims) { if (!dims) dims = 'NSEW'; if (typeof x !== 'string') return null; @@ -10618,7 +10615,7 @@ module.exports = function(x, dims) { ((m[4] && m[4] === 'S' || m[4] === 'W') ? -1 : 1); }; -},{}],"/Users/aaron/totofix/node_modules/leaflet-omnivore/node_modules/togeojson/togeojson.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/leaflet-omnivore/node_modules/togeojson/togeojson.js":[function(require,module,exports){ (function (process){ toGeoJSON = (function() { 'use strict'; @@ -10857,7 +10854,7 @@ toGeoJSON = (function() { if (typeof module !== 'undefined') module.exports = toGeoJSON; }).call(this,require('_process')) -},{"_process":"/Users/aaron/totofix/node_modules/watchify/node_modules/browserify/node_modules/process/browser.js","xmldom":"/Users/aaron/totofix/node_modules/watchify/node_modules/browserify/node_modules/browser-resolve/empty.js"}],"/Users/aaron/totofix/node_modules/leaflet-omnivore/node_modules/topojson/topojson.js":[function(require,module,exports){ +},{"_process":"/Users/aaron/to-fix/node_modules/watchify/node_modules/browserify/node_modules/process/browser.js","xmldom":"/Users/aaron/to-fix/node_modules/watchify/node_modules/browserify/node_modules/browser-resolve/empty.js"}],"/Users/aaron/to-fix/node_modules/leaflet-omnivore/node_modules/topojson/topojson.js":[function(require,module,exports){ !function() { var topojson = { version: "1.6.8", @@ -11391,7 +11388,7 @@ if (typeof module !== 'undefined') module.exports = toGeoJSON; else this.topojson = topojson; }(); -},{}],"/Users/aaron/totofix/node_modules/leaflet-omnivore/node_modules/wellknown/index.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/leaflet-omnivore/node_modules/wellknown/index.js":[function(require,module,exports){ module.exports = parse; module.exports.parse = parse; module.exports.stringify = stringify; @@ -11640,7 +11637,7 @@ function stringify(gj) { } } -},{}],"/Users/aaron/totofix/node_modules/leaflet-osm/leaflet-osm.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/leaflet-osm/leaflet-osm.js":[function(require,module,exports){ L.OSM = {}; L.OSM.TileLayer = L.TileLayer.extend({ @@ -11875,9 +11872,9 @@ L.Util.extend(L.OSM, { } }); -},{}],"/Users/aaron/totofix/node_modules/mapbox.js/node_modules/corslite/corslite.js":[function(require,module,exports){ -module.exports=require("/Users/aaron/totofix/node_modules/leaflet-omnivore/node_modules/corslite/corslite.js") -},{"/Users/aaron/totofix/node_modules/leaflet-omnivore/node_modules/corslite/corslite.js":"/Users/aaron/totofix/node_modules/leaflet-omnivore/node_modules/corslite/corslite.js"}],"/Users/aaron/totofix/node_modules/mapbox.js/node_modules/leaflet/dist/leaflet-src.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/mapbox.js/node_modules/corslite/corslite.js":[function(require,module,exports){ +module.exports=require("/Users/aaron/to-fix/node_modules/leaflet-omnivore/node_modules/corslite/corslite.js") +},{"/Users/aaron/to-fix/node_modules/leaflet-omnivore/node_modules/corslite/corslite.js":"/Users/aaron/to-fix/node_modules/leaflet-omnivore/node_modules/corslite/corslite.js"}],"/Users/aaron/to-fix/node_modules/mapbox.js/node_modules/leaflet/dist/leaflet-src.js":[function(require,module,exports){ /* Leaflet, a JavaScript library for mobile-friendly interactive maps. http://leafletjs.com (c) 2010-2013, Vladimir Agafonkin @@ -21058,7 +21055,7 @@ L.Map.include({ }(window, document)); -},{}],"/Users/aaron/totofix/node_modules/mapbox.js/node_modules/mustache/mustache.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/mapbox.js/node_modules/mustache/mustache.js":[function(require,module,exports){ /*! * mustache.js - Logic-less {{mustache}} templates with JavaScript * http://github.com/janl/mustache.js @@ -21611,7 +21608,7 @@ L.Map.include({ })); -},{}],"/Users/aaron/totofix/node_modules/mapbox.js/node_modules/sanitize-caja/index.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/mapbox.js/node_modules/sanitize-caja/index.js":[function(require,module,exports){ var html_sanitize = require('./sanitizer-bundle.js'); module.exports = function(_) { @@ -21631,7 +21628,7 @@ function cleanUrl(url) { function cleanId(id) { return id; } -},{"./sanitizer-bundle.js":"/Users/aaron/totofix/node_modules/mapbox.js/node_modules/sanitize-caja/sanitizer-bundle.js"}],"/Users/aaron/totofix/node_modules/mapbox.js/node_modules/sanitize-caja/sanitizer-bundle.js":[function(require,module,exports){ +},{"./sanitizer-bundle.js":"/Users/aaron/to-fix/node_modules/mapbox.js/node_modules/sanitize-caja/sanitizer-bundle.js"}],"/Users/aaron/to-fix/node_modules/mapbox.js/node_modules/sanitize-caja/sanitizer-bundle.js":[function(require,module,exports){ // Copyright (C) 2010 Google Inc. // @@ -24079,7 +24076,7 @@ if (typeof module !== 'undefined') { module.exports = html_sanitize; } -},{}],"/Users/aaron/totofix/node_modules/mapbox.js/package.json":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/mapbox.js/package.json":[function(require,module,exports){ module.exports={ "author": { "name": "Mapbox" @@ -24127,7 +24124,7 @@ module.exports={ }, "_id": "mapbox.js@2.1.5", "_shasum": "065a7c4e5a7ff949a01842fa24d6dfb69b6c50c4", - "_from": "mapbox.js@>=2.1.5-0 <3.0.0-0", + "_from": "mapbox.js@2.1.5", "_npmVersion": "2.1.6", "_nodeVersion": "0.10.33", "_npmUser": { @@ -24273,7 +24270,7 @@ module.exports={ "readme": "ERROR: No README data found!" } -},{}],"/Users/aaron/totofix/node_modules/mapbox.js/src/config.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/mapbox.js/src/config.js":[function(require,module,exports){ 'use strict'; module.exports = { @@ -24283,7 +24280,7 @@ module.exports = { REQUIRE_ACCESS_TOKEN: true }; -},{}],"/Users/aaron/totofix/node_modules/mapbox.js/src/feature_layer.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/mapbox.js/src/feature_layer.js":[function(require,module,exports){ 'use strict'; var util = require('./util'), @@ -24400,7 +24397,7 @@ module.exports.featureLayer = function(_, options) { return new FeatureLayer(_, options); }; -},{"./marker":"/Users/aaron/totofix/node_modules/mapbox.js/src/marker.js","./request":"/Users/aaron/totofix/node_modules/mapbox.js/src/request.js","./simplestyle":"/Users/aaron/totofix/node_modules/mapbox.js/src/simplestyle.js","./url":"/Users/aaron/totofix/node_modules/mapbox.js/src/url.js","./util":"/Users/aaron/totofix/node_modules/mapbox.js/src/util.js","sanitize-caja":"/Users/aaron/totofix/node_modules/mapbox.js/node_modules/sanitize-caja/index.js"}],"/Users/aaron/totofix/node_modules/mapbox.js/src/geocoder.js":[function(require,module,exports){ +},{"./marker":"/Users/aaron/to-fix/node_modules/mapbox.js/src/marker.js","./request":"/Users/aaron/to-fix/node_modules/mapbox.js/src/request.js","./simplestyle":"/Users/aaron/to-fix/node_modules/mapbox.js/src/simplestyle.js","./url":"/Users/aaron/to-fix/node_modules/mapbox.js/src/url.js","./util":"/Users/aaron/to-fix/node_modules/mapbox.js/src/util.js","sanitize-caja":"/Users/aaron/to-fix/node_modules/mapbox.js/node_modules/sanitize-caja/index.js"}],"/Users/aaron/to-fix/node_modules/mapbox.js/src/geocoder.js":[function(require,module,exports){ 'use strict'; var util = require('./util'), @@ -24499,7 +24496,7 @@ module.exports = function(url, options) { return geocoder; }; -},{"./request":"/Users/aaron/totofix/node_modules/mapbox.js/src/request.js","./url":"/Users/aaron/totofix/node_modules/mapbox.js/src/url.js","./util":"/Users/aaron/totofix/node_modules/mapbox.js/src/util.js"}],"/Users/aaron/totofix/node_modules/mapbox.js/src/geocoder_control.js":[function(require,module,exports){ +},{"./request":"/Users/aaron/to-fix/node_modules/mapbox.js/src/request.js","./url":"/Users/aaron/to-fix/node_modules/mapbox.js/src/url.js","./util":"/Users/aaron/to-fix/node_modules/mapbox.js/src/util.js"}],"/Users/aaron/to-fix/node_modules/mapbox.js/src/geocoder_control.js":[function(require,module,exports){ 'use strict'; var geocoder = require('./geocoder'), @@ -24691,7 +24688,7 @@ module.exports.geocoderControl = function(_, options) { return new GeocoderControl(_, options); }; -},{"./geocoder":"/Users/aaron/totofix/node_modules/mapbox.js/src/geocoder.js","./util":"/Users/aaron/totofix/node_modules/mapbox.js/src/util.js"}],"/Users/aaron/totofix/node_modules/mapbox.js/src/grid.js":[function(require,module,exports){ +},{"./geocoder":"/Users/aaron/to-fix/node_modules/mapbox.js/src/geocoder.js","./util":"/Users/aaron/to-fix/node_modules/mapbox.js/src/util.js"}],"/Users/aaron/to-fix/node_modules/mapbox.js/src/grid.js":[function(require,module,exports){ 'use strict'; function utfDecode(c) { @@ -24709,7 +24706,7 @@ module.exports = function(data) { }; }; -},{}],"/Users/aaron/totofix/node_modules/mapbox.js/src/grid_control.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/mapbox.js/src/grid_control.js":[function(require,module,exports){ 'use strict'; var util = require('./util'), @@ -24909,7 +24906,7 @@ module.exports.gridControl = function(_, options) { return new GridControl(_, options); }; -},{"./util":"/Users/aaron/totofix/node_modules/mapbox.js/src/util.js","mustache":"/Users/aaron/totofix/node_modules/mapbox.js/node_modules/mustache/mustache.js","sanitize-caja":"/Users/aaron/totofix/node_modules/mapbox.js/node_modules/sanitize-caja/index.js"}],"/Users/aaron/totofix/node_modules/mapbox.js/src/grid_layer.js":[function(require,module,exports){ +},{"./util":"/Users/aaron/to-fix/node_modules/mapbox.js/src/util.js","mustache":"/Users/aaron/to-fix/node_modules/mapbox.js/node_modules/mustache/mustache.js","sanitize-caja":"/Users/aaron/to-fix/node_modules/mapbox.js/node_modules/sanitize-caja/index.js"}],"/Users/aaron/to-fix/node_modules/mapbox.js/src/grid_layer.js":[function(require,module,exports){ 'use strict'; var util = require('./util'), @@ -25134,11 +25131,11 @@ module.exports.gridLayer = function(_, options) { return new GridLayer(_, options); }; -},{"./grid":"/Users/aaron/totofix/node_modules/mapbox.js/src/grid.js","./load_tilejson":"/Users/aaron/totofix/node_modules/mapbox.js/src/load_tilejson.js","./request":"/Users/aaron/totofix/node_modules/mapbox.js/src/request.js","./util":"/Users/aaron/totofix/node_modules/mapbox.js/src/util.js"}],"/Users/aaron/totofix/node_modules/mapbox.js/src/index.js":[function(require,module,exports){ +},{"./grid":"/Users/aaron/to-fix/node_modules/mapbox.js/src/grid.js","./load_tilejson":"/Users/aaron/to-fix/node_modules/mapbox.js/src/load_tilejson.js","./request":"/Users/aaron/to-fix/node_modules/mapbox.js/src/request.js","./util":"/Users/aaron/to-fix/node_modules/mapbox.js/src/util.js"}],"/Users/aaron/to-fix/node_modules/mapbox.js/src/index.js":[function(require,module,exports){ require('./leaflet'); require('./mapbox'); -},{"./leaflet":"/Users/aaron/totofix/node_modules/mapbox.js/src/leaflet.js","./mapbox":"/Users/aaron/totofix/node_modules/mapbox.js/src/mapbox.js"}],"/Users/aaron/totofix/node_modules/mapbox.js/src/info_control.js":[function(require,module,exports){ +},{"./leaflet":"/Users/aaron/to-fix/node_modules/mapbox.js/src/leaflet.js","./mapbox":"/Users/aaron/to-fix/node_modules/mapbox.js/src/mapbox.js"}],"/Users/aaron/to-fix/node_modules/mapbox.js/src/info_control.js":[function(require,module,exports){ 'use strict'; var InfoControl = L.Control.extend({ @@ -25254,10 +25251,10 @@ module.exports.infoControl = function(options) { return new InfoControl(options); }; -},{"sanitize-caja":"/Users/aaron/totofix/node_modules/mapbox.js/node_modules/sanitize-caja/index.js"}],"/Users/aaron/totofix/node_modules/mapbox.js/src/leaflet.js":[function(require,module,exports){ +},{"sanitize-caja":"/Users/aaron/to-fix/node_modules/mapbox.js/node_modules/sanitize-caja/index.js"}],"/Users/aaron/to-fix/node_modules/mapbox.js/src/leaflet.js":[function(require,module,exports){ window.L = require('leaflet/dist/leaflet-src'); -},{"leaflet/dist/leaflet-src":"/Users/aaron/totofix/node_modules/mapbox.js/node_modules/leaflet/dist/leaflet-src.js"}],"/Users/aaron/totofix/node_modules/mapbox.js/src/legend_control.js":[function(require,module,exports){ +},{"leaflet/dist/leaflet-src":"/Users/aaron/to-fix/node_modules/mapbox.js/node_modules/leaflet/dist/leaflet-src.js"}],"/Users/aaron/to-fix/node_modules/mapbox.js/src/legend_control.js":[function(require,module,exports){ 'use strict'; var LegendControl = L.Control.extend({ @@ -25326,7 +25323,7 @@ module.exports.legendControl = function(options) { return new LegendControl(options); }; -},{"sanitize-caja":"/Users/aaron/totofix/node_modules/mapbox.js/node_modules/sanitize-caja/index.js"}],"/Users/aaron/totofix/node_modules/mapbox.js/src/load_tilejson.js":[function(require,module,exports){ +},{"sanitize-caja":"/Users/aaron/to-fix/node_modules/mapbox.js/node_modules/sanitize-caja/index.js"}],"/Users/aaron/to-fix/node_modules/mapbox.js/src/load_tilejson.js":[function(require,module,exports){ 'use strict'; var request = require('./request'), @@ -25352,7 +25349,7 @@ module.exports = { } }; -},{"./request":"/Users/aaron/totofix/node_modules/mapbox.js/src/request.js","./url":"/Users/aaron/totofix/node_modules/mapbox.js/src/url.js","./util":"/Users/aaron/totofix/node_modules/mapbox.js/src/util.js"}],"/Users/aaron/totofix/node_modules/mapbox.js/src/map.js":[function(require,module,exports){ +},{"./request":"/Users/aaron/to-fix/node_modules/mapbox.js/src/request.js","./url":"/Users/aaron/to-fix/node_modules/mapbox.js/src/url.js","./util":"/Users/aaron/to-fix/node_modules/mapbox.js/src/util.js"}],"/Users/aaron/to-fix/node_modules/mapbox.js/src/map.js":[function(require,module,exports){ 'use strict'; var util = require('./util'), @@ -25539,7 +25536,7 @@ module.exports.map = function(element, _, options) { return new LMap(element, _, options); }; -},{"./feature_layer":"/Users/aaron/totofix/node_modules/mapbox.js/src/feature_layer.js","./grid_control":"/Users/aaron/totofix/node_modules/mapbox.js/src/grid_control.js","./grid_layer":"/Users/aaron/totofix/node_modules/mapbox.js/src/grid_layer.js","./info_control":"/Users/aaron/totofix/node_modules/mapbox.js/src/info_control.js","./legend_control":"/Users/aaron/totofix/node_modules/mapbox.js/src/legend_control.js","./load_tilejson":"/Users/aaron/totofix/node_modules/mapbox.js/src/load_tilejson.js","./mapbox_logo":"/Users/aaron/totofix/node_modules/mapbox.js/src/mapbox_logo.js","./share_control":"/Users/aaron/totofix/node_modules/mapbox.js/src/share_control.js","./tile_layer":"/Users/aaron/totofix/node_modules/mapbox.js/src/tile_layer.js","./util":"/Users/aaron/totofix/node_modules/mapbox.js/src/util.js"}],"/Users/aaron/totofix/node_modules/mapbox.js/src/mapbox.js":[function(require,module,exports){ +},{"./feature_layer":"/Users/aaron/to-fix/node_modules/mapbox.js/src/feature_layer.js","./grid_control":"/Users/aaron/to-fix/node_modules/mapbox.js/src/grid_control.js","./grid_layer":"/Users/aaron/to-fix/node_modules/mapbox.js/src/grid_layer.js","./info_control":"/Users/aaron/to-fix/node_modules/mapbox.js/src/info_control.js","./legend_control":"/Users/aaron/to-fix/node_modules/mapbox.js/src/legend_control.js","./load_tilejson":"/Users/aaron/to-fix/node_modules/mapbox.js/src/load_tilejson.js","./mapbox_logo":"/Users/aaron/to-fix/node_modules/mapbox.js/src/mapbox_logo.js","./share_control":"/Users/aaron/to-fix/node_modules/mapbox.js/src/share_control.js","./tile_layer":"/Users/aaron/to-fix/node_modules/mapbox.js/src/tile_layer.js","./util":"/Users/aaron/to-fix/node_modules/mapbox.js/src/util.js"}],"/Users/aaron/to-fix/node_modules/mapbox.js/src/mapbox.js":[function(require,module,exports){ 'use strict'; var geocoderControl = require('./geocoder_control'), @@ -25591,7 +25588,7 @@ window.L.Icon.Default.imagePath = '//api.tiles.mapbox.com/mapbox.js/' + 'v' + require('../package.json').version + '/images'; -},{"../package.json":"/Users/aaron/totofix/node_modules/mapbox.js/package.json","./config":"/Users/aaron/totofix/node_modules/mapbox.js/src/config.js","./feature_layer":"/Users/aaron/totofix/node_modules/mapbox.js/src/feature_layer.js","./geocoder":"/Users/aaron/totofix/node_modules/mapbox.js/src/geocoder.js","./geocoder_control":"/Users/aaron/totofix/node_modules/mapbox.js/src/geocoder_control.js","./grid_control":"/Users/aaron/totofix/node_modules/mapbox.js/src/grid_control.js","./grid_layer":"/Users/aaron/totofix/node_modules/mapbox.js/src/grid_layer.js","./info_control":"/Users/aaron/totofix/node_modules/mapbox.js/src/info_control.js","./legend_control":"/Users/aaron/totofix/node_modules/mapbox.js/src/legend_control.js","./map":"/Users/aaron/totofix/node_modules/mapbox.js/src/map.js","./marker":"/Users/aaron/totofix/node_modules/mapbox.js/src/marker.js","./share_control":"/Users/aaron/totofix/node_modules/mapbox.js/src/share_control.js","./simplestyle":"/Users/aaron/totofix/node_modules/mapbox.js/src/simplestyle.js","./tile_layer":"/Users/aaron/totofix/node_modules/mapbox.js/src/tile_layer.js","mustache":"/Users/aaron/totofix/node_modules/mapbox.js/node_modules/mustache/mustache.js","sanitize-caja":"/Users/aaron/totofix/node_modules/mapbox.js/node_modules/sanitize-caja/index.js"}],"/Users/aaron/totofix/node_modules/mapbox.js/src/mapbox_logo.js":[function(require,module,exports){ +},{"../package.json":"/Users/aaron/to-fix/node_modules/mapbox.js/package.json","./config":"/Users/aaron/to-fix/node_modules/mapbox.js/src/config.js","./feature_layer":"/Users/aaron/to-fix/node_modules/mapbox.js/src/feature_layer.js","./geocoder":"/Users/aaron/to-fix/node_modules/mapbox.js/src/geocoder.js","./geocoder_control":"/Users/aaron/to-fix/node_modules/mapbox.js/src/geocoder_control.js","./grid_control":"/Users/aaron/to-fix/node_modules/mapbox.js/src/grid_control.js","./grid_layer":"/Users/aaron/to-fix/node_modules/mapbox.js/src/grid_layer.js","./info_control":"/Users/aaron/to-fix/node_modules/mapbox.js/src/info_control.js","./legend_control":"/Users/aaron/to-fix/node_modules/mapbox.js/src/legend_control.js","./map":"/Users/aaron/to-fix/node_modules/mapbox.js/src/map.js","./marker":"/Users/aaron/to-fix/node_modules/mapbox.js/src/marker.js","./share_control":"/Users/aaron/to-fix/node_modules/mapbox.js/src/share_control.js","./simplestyle":"/Users/aaron/to-fix/node_modules/mapbox.js/src/simplestyle.js","./tile_layer":"/Users/aaron/to-fix/node_modules/mapbox.js/src/tile_layer.js","mustache":"/Users/aaron/to-fix/node_modules/mapbox.js/node_modules/mustache/mustache.js","sanitize-caja":"/Users/aaron/to-fix/node_modules/mapbox.js/node_modules/sanitize-caja/index.js"}],"/Users/aaron/to-fix/node_modules/mapbox.js/src/mapbox_logo.js":[function(require,module,exports){ 'use strict'; var MapboxLogoControl = L.Control.extend({ @@ -25625,7 +25622,7 @@ module.exports.mapboxLogoControl = function(options) { return new MapboxLogoControl(options); }; -},{}],"/Users/aaron/totofix/node_modules/mapbox.js/src/marker.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/mapbox.js/src/marker.js":[function(require,module,exports){ 'use strict'; var url = require('./url'), @@ -25692,7 +25689,7 @@ module.exports = { createPopup: createPopup }; -},{"./url":"/Users/aaron/totofix/node_modules/mapbox.js/src/url.js","./util":"/Users/aaron/totofix/node_modules/mapbox.js/src/util.js","sanitize-caja":"/Users/aaron/totofix/node_modules/mapbox.js/node_modules/sanitize-caja/index.js"}],"/Users/aaron/totofix/node_modules/mapbox.js/src/request.js":[function(require,module,exports){ +},{"./url":"/Users/aaron/to-fix/node_modules/mapbox.js/src/url.js","./util":"/Users/aaron/to-fix/node_modules/mapbox.js/src/util.js","sanitize-caja":"/Users/aaron/to-fix/node_modules/mapbox.js/node_modules/sanitize-caja/index.js"}],"/Users/aaron/to-fix/node_modules/mapbox.js/src/request.js":[function(require,module,exports){ 'use strict'; var corslite = require('corslite'), @@ -25724,7 +25721,7 @@ module.exports = function(url, callback) { } }; -},{"./config":"/Users/aaron/totofix/node_modules/mapbox.js/src/config.js","./util":"/Users/aaron/totofix/node_modules/mapbox.js/src/util.js","corslite":"/Users/aaron/totofix/node_modules/mapbox.js/node_modules/corslite/corslite.js"}],"/Users/aaron/totofix/node_modules/mapbox.js/src/share_control.js":[function(require,module,exports){ +},{"./config":"/Users/aaron/to-fix/node_modules/mapbox.js/src/config.js","./util":"/Users/aaron/to-fix/node_modules/mapbox.js/src/util.js","corslite":"/Users/aaron/to-fix/node_modules/mapbox.js/node_modules/corslite/corslite.js"}],"/Users/aaron/to-fix/node_modules/mapbox.js/src/share_control.js":[function(require,module,exports){ 'use strict'; var urlhelper = require('./url'); @@ -25827,7 +25824,7 @@ module.exports.shareControl = function(_, options) { return new ShareControl(_, options); }; -},{"./load_tilejson":"/Users/aaron/totofix/node_modules/mapbox.js/src/load_tilejson.js","./url":"/Users/aaron/totofix/node_modules/mapbox.js/src/url.js"}],"/Users/aaron/totofix/node_modules/mapbox.js/src/simplestyle.js":[function(require,module,exports){ +},{"./load_tilejson":"/Users/aaron/to-fix/node_modules/mapbox.js/src/load_tilejson.js","./url":"/Users/aaron/to-fix/node_modules/mapbox.js/src/url.js"}],"/Users/aaron/to-fix/node_modules/mapbox.js/src/simplestyle.js":[function(require,module,exports){ 'use strict'; // an implementation of the simplestyle spec for polygon and linestring features @@ -25874,7 +25871,7 @@ module.exports = { defaults: defaults }; -},{}],"/Users/aaron/totofix/node_modules/mapbox.js/src/tile_layer.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/mapbox.js/src/tile_layer.js":[function(require,module,exports){ 'use strict'; var util = require('./util'); @@ -25970,7 +25967,7 @@ module.exports.tileLayer = function(_, options) { return new TileLayer(_, options); }; -},{"./load_tilejson":"/Users/aaron/totofix/node_modules/mapbox.js/src/load_tilejson.js","./util":"/Users/aaron/totofix/node_modules/mapbox.js/src/util.js"}],"/Users/aaron/totofix/node_modules/mapbox.js/src/url.js":[function(require,module,exports){ +},{"./load_tilejson":"/Users/aaron/to-fix/node_modules/mapbox.js/src/load_tilejson.js","./util":"/Users/aaron/to-fix/node_modules/mapbox.js/src/util.js"}],"/Users/aaron/to-fix/node_modules/mapbox.js/src/url.js":[function(require,module,exports){ 'use strict'; var config = require('./config'), @@ -26014,7 +26011,7 @@ module.exports.tileJSON = function(urlOrMapID, accessToken) { return url; }; -},{"../package.json":"/Users/aaron/totofix/node_modules/mapbox.js/package.json","./config":"/Users/aaron/totofix/node_modules/mapbox.js/src/config.js"}],"/Users/aaron/totofix/node_modules/mapbox.js/src/util.js":[function(require,module,exports){ +},{"../package.json":"/Users/aaron/to-fix/node_modules/mapbox.js/package.json","./config":"/Users/aaron/to-fix/node_modules/mapbox.js/src/config.js"}],"/Users/aaron/to-fix/node_modules/mapbox.js/src/util.js":[function(require,module,exports){ 'use strict'; module.exports = { @@ -26061,7 +26058,7 @@ function contains(item, list) { return false; } -},{}],"/Users/aaron/totofix/node_modules/mousetrap/mousetrap.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/mousetrap/mousetrap.js":[function(require,module,exports){ /** * Copyright 2012 Craig Campbell * @@ -26862,7 +26859,7 @@ function contains(item, list) { module.exports = mousetrap; -},{}],"/Users/aaron/totofix/node_modules/osm-auth/index.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/osm-auth/index.js":[function(require,module,exports){ 'use strict'; var ohauth = require('ohauth'), @@ -27122,7 +27119,7 @@ module.exports = function(o) { return oauth; }; -},{"ohauth":"/Users/aaron/totofix/node_modules/osm-auth/node_modules/ohauth/index.js","store":"/Users/aaron/totofix/node_modules/store/store.js","xtend":"/Users/aaron/totofix/node_modules/osm-auth/node_modules/xtend/index.js"}],"/Users/aaron/totofix/node_modules/osm-auth/node_modules/ohauth/index.js":[function(require,module,exports){ +},{"ohauth":"/Users/aaron/to-fix/node_modules/osm-auth/node_modules/ohauth/index.js","store":"/Users/aaron/to-fix/node_modules/store/store.js","xtend":"/Users/aaron/to-fix/node_modules/osm-auth/node_modules/xtend/index.js"}],"/Users/aaron/to-fix/node_modules/osm-auth/node_modules/ohauth/index.js":[function(require,module,exports){ 'use strict'; var hashes = require('jshashes'), @@ -27261,7 +27258,7 @@ ohauth.headerGenerator = function(options) { module.exports = ohauth; -},{"jshashes":"/Users/aaron/totofix/node_modules/osm-auth/node_modules/ohauth/node_modules/jshashes/hashes.js","xtend":"/Users/aaron/totofix/node_modules/osm-auth/node_modules/xtend/index.js"}],"/Users/aaron/totofix/node_modules/osm-auth/node_modules/ohauth/node_modules/jshashes/hashes.js":[function(require,module,exports){ +},{"jshashes":"/Users/aaron/to-fix/node_modules/osm-auth/node_modules/ohauth/node_modules/jshashes/hashes.js","xtend":"/Users/aaron/to-fix/node_modules/osm-auth/node_modules/xtend/index.js"}],"/Users/aaron/to-fix/node_modules/osm-auth/node_modules/ohauth/node_modules/jshashes/hashes.js":[function(require,module,exports){ (function (global){ /** * jshashes - https://github.com/h2non/jshashes @@ -29030,7 +29027,7 @@ module.exports = ohauth; }()); // IIFE }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) -},{}],"/Users/aaron/totofix/node_modules/osm-auth/node_modules/xtend/has-keys.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/osm-auth/node_modules/xtend/has-keys.js":[function(require,module,exports){ module.exports = hasKeys function hasKeys(source) { @@ -29039,7 +29036,7 @@ function hasKeys(source) { typeof source === "function") } -},{}],"/Users/aaron/totofix/node_modules/osm-auth/node_modules/xtend/index.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/osm-auth/node_modules/xtend/index.js":[function(require,module,exports){ var Keys = require("object-keys") var hasKeys = require("./has-keys") @@ -29066,11 +29063,11 @@ function extend() { return target } -},{"./has-keys":"/Users/aaron/totofix/node_modules/osm-auth/node_modules/xtend/has-keys.js","object-keys":"/Users/aaron/totofix/node_modules/osm-auth/node_modules/xtend/node_modules/object-keys/index.js"}],"/Users/aaron/totofix/node_modules/osm-auth/node_modules/xtend/node_modules/object-keys/index.js":[function(require,module,exports){ +},{"./has-keys":"/Users/aaron/to-fix/node_modules/osm-auth/node_modules/xtend/has-keys.js","object-keys":"/Users/aaron/to-fix/node_modules/osm-auth/node_modules/xtend/node_modules/object-keys/index.js"}],"/Users/aaron/to-fix/node_modules/osm-auth/node_modules/xtend/node_modules/object-keys/index.js":[function(require,module,exports){ module.exports = Object.keys || require('./shim'); -},{"./shim":"/Users/aaron/totofix/node_modules/osm-auth/node_modules/xtend/node_modules/object-keys/shim.js"}],"/Users/aaron/totofix/node_modules/osm-auth/node_modules/xtend/node_modules/object-keys/node_modules/foreach/index.js":[function(require,module,exports){ +},{"./shim":"/Users/aaron/to-fix/node_modules/osm-auth/node_modules/xtend/node_modules/object-keys/shim.js"}],"/Users/aaron/to-fix/node_modules/osm-auth/node_modules/xtend/node_modules/object-keys/node_modules/foreach/index.js":[function(require,module,exports){ var hasOwn = Object.prototype.hasOwnProperty; var toString = Object.prototype.toString; @@ -29094,7 +29091,7 @@ module.exports = function forEach (obj, fn, ctx) { }; -},{}],"/Users/aaron/totofix/node_modules/osm-auth/node_modules/xtend/node_modules/object-keys/node_modules/is/index.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/osm-auth/node_modules/xtend/node_modules/object-keys/node_modules/is/index.js":[function(require,module,exports){ /**! * is @@ -29798,7 +29795,7 @@ is.string = function (value) { }; -},{}],"/Users/aaron/totofix/node_modules/osm-auth/node_modules/xtend/node_modules/object-keys/shim.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/osm-auth/node_modules/xtend/node_modules/object-keys/shim.js":[function(require,module,exports){ (function () { "use strict"; @@ -29844,7 +29841,7 @@ is.string = function (value) { }()); -},{"foreach":"/Users/aaron/totofix/node_modules/osm-auth/node_modules/xtend/node_modules/object-keys/node_modules/foreach/index.js","is":"/Users/aaron/totofix/node_modules/osm-auth/node_modules/xtend/node_modules/object-keys/node_modules/is/index.js"}],"/Users/aaron/totofix/node_modules/raven-js/dist/raven.js":[function(require,module,exports){ +},{"foreach":"/Users/aaron/to-fix/node_modules/osm-auth/node_modules/xtend/node_modules/object-keys/node_modules/foreach/index.js","is":"/Users/aaron/to-fix/node_modules/osm-auth/node_modules/xtend/node_modules/object-keys/node_modules/is/index.js"}],"/Users/aaron/to-fix/node_modules/raven-js/dist/raven.js":[function(require,module,exports){ /*! Raven.js 1.1.17 (aa35178) | github.com/getsentry/raven-js */ /* @@ -31717,7 +31714,7 @@ if (typeof define === 'function' && define.amd) { })(window); -},{}],"/Users/aaron/totofix/node_modules/store/store.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/store/store.js":[function(require,module,exports){ ;(function(win){ var store = {}, doc = win.document, @@ -31894,7 +31891,7 @@ if (typeof define === 'function' && define.amd) { })(Function('return this')()); -},{}],"/Users/aaron/totofix/node_modules/underscore/underscore.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/underscore/underscore.js":[function(require,module,exports){ // Underscore.js 1.8.2 // http://underscorejs.org // (c) 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors @@ -33432,9 +33429,9 @@ if (typeof define === 'function' && define.amd) { } }.call(this)); -},{}],"/Users/aaron/totofix/node_modules/watchify/node_modules/browserify/node_modules/browser-resolve/empty.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/watchify/node_modules/browserify/node_modules/browser-resolve/empty.js":[function(require,module,exports){ -},{}],"/Users/aaron/totofix/node_modules/watchify/node_modules/browserify/node_modules/process/browser.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/watchify/node_modules/browserify/node_modules/process/browser.js":[function(require,module,exports){ // shim for using process in browser var process = module.exports = {}; @@ -33499,7 +33496,7 @@ process.chdir = function (dir) { throw new Error('process.chdir is not supported'); }; -},{}],"/Users/aaron/totofix/node_modules/watchify/node_modules/browserify/node_modules/querystring-es3/decode.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/watchify/node_modules/browserify/node_modules/querystring-es3/decode.js":[function(require,module,exports){ // Copyright Joyent, Inc. and other Node contributors. // // Permission is hereby granted, free of charge, to any person obtaining a @@ -33585,7 +33582,7 @@ var isArray = Array.isArray || function (xs) { return Object.prototype.toString.call(xs) === '[object Array]'; }; -},{}],"/Users/aaron/totofix/node_modules/watchify/node_modules/browserify/node_modules/querystring-es3/encode.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/watchify/node_modules/browserify/node_modules/querystring-es3/encode.js":[function(require,module,exports){ // Copyright Joyent, Inc. and other Node contributors. // // Permission is hereby granted, free of charge, to any person obtaining a @@ -33672,10 +33669,10 @@ var objectKeys = Object.keys || function (obj) { return res; }; -},{}],"/Users/aaron/totofix/node_modules/watchify/node_modules/browserify/node_modules/querystring-es3/index.js":[function(require,module,exports){ +},{}],"/Users/aaron/to-fix/node_modules/watchify/node_modules/browserify/node_modules/querystring-es3/index.js":[function(require,module,exports){ 'use strict'; exports.decode = exports.parse = require('./decode'); exports.encode = exports.stringify = require('./encode'); -},{"./decode":"/Users/aaron/totofix/node_modules/watchify/node_modules/browserify/node_modules/querystring-es3/decode.js","./encode":"/Users/aaron/totofix/node_modules/watchify/node_modules/browserify/node_modules/querystring-es3/encode.js"}]},{},["/Users/aaron/totofix/index.js"]); +},{"./decode":"/Users/aaron/to-fix/node_modules/watchify/node_modules/browserify/node_modules/querystring-es3/decode.js","./encode":"/Users/aaron/to-fix/node_modules/watchify/node_modules/browserify/node_modules/querystring-es3/encode.js"}]},{},["/Users/aaron/to-fix/index.js"]); diff --git a/lib/loaders/keepright.js b/lib/loaders/keepright.js index 795f7aa..7f83574 100644 --- a/lib/loaders/keepright.js +++ b/lib/loaders/keepright.js @@ -39,8 +39,7 @@ module.exports = { $(window.map.getContainer()).removeClass('loading'); }, error: function(err) { - if (err) window.console.warn(err); - return self.next(); + return window.current.loader.next(); } }); }); diff --git a/lib/loaders/unconnected.js b/lib/loaders/unconnected.js index 737e664..d73f357 100644 --- a/lib/loaders/unconnected.js +++ b/lib/loaders/unconnected.js @@ -40,14 +40,12 @@ module.exports = { layer = new L.OSM.DataLayer(xml).setStyle(window.featureStyle).addTo(window.featureGroup); }, error: function(err) { - if (err) window.console.warn(err); - return self.next(); + return window.current.loader.next(); } }); }, error: function(err) { - if (err) window.console.warn(err); - return self.next(); + return window.current.loader.next(); } }); });