Skip to content

Conversation

@aesopwolf
Copy link

This just merges the upstream repo into your branch. I'm just trying to get your PR approved and this fixes the merge conflicts over there insin#32

bpugh and others added 30 commits February 13, 2016 21:47
- Removes .npmignore in favor of whitelisting with "files" in package.json
- Removes dist folder and instead builds to umd folder that is only
  published to npm and hosted on npmcdn instead of checking into git
- Remove 'use strict' statement since babel inserts it automactically
Edit:
Rebased onto latest master
Only kept relevant change. Change to dist was dropped to help avoid
merge conflicts
Add phone number example to demo page
Use eslint-config-johnnybuchanan to automatically handle all the needed
eslint packages.
Update nwb.config.js to new format and move contributing instructions
to separate file.
Replace Gulp and JSHint with ESLint/Webpack using nwb
No longer needed since build was migrated to nwb and eslint.
Update demo to build with nwb
Updating React and ReactDOM dependencies to v15
Updates a number of transitive dependency versions as a result
of all the left-pad hubbub
Update nwb dependency to 0.9.x
Call this.props.onChange only if it's defined
* basic tests

* travis
When resetting the mask the cursor would jump to the end of the line.  This PR fixes that behavior.
iamdustan and others added 22 commits July 27, 2016 16:15
* removed react internals

* lint fix

* fixed by eslint
* add user agent sniffing for keypress event name (eww)

* remove semi-colons to match coding style

* fix bug with android chrome, bah

* small tweak to (hopefully) fix android chrome)
gs

* just make it exclude android

* rename method
just removes a stray char that was breaking the formatting
* Restore console.error after testing it

* remove planceHolderChar and formatCharacters props

Before passing them to input in order to silence invalid prop warnings
introduced in React 15.4
* add check for navigator

This enables server side rendering

* fix eslint errors

* changes per feedback

`typeof navigator !== 'undefined'` otherwise strict mode will still throw
`return 'onKeyPress'` as a fallback in case someone is removing navigator from the global scope
@axelson
Copy link
Owner

axelson commented Dec 20, 2016

Took a brief look. Looks alright.

@axelson axelson merged commit 4233f8c into axelson:master Dec 20, 2016
@aesopwolf aesopwolf deleted the fix-paste-autofill branch December 20, 2016 03:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.