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

rstudio · Feb 15, 2011 · fcc54ac · fcc54ac
2 parents 05f59ba + 8007d34
commit fcc54ac
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 56 deletions.
diff --git a/src/cpp/core/gwt/GwtFileHandler.cpp b/src/cpp/core/gwt/GwtFileHandler.cpp
@@ -129,9 +129,6 @@ void handleFileRequest(const std::string& wwwLocalPath,
          if (!mainPageFilter(request, pResponse))
             return ;
       }
-
-		// set chrome frame compatible
-		pResponse->setChromeFrameCompatible(request);
    }
 
    // get the requested file 

diff --git a/src/cpp/core/http/Response.cpp b/src/cpp/core/http/Response.cpp
@@ -100,12 +100,6 @@ void Response::setNoCacheHeaders()
              "no-cache, no-store, max-age=0, must-revalidate");
 }
 
-void Response::setChromeFrameCompatible(const Request& request)
-{
-	if (boost::algorithm::contains(request.userAgent(), "chromeframe"))
-		 setHeader("X-UA-Compatible", "chrome=1");
-}
-
 void Response::addCookie(const Cookie& cookie) 
 {
 	addHeader("Set-Cookie", cookie.cookieHeaderValue()) ;
@@ -119,8 +113,7 @@ Error Response::setBody(const std::string& content)
 }
 
 void Response::setDynamicHtml(const std::string& html,
-                              const Request& request,
-                              bool chromeFrameCompatible)
+                              const Request& request)
 {
    // dynamic html
    setContentType("text/html");
@@ -130,10 +123,6 @@ void Response::setDynamicHtml(const std::string& html,
    if (request.acceptsEncoding(kGzipEncoding))
       setContentEncoding(kGzipEncoding);
 
-   // chrome frame compatible if requested
-   if (chromeFrameCompatible)
-      setChromeFrameCompatible(request);
-
    // set body
    setBody(html);
 }

diff --git a/src/cpp/core/include/core/http/Response.hpp b/src/cpp/core/include/core/http/Response.hpp
@@ -105,8 +105,6 @@ class Response : public Message
    void setCacheForeverHeaders();
    void setPrivateCacheForeverHeaders();
    void setNoCacheHeaders();
-
-	void setChromeFrameCompatible(const Request& request);
 
    void addCookie(const Cookie& cookie) ;
 
@@ -232,9 +230,7 @@ class Response : public Message
       return setBody(ifs, filter, buffSize);   
    }
 
-   void setDynamicHtml(const std::string& html,
-                       const Request& request,
-                       bool chromeFrameCompatible = true);
+   void setDynamicHtml(const std::string& html, const Request& request);
 
    void setFile(const FilePath& filePath, const Request& request)
    {

diff --git a/src/cpp/server/ServerBrowser.cpp b/src/cpp/server/ServerBrowser.cpp
@@ -37,7 +37,6 @@ bool supportedBrowserFilter(const http::Request& request,
    std::string userAgent = request.headerValue("User-Agent");
 
    if (contains(userAgent, "Chrome")      ||
-       contains(userAgent, "chromeframe") ||
        contains(userAgent, "Firefox")     ||
        contains(userAgent, "Safari"))
    {

diff --git a/src/cpp/session/modules/SessionContentUrls.cpp b/src/cpp/session/modules/SessionContentUrls.cpp
@@ -144,9 +144,6 @@ void handleContentRequest(const http::Request& request, http::Response* pRespons
    // set private cache forever headers
    pResponse->setPrivateCacheForeverHeaders();
 
-   // set chrome frame compatible
-   pResponse->setChromeFrameCompatible(request);
-
    // set file
    pResponse->setFile(contentFilePath, request);
 

diff --git a/src/gwt/src/org/rstudio/studio/client/common/filetypes/FileTypeRegistry.java b/src/gwt/src/org/rstudio/studio/client/common/filetypes/FileTypeRegistry.java
@@ -82,6 +82,10 @@ public FileTypeRegistry(EventBus eventBus)
       register("*.nw", SWEAVE, icons.iconText());
       register("*.tex", TEX, icons.iconTex());
       register("*.latex", TEX, icons.iconTex());
+      register("*.sty", TEX, icons.iconTex());
+      register("*.cls", TEX, icons.iconTex());
+      register("*.bbl", TEX, icons.iconTex());
+      register("*.bib", TEXT, icons.iconText());
       register("*.rd", RD, icons.iconTex());
       register("*.rdata", RDATA, icons.iconRdata());
       defaultType_ = BROWSER;

diff --git a/src/gwt/www/browser.htm b/src/gwt/www/browser.htm
@@ -36,34 +36,6 @@ <h3 id="banner"><img src="images/rstudio.png" width="73" height="17" title="RStu
 
 </ul>
 
- <!-- Chrome Frame installer for IE 6 & 7 -->
-    <!--[if (IE 6)|(IE 7)]>
-
-       <p>You can also use RStudio with Internet Explorer 6 or 7 if you install the Google Chrome Frame plugin:</p>
-     
-      <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js">
-      </script>    
-    
-      <style>
-        .chromeFrameInstallDefaultStyle {        
-           border: none;
-           top: 300px;
-           margin-top: 0px;
-           margin-left: -410px;
-           width: 820px;
-           height: 650px;
-        }
-      </style>
-    
-      <script type="text/javascript">
-         CFInstall.check( { mode: "inline",
-                            destination: window.location.href.replace("browser.htm", "") });
-      </script>
-      
-    <![endif]-->
-
-
-
 </body>
 
 </html>
diff --git a/src/gwt/www/docs/keyboard.htm b/src/gwt/www/docs/keyboard.htm
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-<meta http-equiv="X-UA-Compatible" content="chrome=1">
+
 <title>RStudio: Keyboard Shortcuts</title>
 
 <link rel="stylesheet" href="../rstudio.css" type="text/css"/>

diff --git a/src/gwt/www/index.htm b/src/gwt/www/index.htm
@@ -19,7 +19,6 @@
   <head>
 
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="chrome=1">
     <link rel="shortcut icon" href="images/favicon.ico" />
     <title>RStudio</title>
     <script type="text/javascript" language="javascript" src="rstudio/rstudio.nocache.js"></script>

diff --git a/src/gwt/www/offline.htm b/src/gwt/www/offline.htm
@@ -15,7 +15,7 @@
 <html>
 
 <head>
-<meta http-equiv="X-UA-Compatible" content="chrome=1">
+
 <title>RStudio Offline</title>
 <link rel="shortcut icon" href="images/favicon.ico" />
 

diff --git a/src/gwt/www/templates/encrypted-sign-in.htm b/src/gwt/www/templates/encrypted-sign-in.htm
@@ -17,7 +17,7 @@
 <html>
 
 <head>
-<meta http-equiv="X-UA-Compatible" content="chrome=1">
+
 <title>RStudio Sign In</title>
 <link rel="shortcut icon" href="images/favicon.ico" />