Skip to content

Image support (continuation of #33)#40

Merged
bherila merged 2 commits intomasterfrom
image-support
Jul 16, 2017
Merged

Image support (continuation of #33)#40
bherila merged 2 commits intomasterfrom
image-support

Conversation

@sstur
Copy link
Copy Markdown
Owner

@sstur sstur commented May 3, 2016

I'm making this a PR to facilitate some discussion around @thebritican's approach (this is mostly his code at this point).

@sstur sstur mentioned this pull request May 3, 2016
@sstur sstur force-pushed the image-support branch 4 times, most recently from 5ca959a to 1a176c9 Compare May 4, 2016 13:59
@gregziegan
Copy link
Copy Markdown

Perhaps inline images without a selected background is still good enough for some editors? Could this feature be shipped with some resizing logic and paste / drag features? Looking at draft-js-plugins/draft-js-plugins#243 there's a lot of code that can be adapted for resizing and drag and drop. I can try to update this PR with similar code at the end of the week

@jason-uh
Copy link
Copy Markdown

jason-uh commented Aug 7, 2016

What's the state of this PR? Will it get merged soon?

@ZeroCho
Copy link
Copy Markdown
Contributor

ZeroCho commented Aug 7, 2016

@jason-uh I made a package react-rte-image which forks this package's image-support branch. You can use it temporarily until this package supports image.

@jason-uh
Copy link
Copy Markdown

jason-uh commented Aug 8, 2016

Thanks, @ZeroCho. I'll check it out.

@alfondotnet
Copy link
Copy Markdown

alfondotnet commented May 3, 2017

Any plan to merge this anytime soon? :)

@bherila
Copy link
Copy Markdown
Collaborator

bherila commented Jul 14, 2017

@alfonsoperez @jason-uh @ZeroCho Could you fix the merge conflict and then I can do a final review pass and merge. Sorry for the delay.

Thanks,
Ben

@ZeroCho
Copy link
Copy Markdown
Contributor

ZeroCho commented Jul 14, 2017

@bherila Did you mean react-rte-image? or Do you want me to make a PR on this?

Edit: I fixed conflict in react-rte-image. Want me to make a PR here?

@bherila
Copy link
Copy Markdown
Collaborator

bherila commented Jul 14, 2017

Maybe create a PR to pull react-rte-image back to master? I think it would be really nice to bring the forks back in sync with each other, so that as we merge the other community contributions everyone can benefit 😄

master...ZeroCho:master

@bherila bherila mentioned this pull request Jul 14, 2017
14 tasks
@ZeroCho
Copy link
Copy Markdown
Contributor

ZeroCho commented Jul 15, 2017

Okay I'll do it today

@bherila
Copy link
Copy Markdown
Collaborator

bherila commented Jul 15, 2017

@ZeroCho thanks, can you advise what the right way to merge this would be? Looks like there is still some conflict

Thanks,
Ben

@bherila bherila merged commit cec7587 into master Jul 16, 2017
@bherila bherila deleted the image-support branch July 16, 2017 23:02
bherila pushed a commit that referenced this pull request Jul 16, 2017
* should work when the micro-dependencies update

* oh ya there was a toolbar button

* make things work except resizer

* use ENTITY_TYPE.IMAGE

* fix some lint and flow errors

* modify image style (#42)

* ImageSpan: add autobind

* remove resizing logic

* remove selected class and use built-in selection

* ImageSpan should have overflow hidden to prevent selection background from overflowing

* fix warning about font size

* demo

* readme

* ssr test

* Update webpack.config.js

* 0.5.1

* 0.5.2 ssr test

* react-rte-image 0.6.0

* No tilde && ImageButton as an option

* for CI and eslint

* 0.9.1 readme update for toolbar configuration

* 0.11.1 restore dist folder

* Revert README.md

* Remove dist and lib folder

* Remove dist and lib folder(again)

* Revert package.json

* Fix for flow
sstur added a commit that referenced this pull request Jul 26, 2017
sstur pushed a commit that referenced this pull request Jul 26, 2017
* should work when the micro-dependencies update

* oh ya there was a toolbar button

* make things work except resizer

* use ENTITY_TYPE.IMAGE

* fix some lint and flow errors

* modify image style (#42)

* ImageSpan: add autobind

* remove resizing logic

* remove selected class and use built-in selection

* ImageSpan should have overflow hidden to prevent selection background from overflowing

* fix warning about font size

* demo

* readme

* ssr test

* Update webpack.config.js

* 0.5.1

* 0.5.2 ssr test

* react-rte-image 0.6.0

* No tilde && ImageButton as an option

* for CI and eslint

* 0.9.1 readme update for toolbar configuration

* 0.11.1 restore dist folder

* Revert README.md

* Remove dist and lib folder

* Remove dist and lib folder(again)

* Revert package.json

* Fix for flow
sstur added a commit that referenced this pull request Jul 27, 2017
sstur pushed a commit that referenced this pull request Jul 27, 2017
* should work when the micro-dependencies update

* oh ya there was a toolbar button

* make things work except resizer

* use ENTITY_TYPE.IMAGE

* fix some lint and flow errors

* modify image style (#42)

* ImageSpan: add autobind

* remove resizing logic

* remove selected class and use built-in selection

* ImageSpan should have overflow hidden to prevent selection background from overflowing

* fix warning about font size

* demo

* readme

* ssr test

* Update webpack.config.js

* 0.5.1

* 0.5.2 ssr test

* react-rte-image 0.6.0

* No tilde && ImageButton as an option

* for CI and eslint

* 0.9.1 readme update for toolbar configuration

* 0.11.1 restore dist folder

* Revert README.md

* Remove dist and lib folder

* Remove dist and lib folder(again)

* Revert package.json

* Fix for flow
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.

6 participants