revert DataTables host page name to gridviewer.html

RStudio stores this HTML page name in the contentUrl, so changing it could break existing projects.
rstudio · Dec 1, 2017 · fcad56c · fcad56c
1 parent 976735a
commit fcad56c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 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 "/dtviewer.html?env=" +
+   dataItem["contentUrl"] = kGridResource "/gridviewer.html?env=" +
       http::util::urlEncode(envName, true) + "&obj=" + 
       http::util::urlEncode(objName, true) + "&cache_key=" +
       http::util::urlEncode(cacheKey, true);

diff --git a/src/cpp/session/resources/grid/dtviewer.html → ...pp/session/resources/grid/gridviewer.html b/src/cpp/session/resources/grid/dtviewer.html → ...pp/session/resources/grid/gridviewer.html
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/dtviewer.html?data_source=data");
+      super("grid_resource/gridviewer.html?data_source=data");
    }
 
    public void onAttach()