make 'open in browser' do the right thing for Shiny docs

rstudio · Apr 16, 2014 · 280164b · 280164b
1 parent 0fd7c34
commit 280164b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/gwt/src/org/rstudio/studio/client/rmarkdown/ui/RmdOutputPresenter.java b/src/gwt/src/org/rstudio/studio/client/rmarkdown/ui/RmdOutputPresenter.java
@@ -136,7 +136,10 @@ public void onShinyDisconnect()
    @Handler
    public void onViewerPopout()
    {
-      globalDisplay_.showHtmlFile(params_.getOutputFile());
+      if (params_.isShinyDocument())
+         globalDisplay_.openWindow(params_.getOutputUrl());
+      else
+         globalDisplay_.showHtmlFile(params_.getOutputFile());
    }
 
    @Handler

diff --git a/src/gwt/src/org/rstudio/studio/client/shiny/ShinyDisconnectNotifier.java b/src/gwt/src/org/rstudio/studio/client/shiny/ShinyDisconnectNotifier.java
@@ -14,8 +14,6 @@
  */
 package org.rstudio.studio.client.shiny;
 
-import org.rstudio.core.client.Debug;
-
 public class ShinyDisconnectNotifier
 {
    public interface ShinyDisconnectSource
@@ -42,7 +40,6 @@ private native void initializeEvents() /*-{
 
    private void onMessage(String data, String origin)
    {  
-      Debug.devlog("got message " + data + " from " + origin);
       if ("disconnected".equals(data))
       {
          if (source_.getShinyUrl().startsWith(origin))