checked for _map to prevent errors on scrolling #917
Conversation
fix to workaround IE10/11 bug.
make sure XMLHttpRequest.open is called first
default to loading a blank png when a tile request fails
get native geojson from 10.4
remove logo and just make sure Esri is just included in the attribution
* start using correct paging url param names * fix tests
…790) readd, not recreate why
code cleanup
move dynamic attribution logic out of 'basemapLayer' and into 'Util'
parse base64 arcgis server responses too
* allow users to pass tokens through to basemaps * sometimes people make maps with no attribution control
2.0.6 release prep
Update karma-phantomjs-launcher
* tweaked a few tests * set up travis PhantomJS caching * bumped a bunch of test suite dependencies dont lint travis phantomjs folder what the heckie son lots of tweaks to test travis remove itself is it just that one? i guess so stop tracking map resize more guesses is it really the options tests? test precommit linting add linting hook no idea linting and bumping wish i knew what i was doing or that i could repro locally stop caching phantom trying normal phantom getting somewhere hmmmm https? revert to PhantomJS 1.9 cleanup
get tests passing in node v6
RasterLayer shouldnt remove non-existent images outside constrained zoom levels
replace blank tile remote url with base64 encoded version
expose a public method to force RasterLayer to redraw
honor leaflet maxNativeZoom
setOpacity on RasterLayers
* make sure addfeature is only called once * create OR add
|
thanks for this! it looks like the email address in your
i'm certainly happy to accept as is, but if you want to tidy things up so that @jordanparfitt appears in perpetuity as an illustrious esri leaflet contributor, please don't be shy. |
update from master
|
I updated the email and did another push.
…On Mon, Jan 23, 2017 at 7:11 PM, john gravois ***@***.***> wrote:
thanks for this!
it looks like the email address in your git config --global user.email is
different than the one associated with github.com/jordanparfitt.
New commits aren't using the right name
https://help.github.com/articles/setting-your-
username-in-git/#new-commits-arent-using-the-right-name
i'm certainly happy to accept as is, but if you want to tidy things up so
that @jordanparfitt <https://github.com/jordanparfitt> appears in
perpetuity as an illustrious esri leaflet contributor, please don't be shy.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#917 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/ABLNpkyiwnE5Z45VfH1phh8WrRgY5NwZks5rVV3TgaJpZM4LrmNx>
.
|
|
https://github.com/jordanparfitt/esri-leaflet/tree/master
i'm not sure exactly why, but the duplicate commits in the to put this to bed, i went ahead and merged the work myself in 189fe5e if you look at your own commit hash you can see that even though the associated email address is now the one associated with your GitHub account perhaps the different username is enough to keep your avatar from appearing and the activity from appearing in your timeline. https://github.com/jordanparfitt/esri-leaflet/commit/e72f5360cf63393a609711a736f0d975453ff43d
in any case, thanks so much for reporting (and fixing!) the problem you found! |
|
Thanks,
I did change the email, but I dont think I was supposed to run the
git-filter branch command, I didn't read the warning below:
[image: Inline image 1]
…On Tue, Jan 24, 2017 at 4:24 PM, john gravois ***@***.***> wrote:
https://github.com/jordanparfitt/esri-leaflet/tree/master
This branch is 106 commits ahead, 5 commits behind Esri:master.
i'm not sure exactly why, but the duplicate commits in the master branch
of your fork and the fact that it is also still slightly behind our master
branch has GitHub thinking that you're now proposing 107 unique commits in
this pull request. this is strange because the majority of them are already
present in the branch you're targeting.
to put this to bed, i went ahead and merged the work myself in 189fe5e
<189fe5e>
if you look at your own commit hash you can see that the associated email
address *still* isn't one that is associated with your GitHub account.
189fe5e
<189fe5e>
[image: screenshot 2017-01-24 15 21 51]
<https://cloud.githubusercontent.com/assets/3011734/22271350/f1d30996-e248-11e6-9bce-07793178c80c.png>
in any case, thanks so much for reporting (and fixing!) the problem you
found!
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#917 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/ABLNprqMDV1gYhePYE9RqfeKdegsyjaSks5rVohJgaJpZM4LrmNx>
.
|
|
https://help.github.com/articles/setting-your-username-in-git/#new-commits-
arent-using-the-right-name
I shouldn't have run git filter_branch. Next time I'll change my email
before the first commit. I'm not sure you can run it retro actively.
On Tue, Jan 24, 2017 at 5:15 PM, Jordan Parfitt <[email protected]>
wrote:
… Thanks,
I did change the email, but I dont think I was supposed to run the
git-filter branch command, I didn't read the warning below:
[image: Inline image 1]
On Tue, Jan 24, 2017 at 4:24 PM, john gravois ***@***.***>
wrote:
> https://github.com/jordanparfitt/esri-leaflet/tree/master
>
> This branch is 106 commits ahead, 5 commits behind Esri:master.
>
> i'm not sure exactly why, but the duplicate commits in the master branch
> of your fork and the fact that it is also still slightly behind our
> master branch has GitHub thinking that you're now proposing 107 unique
> commits in this pull request. this is strange because the majority of them
> are already present in the branch you're targeting.
>
> to put this to bed, i went ahead and merged the work myself in 189fe5e
> <189fe5e>
>
> if you look at your own commit hash you can see that the associated email
> address *still* isn't one that is associated with your GitHub account.
>
> 189fe5e
> <189fe5e>
>
> [image: screenshot 2017-01-24 15 21 51]
> <https://cloud.githubusercontent.com/assets/3011734/22271350/f1d30996-e248-11e6-9bce-07793178c80c.png>
>
> in any case, thanks so much for reporting (and fixing!) the problem you
> found!
>
> —
> You are receiving this because you were mentioned.
> Reply to this email directly, view it on GitHub
> <#917 (comment)>,
> or mute the thread
> <https://github.com/notifications/unsubscribe-auth/ABLNprqMDV1gYhePYE9RqfeKdegsyjaSks5rVohJgaJpZM4LrmNx>
> .
>
|
|
as long as you aren't collaborating with someone else, you can rebase/squash to rewrite history in your own branch. http://blog.steveklabnik.com/posts/2012-11-08-how-to-squash-commits-in-a-github-pull-request looking at your own two commits in jordanparfitt/esri-leaflet#master, it looks like the second one uses the right email, but still a different username than your actual github account username. that's why its still not showing the correct rorschach avatar. |
|
git bash is saying I'm 79 commits ahead and github is saying 106
To make things easier I just deleted my branch. Next time I'll just refork
…On Fri, Jan 27, 2017 at 10:11 AM, john gravois ***@***.***> wrote:
as long as you aren't collaborating with someone else, you can
rebase/squash to rewrite history in your own branch.
http://blog.steveklabnik.com/posts/2012-11-08-how-to-
squash-commits-in-a-github-pull-request
looking at your own two commits in jordanparfitt/esri-leaflet#master
<https://github.com/jordanparfitt/esri-leaflet/commits/master>, it looks
like the second one uses the right email, but still a different username
than your actual github account username. that's why its still not showing
the correct rorschach avatar.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#917 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/ABLNpltmS-y5_qCjpwfA2HoZmNOV1Xzyks5rWiVMgaJpZM4LrmNx>
.
|
its always a manual step to fetch/merge (or pull) down the latest work in upstream branches. |
Added second check for _map on RasterLayer
#910