Closed jacobyxu closed 6 years ago
Test results:
feature | firefox | chrome |
---|---|---|
hover info | work | work |
multiple plot | work | work |
separate click | work | work |
special shape | work | not |
Thanks @JacobXPX could you please resolve these conflicts?
Conflicting files DESCRIPTION R/renderWordcloud2.R man/wordcloud2-shiny.Rd readme.md
You mean change them back to what in the master branch now?
@JacobXPX Your branch is behind the latest master branch, so there are some conflict in this repo, you can resolve it in the web editor
for Example:
<<<<<<< master
wordcloud2Output(outputId, width = "100\%", height = "400px")
clickedWordInputId is automatically generated by: paste0(outputId, "_clicked_word"))
=======
wordcloud2Output(outputId, width = "100\%", height = "400px",
clickedWordInputId = "selected_word")
>>>>>>> master
should change to:
wordcloud2Output(outputId, width = "100\%", height = "400px",
clickedWordInputId = "selected_word")
maybe next time you could run these code firstly:
git pull https://github.com/Lchiffon/wordcloud2
git push
In your example, since I want to keep:
wordcloud2Output(outputId, width = "100\%", height = "400px") clickedWordInputId is automatically generated by: paste0(outputId, "_clicked_word"))
I should just change it to this above, right?
Thank you for teaching me this. I think it should be fine now.
And one more thing, if you add a file to the repo (like examples/img/new.gif
) which will not used in R package, you should add the file name in .Rbuildignore
After finish .Rbuildignore
, I think I can merge this PR
Thanks~
Thank you! learned a lot from you ;)
Hi Lchiffon,
I finally fix the firefox deploy issue and multiple plot click issue. please update it.
Thank you!
Best,
Puxin