Conversation
|
This looks good, but it's showing almost the entire file changed. Would you mind reworking the PR so that it only shows the AMD wrapper at the top and the change at the end of the file? |
|
.. and here we go :) |
|
also I recommend that all indentations is either to tabs or to spaces, because it's really inconvenient making any changes when it's mixed. what do ya think? |
|
I'll update Jasmine tests little bit later |
|
it requires requirejs integration as well |
|
Would this be better off as a build step? |
|
Agreed on the spacing. I haven't done a good job of keeping things consistent when merging PRs. |
|
@AndrewEastwood Rather than merging upstream changes, it's preferable to rebase upstream changes. Ideally we'll have one commit when all is said and done with the necessary changes. I found a pretty good guide here: https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request |
Lets join this library to big AMD family :) Update jquery.maskedinput.js Sync with master patch-1: recalling other stuff and keeping amd wrapper only patch-1: recalling other stuff and keeping amd wrapper only (attempt #2 keeping indentations) resolving conflicts made else kw inline added missing space
ab730ee to
0082163
Compare
|
it seems while I was doing rebase my editor replaced all tabs with spaces |
|
@AndrewEastwood I went ahead and added the change since I'm trying to get a few last minute changes in before a 1.4 drop. I have some more PRs to pull in and I can't really adjust the entire file's whitespace right now. :) Thank you for your help! |
No description provided.