jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brus...@apache.org
Subject svn commit: r1694102 - in /jspwiki/trunk: ./ jspwiki-war/src/main/java/org/apache/wiki/ jspwiki-war/src/main/scripts/behaviors/ jspwiki-war/src/main/scripts/moo-extend/ jspwiki-war/src/main/styles/haddock/fontjspwiki/ jspwiki-war/src/main/webapp/templa...
Date Tue, 04 Aug 2015 20:13:40 GMT
Author: brushed
Date: Tue Aug  4 20:13:39 2015
New Revision: 1694102

URL: http://svn.apache.org/r1694102
Log:
2.10.2-svn-31  Haddock Template small fixes : async loading error, IEx tweaks,  %%add-css
fixes

Modified:
    jspwiki/trunk/ChangeLog
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
    jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/AddCSS.js
    jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Element.Extend.js
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/path.less
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/commonheader.jsp

Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1694102&r1=1694101&r2=1694102&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Tue Aug  4 20:13:39 2015
@@ -1,3 +1,17 @@
+2015-08-04  Dirk Frederickx (brushed AT apache DOT org)
+
+       * 2.10.2-svn-31  Haddock Template small fixes
+
+       * Loading error on hadock.js and haddock-edit.js fixed. (async attribute)
+         Was breaking all editing js functions !
+       
+       * IEx tweaks 
+         - remove unnecessary scrollbars
+         - attempt to resolve the broken icon-fonts on IE11
+
+       * %%add-css style fix to handle special html entities 
+
+
 2015-08-04  David Vittor (dvittor@apache.org)
 
        * 2.10.2-svn-30

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1694102&r1=1694101&r2=1694102&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Tue Aug  4 20:13:39
2015
@@ -72,7 +72,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "30";
+    public static final String     BUILD         = "31";
 
     /**
      *  This is the generic version string you should use when printing out the version.
 It is of 

Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/AddCSS.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/AddCSS.js?rev=1694102&r1=1694101&r2=1694102&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/AddCSS.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/AddCSS.js Tue Aug  4 20:13:39 2015
@@ -48,6 +48,10 @@ function AddCSS( element ){
 
         css = css.replace( /<p>|<\/p>/gi, "" ); //jspwiki inserts <p/>
for empty lines
 
+        css = css.replace( /&amp;/g, "&" )
+                 .replace( /&gt;/g, ">" )
+                 .replace( /&lt;/g, "<" );
+
         css = "style[type=text/css]".slick({text: css});
 
         /*

Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Element.Extend.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Element.Extend.js?rev=1694102&r1=1694101&r2=1694102&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Element.Extend.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Element.Extend.js Tue Aug  4 20:13:39
2015
@@ -250,8 +250,8 @@ Element.implement({
             modal.removeClass( "active" );
             document.body.removeClass( "show-modal" );
 
-            if( this.hasClass("btn-primary") ){
-                self.removeEvent( "click", doSelfEvent ).click();
+            if( this.match(".btn-primary") ){
+                self.removeEvent( "click" , doSelfEvent ).click();
             }
         }
 

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/path.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/path.less?rev=1694102&r1=1694101&r2=1694102&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/path.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/path.less Tue Aug  4 20:13:39
2015
@@ -14,7 +14,7 @@
 }
 */
 
-
+/*
 @font-face {
 	font-family: 'FontJspwiki';
 	src:url('fonts/FontJspwiki.eot');
@@ -25,4 +25,27 @@
 	font-weight: normal;
 	font-style: normal;
 }
+*/
+/*
+@font-face {
+	font-family: 'FontJspwiki';
+	src:url('fonts/FontJspwiki.eot?tag7mn');
+	src:url('fonts/FontJspwiki.eot?#iefixtag7mn') format('embedded-opentype'),
+		url('fonts/FontJspwiki.ttf?tag7mn') format('truetype'),
+		url('fonts/FontJspwiki.woff?tag7mn') format('woff'),
+		url('fonts/FontJspwiki.svg?tag7mn#FontJspwiki') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+*/
+@font-face {
+	font-family: 'FontJspwiki';
+	src:url('fonts/FontJspwiki.eot?-7p8ftb');
+	src:url('fonts/FontJspwiki.eot?#iefix-7p8ftb') format('embedded-opentype'),
+		url('fonts/FontJspwiki.ttf?-7p8ftb') format('truetype'),
+		url('fonts/FontJspwiki.woff?-7p8ftb') format('woff'),
+		url('fonts/FontJspwiki.svg?-7p8ftb#FontJspwiki') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
 

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/commonheader.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/commonheader.jsp?rev=1694102&r1=1694101&r2=1694102&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/commonheader.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/commonheader.jsp Tue Aug 
4 20:13:39 2015
@@ -55,7 +55,7 @@ String.I18N.PREFIX = "javascript.";
 
 <%-- JAVASCRIPT --%>
 
-<script async src="<wiki:Link format='url' jsp='scripts/haddock.js'/>"></script>
+<script src="<wiki:Link format='url' jsp='scripts/haddock.js'/>"></script>
 
 <wiki:IncludeResources type="script"/>
 



Mime
View raw message