Skip to content
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.

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

allow nested contenteditables #621

Merged
merged 6 commits into from
May 20, 2015
Merged

Conversation

phiggins42
Copy link
Contributor

all the tests remain passing, can add another for the case. added a random demo/ file to show the usecase.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.01%) to 94.76% when pulling 72146ea on phiggins42:nested-toolbar into b6eabc9 on daviferreira:master.

@nmielnik
Copy link
Member

Do you mind rebasing? Our dist file situation leaves something to be desired 😞

@phiggins42
Copy link
Contributor Author

i did a make js prior to commit I thought? based on current upstream/master ... what did I miss? (and yes, I personally am opposed to maintaining dist files in repos for this very reason)

@nmielnik
Copy link
Member

Another PR and a commit got merged into master at pretty much the exact same time you opened your PR, I'm guessing that's where the disconnect was.

Agreed, I would definitely like to explore removing the dist files as soon as we can.

@coveralls
Copy link

Coverage Status

Changes Unknown when pulling 71db944 on phiggins42:nested-toolbar into * on daviferreira:master*.

nmielnik added a commit that referenced this pull request May 20, 2015
@nmielnik nmielnik merged commit c04e467 into yabwe:master May 20, 2015
@phiggins42
Copy link
Contributor Author

i think i got it this time. github pattern noob, sorry for the ugh commits. was confused. +1 to figuring out how to not need to keep the dist/ files in branch (in tags makes sense, doesn't npm et al use whatever is current as the dist file? unsure). thanks for quick merge.

nysk pushed a commit to nysk/medium-editor that referenced this pull request Aug 10, 2015
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.

4 participants