more user understandable query params for satellite windows

rstudio · Nov 16, 2011 · 9b0711d · 9b0711d
1 parent 38a74f4
commit 9b0711d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/src/gwt/src/org/rstudio/studio/client/RStudio.java b/src/gwt/src/org/rstudio/studio/client/RStudio.java
@@ -82,7 +82,7 @@ public void execute()
          {
             Command dismissProgressAnimation = showProgress();
 
-            if ("vcs".equals(Window.Location.getParameter("mode")))
+            if ("review_changes".equals(Window.Location.getParameter("view")))
                delayLoadVCSApplication(dismissProgressAnimation);
             else
                delayLoadApplication(dismissProgressAnimation);

diff --git a/src/gwt/src/org/rstudio/studio/client/common/WindowOpener.java b/src/gwt/src/org/rstudio/studio/client/common/WindowOpener.java
@@ -28,7 +28,7 @@ void openMinimalWindow(GlobalDisplay globalDisplay,
                           boolean showLocation);
 
    void openSatelliteWindow(GlobalDisplay globalDisplay,
-                            String mode,
+                            String viewName,
                             int width,
                             int height);
 }
diff --git a/src/gwt/src/org/rstudio/studio/client/common/impl/WebWindowOpener.java b/src/gwt/src/org/rstudio/studio/client/common/impl/WebWindowOpener.java
@@ -48,17 +48,17 @@ public void openMinimalWindow(GlobalDisplay globalDisplay,
    }
 
    public void openSatelliteWindow(GlobalDisplay globalDisplay,
-                                   String mode,
+                                   String viewName,
                                    int width,
                                    int height)
    {
       // build url
       UrlBuilder urlBuilder = Window.Location.createUrlBuilder();
-      urlBuilder.setParameter("mode", mode);
+      urlBuilder.setParameter("view", viewName);
 
       // setup options
       NewWindowOptions options = new NewWindowOptions();
-      options.setName(getSatelliteWindowName(mode));
+      options.setName(getSatelliteWindowName(viewName));
       options.setFocus(true);
 
       // open window (force web codepath b/c desktop needs this so

diff --git a/src/gwt/src/org/rstudio/studio/client/common/satellite/SatelliteManager.java b/src/gwt/src/org/rstudio/studio/client/common/satellite/SatelliteManager.java
@@ -32,6 +32,8 @@
 
 // TODO: Pass parameters (show history, list of files, etc.)
 
+// TODO: test on all platforms
+
 // TODO: Code splitting
 
 // TODO: Desktop load time seems worse, caching?

diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/vcs/GitPresenter.java b/src/gwt/src/org/rstudio/studio/client/workbench/views/vcs/GitPresenter.java
@@ -193,7 +193,8 @@ private void showReviewPane(boolean showHistory)
       Event currentEvent = Event.getCurrentEvent();
       if ((currentEvent != null) && currentEvent.getShiftKey())
       {
-         satelliteManager_.openSatellite("vcs", getPreferredReviewPanelSize());
+         satelliteManager_.openSatellite("review_changes", 
+                                         getPreferredReviewPanelSize());
       }
       else
       {