Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Allow leafletProxy arguments to contain JS() #696

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Sep 22, 2021
Merged

Allow leafletProxy arguments to contain JS() #696

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
749e2da
Allow leafletProxy arguments to contain JS()
jcheng5 Aug 21, 2020
6046fae
Pass tests
jcheng5 Aug 21, 2020
aab8e78
Use version of htmlwidgets that exports JSEvals
jcheng5 Aug 25, 2020
6dabf5a
Fix incorrect arg/evals validation
jcheng5 Sep 22, 2021
5035a28
More efficient JS() serialization for leafletProxy
jcheng5 Sep 22, 2021
385895a
Remove htmlwidgets from Remotes
jcheng5 Sep 22, 2021
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
Prev Previous commit
Next Next commit
Fix incorrect arg/evals validation
  • Loading branch information
@jcheng5 @schloerke
jcheng5 authored and schloerke committed Sep 22, 2021
commit 6dabf5a34ac970d7df3d45ed461068bef6a676ee
4 changes: 2 additions & 2 deletions inst/htmlwidgets/leaflet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,8 +834,8 @@ _htmlwidgets2["default"].widget({
});

function unpackArgs(arg) {
if (!arg.hasOwnProperty("arg") && !arg.hasOwnProperty("evals")) {
throw new Error("Malformed argument; .arg and .evals expected");
if (!Object.prototype.hasOwnProperty.call(arg, "value") || !Object.prototype.hasOwnProperty.call(arg, "evals")) {
throw new Error("Malformed argument; .value and .evals expected");
}

for (var i = 0; i < arg.evals.length; i++) {
Expand Down
4 changes: 2 additions & 2 deletions javascript/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,8 @@ HTMLWidgets.widget({
});

function unpackArgs(arg) {
if (!arg.hasOwnProperty("arg") && !arg.hasOwnProperty("evals")) {
throw new Error("Malformed argument; .arg and .evals expected");
if (!Object.prototype.hasOwnProperty.call(arg, "value") || !Object.prototype.hasOwnProperty.call(arg, "evals")) {
throw new Error("Malformed argument; .value and .evals expected");
}
for (let i = 0; i < arg.evals.length; i++) {
window.HTMLWidgets.evaluateStringMember(arg.value, arg.evals[i]);
Expand Down