Add Google Crome Frame support.

This commit is contained in:
Paulo Gustavo Veiga
2012-06-21 22:18:04 -03:00
parent a5bf5b8d57
commit 10e869ab70
23 changed files with 99 additions and 154 deletions

View File

@@ -0,0 +1,23 @@
/*
* Copyright [2011] [wisemapping]
*
* Licensed under WiseMapping Public License, Version 1.0 (the "License").
* It is basically the Apache License, Version 2.0 (the "License") plus the
* "powered by wisemapping" text requirement on every single page;
* you may not use this file except in compliance with the License.
* You may obtain a copy of the license at
*
* http://www.wisemapping.org/license
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.wisemapping.exceptions;
public class GoogleChromeFrameRequiredException extends Exception {
}

View File

@@ -18,6 +18,7 @@
package com.wisemapping.filter;
import com.wisemapping.exceptions.GoogleChromeFrameRequiredException;
import org.jetbrains.annotations.NotNull;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
@@ -57,6 +58,13 @@ public class BrowserSupportInterceptor extends HandlerInterceptorAdapter {
if (!userAgent.isBrowserSupported()) {
throw new UnsupportedBrowserException();
}
// Is a Explorer 9 or less without Google Chrome Frame ?.
if (!userAgent.needsGCF()) {
throw new GoogleChromeFrameRequiredException();
}
}
return true;
}

View File

@@ -331,8 +331,9 @@ public class UserAgent implements Serializable {
}
public boolean needsGCF() {
final UserAgent.Product product = this.getProduct();
return product == UserAgent.Product.EXPLORER && this.isVersionLessThan(9) && this.getOs() == UserAgent.OS.WINDOWS && !this.hasGCFInstalled;
return true;
// final UserAgent.Product product = this.getProduct();
// return product == UserAgent.Product.EXPLORER && this.isVersionLessThan(9) && this.getOs() == UserAgent.OS.WINDOWS && !this.hasGCFInstalled;
}
}

View File

@@ -34,32 +34,32 @@ public class PublicPagesController {
@RequestMapping(value = "aboutUs")
public ModelAndView aboutUs() {
return new ModelAndView("aboutUs");
public String aboutUs() {
return "aboutUs";
}
@RequestMapping(value = "crew")
public ModelAndView crew() {
return new ModelAndView("crew");
public String crew() {
return "crew";
}
@RequestMapping(value = "installCFG")
public ModelAndView installCFG() {
return new ModelAndView("installCFG");
@RequestMapping(value = "GCFInstall")
public String showGCFInstallationPage() {
return "GCFInstall";
}
@RequestMapping(value = "keyboard")
public ModelAndView newsPage() {
return new ModelAndView("keyboard");
public String newsPage() {
return "keyboard";
}
@RequestMapping(value = "home")
public ModelAndView home() {
return new ModelAndView("homepage");
public String home() {
return "homepage";
}
@RequestMapping(value = "iframeWrapper")
public ModelAndView showIframe(@RequestParam(required = true) String url) {
public ModelAndView showIframePage(@RequestParam(required = true) String url) {
return new ModelAndView("iframeWrapper", "url", url);
}
}