github/shiny
1
1
Fork 0
mirror of https://github.com/rstudio/shiny.git synced 2026-04-29 03:00:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert switch to jsonlite

Browse Source 
This reverts commits deffc90, ab4dc64, and 0755579, returning to RJSONIO.
The purpose of this is to prepare for a maintenance release for 0.11
without the switch to jsonlite, to reduce the risk of new bugs.
This commit is contained in:
Winston Chang
2015-02-06 10:47:42 -06:00
parent b74e93f3a4
commit 040ae293fb
11 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
R/update-input.R
View File

@@ -453,7 +453,7 @@ updateSelectizeInput <- function(session, inputId, label = NULL, choices = NULL,
selectizeJSON <- function(data, req) {
query <- parseQueryString(req$QUERY_STRING)
# extract the query variables, conjunction (and/or), search string, maximum options
var <- unlist(jsonlite::fromJSON(query$field))
var <- unlist(fromJSON(query$field, asText = TRUE))
cjn <- if (query$conju == 'and') all else any
# all keywords in lower-case, for case-insensitive matching
key <- unique(strsplit(tolower(query$query), '\\s+')[[1]])