Thanks to visit codestin.com
Credit goes to github.com

Skip to content

use unpkg for all non http marker locations #544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 15, 2018
Merged

use unpkg for all non http marker locations #544

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
71259aa
use unpkg for all non http marker locations
schloerke May 11, 2018
cf23829
added news
schloerke May 11, 2018
236f51b
docs/
schloerke May 14, 2018
bad26de
make sure to install leaflet before making docs
schloerke May 15, 2018
01632fe
Merge branch 'master' into default_image_src
schloerke May 15, 2018
fe89dc2
docs_update
schloerke May 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
docs_update
  • Loading branch information
@schloerke
schloerke committed May 15, 2018
commit fe89dc2e0dff4cb18333ff59e3d48cd4acd29065
2 changes: 0 additions & 2 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ leaflet 2.0.0.9000
BUG FIXES

* Default marker icon locations will now use unpkg.com instead of the leaflet cdn when using https or file protocols. (#544)


* `.leaflet-map-pane` `z-index` switched to 'auto'. Allows for map panes to appear above the map if they appear later in the dom. (#537)
* Use correct Leaflet.js scale control remove method (#547)

Expand Down
2 changes: 1 addition & 1 deletion docs/libs/leaflet-binding/leaflet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2064,7 +2064,7 @@ methods.addScaleBar = function (options) {

methods.removeScaleBar = function () {
if (this.currentScaleBar) {
this.currentScaleBar.removeFrom(this);
this.currentScaleBar.remove();
this.currentScaleBar = null;
}
};
Expand Down
6 changes: 6 additions & 0 deletions scripts/docs_update.R
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
devtools::install()
cat("\n")

message("Removing ./docs/libs folder")
unlink("docs/libs", recursive = TRUE)
cat("\n")

system("cd docs; make clean; make;")