Merge pull request rstudio#939 from yihui/bugfix/selectize-selected

Fixes rstudio#929: defer setValue() for selectize until the options have been loaded from server

Author: jcheng5

R/update-input.R

@@ -474,13 +474,9 @@ updateSelectizeInput <- function(session, inputId, label = NULL, choices = NULL,
     return(updateSelectInput(session, inputId, label, choices, selected))
   }
   value <- unname(selected)
-  selected <- choicesWithNames(selected)
   message <- dropNulls(list(
     label = label,
     value = value,
-    selected = if (length(selected)) {
-      columnToRowData(list(label = names(selected), value = selected))
-    },
     url = session$registerDataObj(inputId, choices, selectizeJSON)
   ))
   session$sendInputMessage(inputId, message)
@@ -494,7 +490,7 @@ selectizeJSON <- function(data, req) {
   # all keywords in lower-case, for case-insensitive matching
   key <- unique(strsplit(tolower(query$query), '\\s+')[[1]])
   if (identical(key, '')) key <- character(0)
-  mop <- query$maxop
+  mop <- as.numeric(query$maxop)
 
   # convert a single vector to a data frame so it returns {label: , value: }
   # later in JSON; other objects return arbitrary JSON {x: , y: , foo: , ...}

inst/www/shared/selectize/css/selectize.bootstrap3.css

@@ -1,6 +1,6 @@
 /**
- * selectize.bootstrap3.css (v0.11.2) - Bootstrap 3 Theme
- * Copyright (c) 2013 Brian Reavis & contributors
+ * selectize.bootstrap3.css (v0.12.1) - Bootstrap 3 Theme
+ * Copyright (c) 2013–2015 Brian Reavis & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
  * file except in compliance with the License. You may obtain a copy of the License at:
@@ -115,8 +115,8 @@
 .selectize-input,
 .selectize-input input {
   color: #333333;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 14px;
+  font-family: inherit;
+  font-size: inherit;
   line-height: 20px;
   -webkit-font-smoothing: inherit;
 }
@@ -227,7 +227,7 @@
 .selectize-dropdown {
   position: absolute;
   z-index: 10;
-  border: 1px solid #cccccc;
+  border: 1px solid #d0d0d0;
   background: #ffffff;
   margin: -1px 0 0 0;
   border-top: 0 none;
@@ -398,4 +398,4 @@
   -webkit-border-radius: 0;
   -moz-border-radius: 0;
   border-radius: 0;
-}
+}

inst/www/shared/selectize/js/selectize.min.js

@@ -55,6 +55,7 @@ $.extend(selectInputBinding, {
     if (data.hasOwnProperty('url')) {
       selectize = this._selectize(el);
       selectize.clearOptions();
+      var thiz = this, loaded = false;
       selectize.settings.load = function(query, callback) {
         var settings = selectize.settings;
         $.ajax({
@@ -71,19 +72,19 @@ $.extend(selectInputBinding, {
           },
           success: function(res) {
             callback(res);
+            if (!loaded && data.hasOwnProperty('value'))
+              thiz.setValue(el, data.value);
+            loaded = true;
           }
         });
       };
       // perform an empty search after changing the `load` function
       selectize.load(function(callback) {
         selectize.settings.load.apply(selectize, ['', callback]);
       });
-      if (data.hasOwnProperty('selected'))
-        selectize.addOption(data.selected);
-    }
-
-    if (data.hasOwnProperty('value'))
+    } else if (data.hasOwnProperty('value')) {
       this.setValue(el, data.value);
+    }
 
     if (data.hasOwnProperty('label'))
       $(el).parent().parent().find('label[for="' + $escape(el.id) + '"]').text(data.label);