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

Previously I was using a hack to set the selected value of selectize, i.e. add the selected option(s) to selectize via addOptions() (because the selected option(s) may not have existed); this hack can be removed and we can set the value in the `success` callback of the Ajax request, by which time the options will be available

Author: yihui

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)

srcjs/input_binding_select.js

@@ -55,6 +55,7 @@ $.extend(selectInputBinding, {
     if (data.hasOwnProperty('url')) {
       selectize = this._selectize(el);
       selectize.clearOptions();
+      var thiz = this;
       selectize.settings.load = function(query, callback) {
         var settings = selectize.settings;
         $.ajax({
@@ -71,19 +72,18 @@ $.extend(selectInputBinding, {
           },
           success: function(res) {
             callback(res);
+            if (data.hasOwnProperty('value'))
+              thiz.setValue(el, data.value);
           }
         });
       };
       // 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);