jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brus...@apache.org
Subject jspwiki git commit: JSPWIKI-1045 IE11 rendering is broken for %%graphBars using color names
Date Sun, 15 Jan 2017 14:57:46 GMT
Repository: jspwiki
Updated Branches:
  refs/heads/master 2e3da23a8 -> af2067a84


JSPWIKI-1045 IE11 rendering is broken for %%graphBars using color names


Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/af2067a8
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/af2067a8
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/af2067a8

Branch: refs/heads/master
Commit: af2067a84bfc05a9f22eeca2c27560b53bd65cc6
Parents: 2e3da23
Author: brushed <dirk.frederickx@gmail.com>
Authored: Sun Jan 15 15:56:58 2017 +0100
Committer: brushed <dirk.frederickx@gmail.com>
Committed: Sun Jan 15 15:56:58 2017 +0100

----------------------------------------------------------------------
 ChangeLog                                         |  7 ++++++-
 .../src/main/java/org/apache/wiki/Release.java    |  2 +-
 .../main/scripts/moo-extend/Array.NaturalSort.js  |  2 +-
 jspwiki-war/src/main/scripts/moo-extend/Color.js  |  2 +-
 jspwiki-war/src/main/scripts/wiki/Wiki.js         | 18 +++---------------
 .../src/main/styles/haddock/default/Dialog.less   |  1 +
 6 files changed, 13 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jspwiki/blob/af2067a8/ChangeLog
----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 376ae38..9e00d0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-01-15  Dirk Frederickx (brushed AT apache DOT org)
+
+       * 2.10.3-git-28
+         JSPWIKI-1045 IE11 rendering is broken for %%graphBars using color names.
+
 2017-01-14  Harry Metske (metskem@apache.org)
 
        * 2.10.3-git-27.
@@ -14,7 +19,7 @@
 
        * 2.10.3-git-25: few Haddock template fixes
 
-       * REmove the editor suggestion-dialogs scroll-bars (only visible on Windows)
+       * Remove the editor suggestion-dialogs scroll-bars (only visible on Windows)
          Fix a few formatting errors in sugestion dialogs.
 
        * Fixed the width of the table filter input field

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/af2067a8/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 7bbe472..cd7704c 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         = "27";
+    public static final String     BUILD         = "28";
 
     /**
      *  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/af2067a8/jspwiki-war/src/main/scripts/moo-extend/Array.NaturalSort.js
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/scripts/moo-extend/Array.NaturalSort.js b/jspwiki-war/src/main/scripts/moo-extend/Array.NaturalSort.js
index d91185c..f7baac8 100644
--- a/jspwiki-war/src/main/scripts/moo-extend/Array.NaturalSort.js
+++ b/jspwiki-war/src/main/scripts/moo-extend/Array.NaturalSort.js
@@ -138,7 +138,7 @@ Array.implement({
 
         }
 
-        console.log("[", kmgt ? "kmgt" : dmy ? "dmy" : num ? "num" : nat ? "nat" : "no conversion",
"] ");
+        //console.log("[", kmgt ? "kmgt" : dmy ? "dmy" : num ? "num" : nat ? "nat" : "no
conversion", "] ");
 
         return kmgt || dmy || num || nat || this.slice();
 

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/af2067a8/jspwiki-war/src/main/scripts/moo-extend/Color.js
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/scripts/moo-extend/Color.js b/jspwiki-war/src/main/scripts/moo-extend/Color.js
index 3b0dc05..8b39497 100644
--- a/jspwiki-war/src/main/scripts/moo-extend/Color.js
+++ b/jspwiki-war/src/main/scripts/moo-extend/Color.js
@@ -59,7 +59,7 @@ var c0l0r = 'i'.slick(),
         c0l0r.inject(document.body);
         color = ( color.test(/^[\da-f]{3,6}$/i) ?  ("#" + color) :
                  c0l0r.setStyle('color',color).getComputedStyle('color').rgbToHex() ).hexToRgb(true);
 //[r,g,b]
-        c0l0r.remove();
+        c0l0r.dispose(); //remove element from the dom
 
     }
     if(!color){ return null; }

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/af2067a8/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 0a6aaff..b9d765f 100644
--- a/jspwiki-war/src/main/scripts/wiki/Wiki.js
+++ b/jspwiki-war/src/main/scripts/wiki/Wiki.js
@@ -182,20 +182,6 @@ var Wiki = {
 
     caniuse: function( body ){
 
-        //Is not really needed anymore,  since we added a css "hack" to workaround an IE
bug
-        //Still kept here as a placeholder for future feature-sniffing
-
-
-        //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);
         var nav = navigator.appVersion;
@@ -348,7 +334,7 @@ var Wiki = {
         url = wiki.BaseUrl;
         url = url ? url.slice( url.indexOf(host) + host.length, -1 ) : "";
         wiki.BasePath = ( url /*===""*/ ) ? url : "/";
-        //console.log("basepath: " + wiki.BasePath);
+        console.log(url, host, wiki.BaseUrl + " basepath: " + wiki.BasePath);
 
     },
 
@@ -696,10 +682,12 @@ var Wiki = {
     Note:
         Uses the JsonUrl which is read from the meta element "WikiJsonUrl"
         {{{ <meta name="wikiJsonUrl" content="/JSPWiki-pipo/JSON-RPC" /> }}}
+
     Supported rpc calls:
         - {{search.findPages}} gets the list of pagenames with partial match
         - {{progressTracker.getProgress}} get a progress indicator of attachment upload
         - {{search.getSuggestions}} gets the list of pagenames with partial match
+
     Example:
         (start code)
         //Wiki.ajaxJsonCall('/search/pages,[Janne,20]', function(result){

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/af2067a8/jspwiki-war/src/main/styles/haddock/default/Dialog.less
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/default/Dialog.less b/jspwiki-war/src/main/styles/haddock/default/Dialog.less
index 0283e55..52cd082 100644
--- a/jspwiki-war/src/main/styles/haddock/default/Dialog.less
+++ b/jspwiki-war/src/main/styles/haddock/default/Dialog.less
@@ -115,6 +115,7 @@ DOM structure:
 
     .body {
         padding: 0.25em 0 0 0;
+        overflow:auto;
         max-height: 300px;
 
         ul {


Mime
View raw message