Merge branch 'master' of github.com:rstudio/rstudio

.gitignore

@@ -7,4 +7,5 @@ src/gwt/www/js/acesupport.js
 src/gwt/www/js/ace.js
 src/gwt/src/org/rstudio/studio/client/workbench/views/source/editors/text/ace/ace.js
 src/gwt/src/org/rstudio/studio/client/workbench/views/source/editors/text/ace/acesupport.js
-src/gwt/src/org/rstudio/core/client/jsonrpc/json2.min.js
+src/gwt/src/org/rstudio/core/client/jsonrpc/json2.min.js
+src/gwt/www/js/json2.min.js

src/gwt/build.xml

@@ -25,7 +25,7 @@
   <property name="gwt.extra.args" value=""/>
   <property name="gwt.main.module" value="org.rstudio.studio.RStudio"/>
   <property name="ace.bin" value="src/org/rstudio/studio/client/workbench/views/source/editors/text/ace"/>
-  <property name="json2.bin" value="src/org/rstudio/core/client/jsonrpc"/>
+  <property name="json2.bin" value="www/js"/>
 
   <path id="project.class.path">
     <pathelement location="bin"/>

src/gwt/src/org/rstudio/core/Core.gwt.xml

@@ -57,4 +57,6 @@
       <when-property-is name="rstudio.desktop" value="true"/>
    </replace-with>
 
+   <script src="../js/json2.min.js"/>
+
 </module>

src/gwt/src/org/rstudio/studio/client/RStudio.java

@@ -24,10 +24,7 @@
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.RootLayoutPanel;
 import org.rstudio.core.client.Debug;
-import org.rstudio.core.client.ExternalJavaScriptLoader;
-import org.rstudio.core.client.ExternalJavaScriptLoader.Callback;
 import org.rstudio.core.client.files.filedialog.FileDialogResources;
-import org.rstudio.core.client.jsonrpc.JSON2;
 import org.rstudio.core.client.resources.CoreResources;
 import org.rstudio.core.client.theme.res.ThemeResources;
 import org.rstudio.core.client.widget.FontSizer;
@@ -136,8 +133,6 @@ private void load(final Command dismissProgressAnimation)
       FindReplaceBar.ensureStylesInjected();
       FontSizer.ensureStylesInjected();
 
-      JSON2.ensureInjected();
-
       StyleInjector.inject(
             "button::-moz-focus-inner {border:0}");