You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by br...@apache.org on 2017/01/21 12:27:53 UTC
jspwiki git commit: 2.10.3-git-30 / JSPWIKI-1046
Repository: jspwiki
Updated Branches:
refs/heads/master 3530fe4c2 -> f183523d9
2.10.3-git-30 / JSPWIKI-1046
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/f183523d
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/f183523d
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/f183523d
Branch: refs/heads/master
Commit: f183523d9bf23ba2fe3c7be0c23a3f8436d7f4bc
Parents: 3530fe4
Author: brushed <di...@gmail.com>
Authored: Sat Jan 21 13:27:43 2017 +0100
Committer: brushed <di...@gmail.com>
Committed: Sat Jan 21 13:27:43 2017 +0100
----------------------------------------------------------------------
ChangeLog | 6 ++++++
jspwiki-war/src/main/java/org/apache/wiki/Release.java | 2 +-
jspwiki-war/src/main/scripts/wiki/Wiki.js | 10 +++-------
3 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/f183523d/ChangeLog
----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 2458bdf..535f4f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-01-21 Dirk Frederickx (brushed AT apache DOT org)
+
+ * 2.10.3-git-30
+ [JSPWIKI-1046 ]IE11 detection fixed, txs to patch of Albrecht Striffler.
+
+
2017-01-17 Dirk Frederickx (brushed AT apache DOT org)
* 2.10.3-git-29
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/f183523d/jspwiki-war/src/main/java/org/apache/wiki/Release.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/Release.java b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
index bd4adae..b7aef6b 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "29";
+ public static final String BUILD = "30";
/**
* This is the generic version string you should use when printing out the version. It is of
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/f183523d/jspwiki-war/src/main/scripts/wiki/Wiki.js
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/scripts/wiki/Wiki.js b/jspwiki-war/src/main/scripts/wiki/Wiki.js
index f7288fe..4c58724 100644
--- a/jspwiki-war/src/main/scripts/wiki/Wiki.js
+++ b/jspwiki-war/src/main/scripts/wiki/Wiki.js
@@ -184,15 +184,11 @@ var Wiki = {
//support for flexbox is broken in IE, let's do it the hard-way
//console.log(navigator.appVersion);
- var nav = navigator.appVersion;
- console.log(nav);
- //body.ifClass( nav.match(/Edge/) || !nav.match(/MSIE/), "can-flex");
+ var isIE11 = !(window.ActiveXObject) && "ActiveXObject" in window;
+ var isIE9or10 = "ActiveXObject" in window;
- //detect any IE version, not-EDGE
- body.ifClass( !("ActiveXObject" in window) , "can-flex");
-
- body.ifClass( nav.match(/Edge/) || !nav.match(/MSIE/), "can-flex");
+ body.ifClass( !( isIE11 || isIE9or10 ) , "can-flex");
},