Leaflet 1.x Support. #22
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mabhub
requested changes
Jun 22, 2018
| @@ -3,8 +3,8 @@ | |||
| <head> | |||
| <meta http-equiv="content-type" content="text/html; charset=UTF-8"> | |||
| <title>Leaflet.Spin</title> | |||
| <link rel="stylesheet" href="leaflet/dist/leaflet.css"> | |||
| <script src="leaflet/dist/leaflet.js" charset="utf-8"></script> | |||
There was a problem hiding this comment.
As example should be working without node_modules available (to work in Github Page, you can't use Leaflet from dependencies.
So the solution is, for the example page, calling Leaflet from a CDN (as I've done here: makinacorpus/Leaflet.MeasureControl@fac37b2).
| @@ -1,2 +1,2 @@ | |||
| !function(n,i){"function"==typeof define&&define.amd?define(["leaflet"],function(i){n(i)}):"object"==typeof exports?module.exports=function(i){return void 0===i&&(i=require("leaflet")),n(i),i}:"undefined"!=typeof i&&i.L&&n(i.L)}(function(n){var i={spin:function(n,i){n?(this._spinner||(this._spinner=new Spinner(i).spin(this._container),this._spinning=0),this._spinning++):(this._spinning--,this._spinning<=0&&this._spinner&&(this._spinner.stop(),this._spinner=null))}},t=function(){this.on("layeradd",function(n){n.layer.loading&&this.spin(!0),"function"==typeof n.layer.on&&(n.layer.on("data:loading",function(){this.spin(!0)},this),n.layer.on("data:loaded",function(){this.spin(!1)},this))},this),this.on("layerremove",function(n){n.layer.loading&&this.spin(!1),"function"==typeof n.layer.on&&(n.layer.off("data:loaded"),n.layer.off("data:loading"))},this)} | |||
| !function(n,i){"function"==typeof define&&define.amd?define(["leaflet"],function(i){n(i)}):"object"==typeof exports?module.exports=function(i){return void 0===i&&(i=require("leaflet")),n(i),i}:void 0!==i&&i.L&&n(i.L)}(function(n){var i={spin:function(n,i){n?(this._spinner||(this._spinner=new Spinner(i).spin(this._container),this._spinning=0),this._spinning++):--this._spinning<=0&&this._spinner&&(this._spinner.stop(),this._spinner=null)}},t=function(){this.on("layeradd",function(n){n.layer.loading&&this.spin(!0),"function"==typeof n.layer.on&&(n.layer.on("data:loading",function(){this.spin(!0)},this),n.layer.on("data:loaded",function(){this.spin(!1)},this))},this),this.on("layerremove",function(n){n.layer.loading&&this.spin(!1),"function"==typeof n.layer.on&&(n.layer.off("data:loaded"),n.layer.off("data:loading"))},this)} | |||
| n.Map.include(i),n.Map.addInitHook(t)},window) | |||
There was a problem hiding this comment.
Yo do not need to include leaflet.spin.min.js twice in sources. A symlink in example, linking the file from parent directory should make it.
| @@ -1,6 +1,6 @@ | |||
| { | |||
| "name": "leaflet-spin", | |||
| "version": "1.1.0", | |||
There was a problem hiding this comment.
As we try to follow semver recommendation, the kind of change in the PR may be at least a minor upgrade (not just a patch upgrade) because it's not just a patch of bugfix.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updated npm dependencies to work with Leaflet 1.x. This should address #18