You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2016/12/26 12:44:01 UTC
[2/5] jspwiki git commit: [JSPWIKI-1038]: Fix allowing flexbox in
Edge. (but not in IE)
[JSPWIKI-1038]: Fix allowing flexbox in Edge. (but not in IE)
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/82949d60
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/82949d60
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/82949d60
Branch: refs/heads/JSPWIKI-1035
Commit: 82949d6033bea8d29de9da81258361e441b60956
Parents: e1f1c35
Author: brushed <di...@gmail.com>
Authored: Mon Dec 19 23:20:29 2016 +0100
Committer: brushed <di...@gmail.com>
Committed: Mon Dec 19 23:20:29 2016 +0100
----------------------------------------------------------------------
ChangeLog | 7 +++++++
jspwiki-war/src/main/java/org/apache/wiki/Release.java | 2 +-
jspwiki-war/src/main/scripts/wiki/Wiki.js | 4 +++-
3 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/82949d60/ChangeLog
----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 28e6155..9c1acc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-12-19 Dirk Frederickx (brushed AT apache DOT org)
+
+ * 2.10.3-svn-22 Various HADDOCK updates & fixes.
+
+ * [JSPWIKI-1038]: Fix allowing flexbox in Edge. (but not in IE)
+
+
2016-12-18 Dirk Frederickx (brushed AT apache DOT org)
* 2.10.3-svn-21 Various HADDOCK updates & fixes.
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/82949d60/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 4a71a2c..9cf5f0d 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 = "21";
+ public static final String BUILD = "22";
/**
* 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/82949d60/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 1e4fd51..1e9610c 100644
--- a/jspwiki-war/src/main/scripts/wiki/Wiki.js
+++ b/jspwiki-war/src/main/scripts/wiki/Wiki.js
@@ -199,7 +199,9 @@ var Wiki = {
//support for flexbox is broken in IE, let's do it the hard-way
console.log(navigator.appVersion);
- if ( !navigator.appVersion.match(/MSIE/) ){
+ var nav = navigator.appVersion;
+
+ if ( nav.match(/Edge/) || !nav.match(/MSIE/) ){
//alert("Aha, no IE. Let's play flexbox");
body.addClass("can-flex");
}