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/16 18:41:19 UTC
jspwiki git commit: 2.10.3-git-29 : IE11 detection fixed
Repository: jspwiki
Updated Branches:
refs/heads/master af2067a84 -> 3530fe4c2
2.10.3-git-29 : IE11 detection fixed
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/3530fe4c
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/3530fe4c
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/3530fe4c
Branch: refs/heads/master
Commit: 3530fe4c21481c8c2fdafe16339c6ad6d4123e92
Parents: af2067a
Author: brushed <di...@gmail.com>
Authored: Mon Jan 16 19:41:10 2017 +0100
Committer: brushed <di...@gmail.com>
Committed: Mon Jan 16 19:41:10 2017 +0100
----------------------------------------------------------------------
ChangeLog | 6 ++++++
jspwiki-war/src/main/java/org/apache/wiki/Release.java | 2 +-
jspwiki-war/src/main/scripts/wiki/Wiki.js | 6 ++++++
3 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/3530fe4c/ChangeLog
----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 9e00d0b..2458bdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-01-17 Dirk Frederickx (brushed AT apache DOT org)
+
+ * 2.10.3-git-29
+ JSPWIKI-1046 IE11 scrolling in content page blocked.
+ IE detection not working on IE11; ok on Edge. New detection method implemented.
+
2017-01-15 Dirk Frederickx (brushed AT apache DOT org)
* 2.10.3-git-28
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/3530fe4c/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 cd7704c..bd4adae 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 = "28";
+ public static final String BUILD = "29";
/**
* 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/3530fe4c/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 b9d765f..f7288fe 100644
--- a/jspwiki-war/src/main/scripts/wiki/Wiki.js
+++ b/jspwiki-war/src/main/scripts/wiki/Wiki.js
@@ -185,6 +185,12 @@ 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");
+
+ //detect any IE version, not-EDGE
+ body.ifClass( !("ActiveXObject" in window) , "can-flex");
body.ifClass( nav.match(/Edge/) || !nav.match(/MSIE/), "can-flex");