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

Handle non base64 encoded javascript from pandoc #263

Merged
merged 2 commits into from
Jun 4, 2018

Conversation

schloerke
Copy link
Collaborator

Javascript is not being encoded by default anymore. When reading the saved widget file, the new lines must be preserved to keep the javascript functioning.

In the tests, checking for base64 encoded images is still valid within the htmlwidgets test to make sure it is self contained.

Reference:
"SelfContained: don't use data URIs for script or style.": jgm/pandoc@7c0a80c

schloerke added 2 commits June 1, 2018 09:39
… preserved.

Checking for base64 encoded images is still valid for the htmlwidgets test to make sure it is self contained.

"SelfContained: don't use data URIs for script or style.": jgm/pandoc@7c0a80c
@CLAassistant
Copy link

CLAassistant commented Jun 1, 2018

CLA assistant check
All committers have signed the CLA.

@codecov-io
Copy link

Codecov Report

Merging #263 into master will decrease coverage by 0.34%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #263      +/-   ##
==========================================
- Coverage   87.29%   86.94%   -0.35%     
==========================================
  Files          25       25              
  Lines        1251     1088     -163     
==========================================
- Hits         1092      946     -146     
+ Misses        159      142      -17
Impacted Files Coverage Δ
R/serializer-htmlwidget.R 87.5% <100%> (ø) ⬆️
R/paths.R 76.92% <0%> (-15.94%) ⬇️
R/post-body.R 42.85% <0%> (-7.15%) ⬇️
R/serializer.R 84.61% <0%> (-2.06%) ⬇️
R/includes.R 87.5% <0%> (-1.39%) ⬇️
R/find-port.R 95.23% <0%> (-1.06%) ⬇️
R/serializer-content-type.R 90.9% <0%> (-0.76%) ⬇️
R/plumber-static.R 93.61% <0%> (-0.62%) ⬇️
R/session-cookie.R 93.02% <0%> (-0.46%) ⬇️
R/plumber.R 82.28% <0%> (-0.45%) ⬇️
... and 9 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7f7d655...1671807. Read the comment docs.

@schloerke schloerke changed the title Handle non encoded javascript from pandoc Handle non base64 encoded javascript from pandoc Jun 1, 2018
@schloerke
Copy link
Collaborator Author

This PR fixes the testing error in #259 and #264

@schloerke schloerke merged commit 1ad5a80 into rstudio:master Jun 4, 2018
@schloerke schloerke deleted the base64 branch June 4, 2018 17:37
schloerke added a commit to schloerke/plumber that referenced this pull request Jun 4, 2018
* master:
  Handle non base64 encoded javascript from pandoc (rstudio#263)
schloerke added a commit to schloerke/plumber that referenced this pull request Jun 4, 2018
* master:
  Handle non base64 encoded javascript from pandoc (rstudio#263)
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.

3 participants