Skip to content
This repository has been archived by the owner on Jan 19, 2024. It is now read-only.

Add image to radio widget #34

Open
wants to merge 36 commits into
base: react-15
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
72ecec9
disable widget in explanation
kevinptt0323 Jun 19, 2017
689bc9e
temp commit for merging new origin brench
pytseng-junyi Jun 19, 2017
c8635f6
Merge branch 'react-15' of github.com:junyiacademy/perseus into react-15
pytseng-junyi Jun 19, 2017
6c85490
temp
pytseng-junyi Jun 20, 2017
b444807
Revert "temp"
pytseng-junyi Jun 20, 2017
d98c688
temp for ins
pytseng-junyi Jun 22, 2017
54972d2
Revert "temp for ins"
pytseng-junyi Jun 22, 2017
58499d8
Revert "Revert "temp""
pytseng-junyi Jun 22, 2017
19a966a
Revert "temp"
pytseng-junyi Jun 22, 2017
c87800f
Revert "temp commit for merging new origin brench"
pytseng-junyi Jun 22, 2017
cb45daf
add basic input to radio
pytseng-junyi Jun 23, 2017
10d4c42
able to render uploaded image but havent deal with backend question_u…
pytseng-junyi Jun 23, 2017
345e655
meet a problem of Cannot read property 'toJSON' of undefined
pytseng-junyi Jun 29, 2017
16dbe45
ready to do resize image
pytseng-junyi Jun 30, 2017
32692ab
upload image can be resize but still not on frontend
pytseng-junyi Jun 30, 2017
7b8b76e
can not render right side but left side editor is good
pytseng-junyi Jun 30, 2017
750b5a7
temp ready to clean code
pytseng-junyi Jul 2, 2017
63637cf
fix minors
pytseng-junyi Jul 3, 2017
445a854
clean code ready to test on test server
pytseng-junyi Jul 3, 2017
39a2388
some change about onWidthChange
pytseng-junyi Jul 3, 2017
b1becba
fix live reload of renderer
pytseng-junyi Jul 3, 2017
28ba57d
cherrypick from radio-add-image
huangins Jun 23, 2017
2e4ce40
ready to review
pytseng-junyi Jul 3, 2017
6deea72
fix code review
pytseng-junyi Jul 4, 2017
b75d2d4
handle error
pytseng-junyi Jul 4, 2017
dbb1540
can change size of markedown url
pytseng-junyi Jul 4, 2017
cf2bade
fix onWidthChange
pytseng-junyi Jul 4, 2017
618632c
rebuild
pytseng-junyi Jul 4, 2017
c553d34
remove resize image function
pytseng-junyi Jul 5, 2017
035fc07
fix conflict
pytseng-junyi Jul 6, 2017
e71e185
merge react15 fixed conflict
pytseng-junyi Jul 6, 2017
29cbc53
huge fix, add widget inside radio instead of using content change
pytseng-junyi Jul 8, 2017
1b5f784
another way for add image-to-radio implementation: enable widget in e…
pytseng-junyi Jul 10, 2017
2d33e53
clean useless changes
pytseng-junyi Jul 10, 2017
194c410
minor fix
pytseng-junyi Jul 10, 2017
9e900b7
clean code
pytseng-junyi Jul 10, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions build/perseus-1.css
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,11 @@
float: none;
margin: 3px;
}
.perseus-widget-radio div,
.perseus-widget-radio div > p {
/* TODO(alpert): Find a better way of doing inline renderers */
display: inline;
.content-editor * {
max-height: 400px;
}
.content-editor .perseus-textarea-underlay {
overflow: hidden;
}
.perseus-widget-radio li {
padding: 7px 0;
Expand Down
Loading