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 2016/12/18 21:28:14 UTC
jspwiki git commit: JSPWIKI-1038
Repository: jspwiki
Updated Branches:
refs/heads/master cb0a11ef4 -> e1f1c3522
JSPWIKI-1038
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/e1f1c352
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/e1f1c352
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/e1f1c352
Branch: refs/heads/master
Commit: e1f1c35225169a3c067258c0c6b1fc8846a4680a
Parents: cb0a11e
Author: brushed <di...@gmail.com>
Authored: Sun Dec 18 22:28:01 2016 +0100
Committer: brushed <di...@gmail.com>
Committed: Sun Dec 18 22:28:01 2016 +0100
----------------------------------------------------------------------
ChangeLog | 8 ++++++++
jspwiki-war/src/main/java/org/apache/wiki/Release.java | 2 +-
jspwiki-war/src/main/scripts/wiki/Wiki.js | 10 ++++++++++
3 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/e1f1c352/ChangeLog
----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 34c0e12..28e6155 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2016-12-18 Dirk Frederickx (brushed AT apache DOT org)
+
+ * 2.10.3-svn-21 Various HADDOCK updates & fixes.
+
+ * [JSPWIKI-1038]: IE's flexbox implementation is broken,
+ no workaround for now.
+
+
2016-12-17 Dirk Frederickx (brushed AT apache DOT org)
* Fixing RSSGenerator test with latest WeblogPlugin changes
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/e1f1c352/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 b37ef14..4a71a2c 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 = "20";
+ public static final String BUILD = "21";
/**
* 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/e1f1c352/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 7455244..1e4fd51 100644
--- a/jspwiki-war/src/main/scripts/wiki/Wiki.js
+++ b/jspwiki-war/src/main/scripts/wiki/Wiki.js
@@ -187,12 +187,22 @@ var Wiki = {
//Modernizr.addTest('flexbox', testAllProps('flexBasis', '1px', true));
+ /*
var hasNativeFlex = document.createElement('b');
hasNativeFlex.style.cssText = "flex-basis:1px;";
if( hasNativeFlex.style.length ){
body.addClass("can-flex");
}
+ */
+
+ //support for flexbox is broken in IE, let's do it the hard-way
+ console.log(navigator.appVersion);
+
+ if ( !navigator.appVersion.match(/MSIE/) ){
+ //alert("Aha, no IE. Let's play flexbox");
+ body.addClass("can-flex");
+ }
},