closes yihui/shiny#4 after cleaning it up a bit

use [searchField] instead of $.makeArray(), and unlist() it on the R side
Ocode · Aug 22, 2014 · 063ac98 · 063ac98
1 parent 82fb11a
commit 063ac98
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/R/update-input.R b/R/update-input.R
@@ -445,7 +445,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 <- 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]])

diff --git a/inst/www/shared/shiny.js b/inst/www/shared/shiny.js
@@ -2246,14 +2246,14 @@
         selectize.clearOptions();
         selectize.settings.load = function(query, callback) {
           if (!query.length) return callback();
+          var settings = selectize.settings;
           $.ajax({
             url: data.url,
             data: {
               query: query,
-              field: JSON.stringify($.makeArray(
-                      selectize.settings.searchField)),
-              conju: selectize.settings.searchConjunction,
-              maxop: selectize.settings.maxOptions
+              field: JSON.stringify([settings.searchField]),
+              conju: settings.searchConjunction,
+              maxop: settings.maxOptions
             },
             type: 'GET',
             error: function() {