simplify showcase mode setting in DESCRIPTION

R/shiny.R

@@ -916,7 +916,7 @@ registerClient <- function(client) {
 
 .globals$showcaseDefault <- 0
 
-.globals$showcaseOverride <- TRUE
+.globals$showcaseOverride <- FALSE
 
 #' Resource Publishing
 #' 
@@ -1119,12 +1119,17 @@ startAppDir <- function(port, host, workerId, quiet, showcase) {
     return(.globals$server)
   }
   
+  # If the display mode is specified in the description file, apply it here.
+  # Currently the only understood display mode is "Showcase". 
   if (file.exists(desc)) {
     settings <- read.dcf(desc)
-    if ("DefaultShowcaseMode" %in% colnames(settings))
-      .globals$showcaseDefault <- as.numeric(settings[1,"DefaultShowcaseMode"])
-    if ("AllowShowcaseModeOverride" %in% colnames(settings))
-      .globals$showcaseOverride <- as.logical(settings[1,"AllowShowcaseModeOverride"])
+    if ("DisplayMode" %in% colnames(settings)) {
+      mode <- settings[1,"DisplayMode"]
+      if (mode == "Showcase") {
+        .globals$showcaseDefault <- 1
+        .globals$showcaseOverride <- TRUE
+      }
+    }
   }
   
   startApp(
@@ -1455,11 +1460,10 @@ runApp <- function(appDir=getwd(),
     }
   }
   
-  # Set showcase defaults: showcase mode specified, and allow overriding if not
-  # running under Shiny Server. These globals may be overwritten by values in 
-  # the app's DESCRIPTION file, if it exists. 
+  # Set showcase defaults: showcase mode specified, and allow overriding if 
+  # showcase mode is set to something other than 0.
   .globals$showcaseDefault <- showcase.mode
-  .globals$showcaseOverride <- allowShowcaseOverride()
+  .globals$showcaseOverride <- as.logical(showcase.mode)
   
   require(shiny)
   

R/utils.R

@@ -448,7 +448,3 @@ showcaseModeOfReq <- function(req) {
   showcaseModeOfQuerystring(req$QUERY_STRING)
 }
 
-allowShowcaseOverride <- function() {
-  !nzchar(Sys.getenv("SHINY_PORT"))
-}
-

inst/examples/01_hello/DESCRIPTION

@@ -2,8 +2,7 @@ Title: Hello Shiny!
 Author: RStudio, Inc.
 AuthorUrl: http://www.rstudio.com/
 License: GPL-3
-DefaultShowcaseMode: 1
-AllowShowcaseModeOverride: TRUE
+DisplayMode: Showcase
 Tags: getting-started
 Type: ShinyShowcase
 

inst/examples/02_text/DESCRIPTION

@@ -2,8 +2,7 @@ Title: Shiny Text
 Author: RStudio, Inc.
 AuthorUrl: http://www.rstudio.com/
 License: GPL-3
-DefaultShowcaseMode: 1
-AllowShowcaseModeOverride: TRUE
+DisplayMode: Showcase
 Tags: getting-started
 Type: ShinyShowcase
 

inst/examples/03_reactivity/DESCRIPTION

@@ -2,7 +2,6 @@ Title: Reactivity
 Author: RStudio, Inc.
 AuthorUrl: http://www.rstudio.com/
 License: GPL-3
-DefaultShowcaseMode: 1
-AllowShowcaseModeOverride: TRUE
+DisplayMode: Showcase
 Tags: getting-started
 Type: ShinyShowcase

inst/examples/04_mpg/DESCRIPTION

@@ -2,7 +2,6 @@ Title: Miles Per Gallon
 Author: RStudio, Inc.
 AuthorUrl: http://www.rstudio.com/
 License: GPL-3
-DefaultShowcaseMode: 1
-AllowShowcaseModeOverride: TRUE
+DisplayMode: Showcase
 Tags: getting-started
 Type: ShinyShowcase

inst/examples/05_sliders/DESCRIPTION

@@ -2,7 +2,6 @@ Title: Sliders
 Author: RStudio, Inc.
 AuthorUrl: http://www.rstudio.com/
 License: GPL-3
-DefaultShowcaseMode: 1
-AllowShowcaseModeOverride: TRUE
+DisplayMode: Showcase
 Tags: getting-started
 Type: ShinyShowcase

inst/examples/06_tabsets/DESCRIPTION

@@ -2,7 +2,6 @@ Title: Tabsets
 Author: RStudio, Inc.
 AuthorUrl: http://www.rstudio.com/
 License: GPL-3
-DefaultShowcaseMode: 1
-AllowShowcaseModeOverride: TRUE
+DisplayMode: Showcase
 Tags: getting-started
 Type: ShinyShowcase

inst/examples/07_widgets/DESCRIPTION

@@ -2,7 +2,6 @@ Title: Widgets
 Author: RStudio, Inc.
 AuthorUrl: http://www.rstudio.com/
 License: GPL-3
-DefaultShowcaseMode: 1
-AllowShowcaseModeOverride: TRUE
+DisplayMode: Showcase
 Tags: getting-started
 Type: ShinyShowcase

inst/examples/09_upload/DESCRIPTION

@@ -2,7 +2,6 @@ Title: File Upload
 Author: RStudio, Inc.
 AuthorUrl: http://www.rstudio.com/
 License: GPL-3
-DefaultShowcaseMode: 1
-AllowShowcaseModeOverride: TRUE
+DisplayMode: Showcase
 Tags: getting-started
 Type: ShinyShowcase

inst/examples/10_download/DESCRIPTION

@@ -2,7 +2,6 @@ Title: File Download
 Author: RStudio, Inc.
 AuthorUrl: http://www.rstudio.com/
 License: GPL-3
-DefaultShowcaseMode: 1
-AllowShowcaseModeOverride: TRUE
+DisplayMode: Showcase
 Tags: getting-started
 Type: ShinyShowcase

inst/examples/11_timer/DESCRIPTION

@@ -2,7 +2,6 @@ Title: Timer
 Author: RStudio, Inc.
 AuthorUrl: http://www.rstudio.com/
 License: GPL-3
-DefaultShowcaseMode: 1
-AllowShowcaseModeOverride: TRUE
+DisplayMode: Showcase
 Tags: getting-started
 Type: ShinyShowcase