rename data viewer resources for cache busting; fixes #1573

Some RStudio Server users have reported that they see a mix of white and dark in the data viewer after upgrading to RStudio 1.1 and applying a dark them, ostensibly because they're getting a cached 1.0 copy of the styles. This change updates the CSS filenames (and others in the folder) to ensure that 1.0 copies won't be used with 1.1.
rstudio · Dec 1, 2017 · 976735a · 976735a
1 parent 07fc140
commit 976735a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/cpp/session/modules/data/DataViewer.cpp b/src/cpp/session/modules/data/DataViewer.cpp
@@ -344,7 +344,7 @@ json::Value makeDataItem(SEXP dataSEXP, const std::string& caption,
    dataItem["cacheKey"] = cacheKey;
    dataItem["object"] = objName;
    dataItem["environment"] = envName;
-   dataItem["contentUrl"] = kGridResource "/gridviewer.html?env=" +
+   dataItem["contentUrl"] = kGridResource "/dtviewer.html?env=" +
       http::util::urlEncode(envName, true) + "&obj=" + 
       http::util::urlEncode(objName, true) + "&cache_key=" +
       http::util::urlEncode(cacheKey, true);

diff --git a/...cpp/session/resources/grid/gridstyles.css → src/cpp/session/resources/grid/dtstyles.css b/...cpp/session/resources/grid/gridstyles.css → src/cpp/session/resources/grid/dtstyles.css
@@ -1,5 +1,5 @@
 /*
- * gridstyles.css
+ * dtstyles.css
  *
  * Copyright (C) 2009-17 by RStudio, Inc.
  *

diff --git a/...pp/session/resources/grid/gridviewer.html → src/cpp/session/resources/grid/dtviewer.html b/...pp/session/resources/grid/gridviewer.html → src/cpp/session/resources/grid/dtviewer.html
@@ -5,12 +5,12 @@
     <link rel="stylesheet" href="datatables/css/jquery.dataTables.min.css" />
     <link rel="stylesheet" href="datatables/css/dataTables.scroller.min.css" />
     <link rel="stylesheet" href="jquery/ui/jquery-ui.min.css" />
-    <link rel="stylesheet" href="gridstyles.css" />
+    <link rel="stylesheet" href="dtstyles.css" />
     <script type="text/javascript" src="datatables/js/jquery.js"></script>
     <script type="text/javascript" src="datatables/js/jquery.dataTables.min.js"></script>
     <script type="text/javascript" src="datatables/js/dataTables.scroller.min.js"></script>
     <script type="text/javascript" src="jquery/ui/jquery-ui.min.js"></script>
-    <script type="text/javascript" src="gridviewer.js"></script>
+    <script type="text/javascript" src="dtviewer.js"></script>
 </head>
 <body style="overflow: hidden">
     <div id="errorMask">

diff --git a/src/cpp/session/resources/grid/gridviewer.js → src/cpp/session/resources/grid/dtviewer.js b/src/cpp/session/resources/grid/gridviewer.js → src/cpp/session/resources/grid/dtviewer.js
@@ -1,7 +1,7 @@
 /*jshint browser:true, strict:false, curly:false, indent:3*/
 
 /*
- * gridviewer.js
+ * dtviewer.js
  *
  * Copyright (C) 2009-17 by RStudio, Inc.
  *

diff --git a/src/gwt/src/org/rstudio/core/client/widget/GridViewerFrame.java b/src/gwt/src/org/rstudio/core/client/widget/GridViewerFrame.java
@@ -24,7 +24,7 @@ public class GridViewerFrame extends RStudioFrame
 {
    public GridViewerFrame()
    {
-      super("grid_resource/gridviewer.html?data_source=data");
+      super("grid_resource/dtviewer.html?data_source=data");
    }
 
    public void onAttach()