From 99da8fc97f5de84a2602d7d261b6deb627cf8bd6 Mon Sep 17 00:00:00 2001 From: Manuel Carrasco Moñino Date: Mon, 23 Dec 2013 19:06:45 +0100 Subject: FallBack to dummy implementation in IE8 IE9 --- .../gwt/query/client/impl/ConsoleBrowser.java | 24 +++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'gwtquery-core/src') diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/ConsoleBrowser.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/ConsoleBrowser.java index ec63c852..1ccc04d6 100644 --- a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/ConsoleBrowser.java +++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/ConsoleBrowser.java @@ -31,7 +31,11 @@ public class ConsoleBrowser implements Console { private static class ConsoleIe8 extends ConsoleIe9 { @Override protected native void init()/*-{ - Function.prototype.call.call($wnd.console.log, $wnd.console, Array.prototype.slice.call(arguments)); + try { + Function.prototype.call.call($wnd.console.log, $wnd.console, Array.prototype.slice.call(arguments)); + } catch(e) { + this.@com.google.gwt.query.client.impl.ConsoleBrowser.ConsoleIe9::initFallBack()(); + } }-*/; } @@ -39,15 +43,33 @@ public class ConsoleBrowser implements Console { * See: http://whattheheadsaid.com/2011/04/internet-explorer-9s-problematic-console-object */ private static class ConsoleIe9 extends ConsoleImpl { + public ConsoleIe9(){ init(); } protected native void init()/*-{ + try { [ "log", "info", "warn", "error", "dir", "clear", "profile", "profileEnd" ] .forEach(function(method) { $wnd.console[method] = this.call($wnd.console[method], $wnd.console); }, Function.prototype.bind); + } catch(e) { + this.@com.google.gwt.query.client.impl.ConsoleBrowser.ConsoleIe9::initFallBack()(); + } + }-*/; + + /** + * Dummy implementation of console if IE8 or IE9 fail using dev tools. + */ + private native void initFallBack() /*-{ + if (!$wnd.console || !$wnd.console.log) { + $wnd.console = {}; + [ "log", "info", "warn", "error", "dir", "clear", "profile", "profileEnd" ] + .forEach(function(method) { + $wnd.console[method] = function(){}; + }); + } }-*/; @Override -- cgit v1.2.3 From 0a9322ccb029bf6edc1f0bf01a29303fd8600614 Mon Sep 17 00:00:00 2001 From: Manuel Carrasco Moñino Date: Mon, 23 Dec 2013 19:27:44 +0100 Subject: Set credentials with gQuery utilities to avoid breaking apps before 2.5.1 --- .../google/gwt/query/client/plugins/deferred/PromiseReqBuilder.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gwtquery-core/src') diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/deferred/PromiseReqBuilder.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/deferred/PromiseReqBuilder.java index c19cf704..dea15355 100644 --- a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/deferred/PromiseReqBuilder.java +++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/deferred/PromiseReqBuilder.java @@ -124,7 +124,9 @@ public class PromiseReqBuilder extends DeferredPromiseImpl implements RequestCal xmlHttpRequest.setRequestHeader("Content-Type", ctype); } - xmlHttpRequest.setWithCredentials(true); + // Using gQuery to set credentials since this method was added in 2.5.1 + // xmlHttpRequest.setWithCredentials(true); + JsUtils.prop(xmlHttpRequest, "withCredentials", true); final Request request = createRequestVltr(xmlHttpRequest, settings.getTimeout(), this); -- cgit v1.2.3 From 7955d166c4f92187e6541fd6046650ccdcbf71a8 Mon Sep 17 00:00:00 2001 From: Manuel Carrasco Moñino Date: Mon, 23 Dec 2013 19:44:30 +0100 Subject: Fix merge issue --- .../com/google/gwt/query/client/plugins/deferred/PromiseReqBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gwtquery-core/src') diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/deferred/PromiseReqBuilder.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/deferred/PromiseReqBuilder.java index dea15355..8ec7cc7a 100644 --- a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/deferred/PromiseReqBuilder.java +++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/deferred/PromiseReqBuilder.java @@ -171,6 +171,6 @@ public class PromiseReqBuilder extends DeferredPromiseImpl implements RequestCal * Using violator pattern to use protected constructor */ private native Request createRequestVltr(XMLHttpRequest rq, int ms, RequestCallback cb) /*-{ - return @com.google.gwt.http.client.Request::new(Lcom/google/gwt/xhr/client/XMLHttpRequest;ILcom/google/gwt/http/client/RequestCallback;)(rq, + return @com.google.gwt.http.client.Request::new(Lcom/google/gwt/xhr/client/XMLHttpRequest;ILcom/google/gwt/http/client/RequestCallback;)(rq,cb); }-*/; } -- cgit v1.2.3