rstudio · Mar 2, 2017 · Mar 2, 2017 · Mar 2, 2017
Showing with 9 additions and 5 deletions.

+1 −1 DESCRIPTION

+8 −3 R/input-file.R

+0 −1 shiny.Rproj
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -89,9 +89,9 @@ Collate:
     'stack.R'
     'bookmark-state.R'
     'bootstrap-layout.R'
-    'conditions.R'
     'map.R'
     'globals.R'
+    'conditions.R'
     'utils.R'
     'bootstrap.R'
     'cache.R'

diff --git a/R/input-file.R b/R/input-file.R
@@ -27,6 +27,8 @@
 #'   Internet Explorer 9 and earlier.}
 #' @param accept A character vector of MIME types; gives the browser a hint of
 #'   what kind of files the server is expecting.
+#' @param progressLabelAlignment A character vector of text alignments for
+#' upload progress label. Defaults to "left".
 #'
 #' @examples
 #' ## Only run examples in interactive R sessions
@@ -39,7 +41,8 @@
 #'         accept = c(
 #'           "text/csv",
 #'           "text/comma-separated-values,text/plain",
-#'           ".csv")
+#'           ".csv"),
+#'         progressLabelAlignment = "center"
 #'         ),
 #'       tags$hr(),
 #'       checkboxInput("header", "Header", TRUE)
@@ -70,9 +73,10 @@
 #' }
 #' @export
 fileInput <- function(inputId, label, multiple = FALSE, accept = NULL,
-  width = NULL) {
+  width = NULL, progressLabelAlignment = c("left", "center", "right")) {
 
   restoredValue <- restoreInput(id = inputId, default = NULL)
+  progressLabelAlignment <- progressLabelAlignment[1]
 
   # Catch potential edge case - ensure that it's either NULL or a data frame.
   if (!is.null(restoredValue) && !is.data.frame(restoredValue)) {
@@ -110,7 +114,8 @@ fileInput <- function(inputId, label, multiple = FALSE, accept = NULL,
         )
       ),
       tags$input(type = "text", class = "form-control",
-        placeholder = "No file selected", readonly = "readonly"
+        placeholder = "No file selected", readonly = "readonly",
+        style = paste0("text-align: ", progressLabelAlignment, ";)")
       )
     ),
 

diff --git a/shiny.Rproj b/shiny.Rproj
@@ -19,4 +19,3 @@ BuildType: Package
 PackageUseDevtools: Yes
 PackageInstallArgs: --with-keep.source
 PackageCheckArgs: --as-cran --no-manual --run-donttest
-PackageRoxygenize: rd,collate,namespace