Skip to content

Commit a242ae3

Browse files
committed
Merge pull request rstudio#920 from yihui/yihui/selectize-dragdrop
fixes rstudio#902: add jQueryUI dependency when the drag_drop plugin is used in selectize
2 parents 0b3eb7a + ced4060 commit a242ae3

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: shiny
22
Type: Package
33
Title: Web Application Framework for R
4-
Version: 0.12.2
4+
Version: 0.12.2.9000
55
Date: 2015-08-04
66
Authors@R: c(
77
person("Winston", "Chang", role = c("aut", "cre"), email = "[email protected]"),

NEWS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
shiny 0.12.2.9000
2+
--------------------------------------------------------------------------------
3+
4+
* Fixed #902: the `drag_drop` plugin of the selectize input did not work.
5+
16
shiny 0.12.2
27
--------------------------------------------------------------------------------
38

R/input-select.R

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,13 @@ selectizeIt <- function(inputId, select, options, nonempty = FALSE) {
152152
))
153153
)
154154

155+
if ('drag_drop' %in% options$plugins) {
156+
selectizeDep <- list(selectizeDep, htmlDependency(
157+
'jqueryui', '1.10.4', c(href = 'shared/jqueryui/1.10.4'),
158+
script = 'jquery-ui.min.js'
159+
))
160+
}
161+
155162
# Insert script on same level as <select> tag
156163
select$children[[2]] <- tagAppendChild(
157164
select$children[[2]],

0 commit comments

Comments
 (0)