incubator-jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brus...@apache.org
Subject svn commit: r700248 - in /incubator/jspwiki/trunk: ChangeLog src/com/ecyrd/jspwiki/Release.java src/webdocs/scripts/jspwiki-edit.js src/webdocs/templates/default/jspwiki.css
Date Mon, 29 Sep 2008 20:49:26 GMT
Author: brushed
Date: Mon Sep 29 13:49:25 2008
New Revision: 700248

URL: http://svn.apache.org/viewvc?rev=700248&view=rev
Log:
v2.8.0-beta-13:
        * [JSPWIKI-385] Header lines float nicely next to comment-boxes 
        * [JSPWIKI-380] Fix backspace handling of the plain editor

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
    incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js
    incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=700248&r1=700247&r2=700248&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Mon Sep 29 13:49:25 2008
@@ -1,3 +1,12 @@
+2008-09-29  Dirk Frederickx <dirk.frederickx@gmail.com>
+
+        * 2.8.0-beta-13
+        
+        * [JSPWIKI-385] Header lines are now cleared 'left' so that comment-boxes 
+        can appear side by side with !!!header lines. 
+        
+        * [JSPWIKI-380] Fix backspace handling of the plain editor.
+
 2008-09-24  Janne Jalkanen <jalkanen@apache.org>
 
         * 2.8.0-beta-12

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=700248&r1=700247&r2=700248&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Mon Sep 29 13:49:25 2008
@@ -77,7 +77,7 @@
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "12";
+    public static final String     BUILD         = "13";
     
     /**
      *  This is the generic version string you should use

Modified: incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js?rev=700248&r1=700247&r2=700248&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js (original)
+++ incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js Mon Sep 29 13:49:25 2008
@@ -283,6 +283,34 @@
 			this.element.fireEvent('change');		
 		};
 
+		/* quick dirty patch: backspace should remove only one char and not 4 spaces */
+		this.posteditor.onBackspace=function(e) {
+		    var ss = this.ss(), se = this.se();
+    		if(ss == se && this.slice(ss - this.tabl,ss) == this.tab) {
+				return;
+			/*
+				e.preventDefault();
+				var start = this.getStart(this.tab), end = this.slice(ss,this.element.value.length);
+				if(start.match(/\n$/g) && end.match(/^\n/g)) {
+        			this.value([start,this.slice(ss-1,this.element.value.length)]);
+				} else {
+			  		this.value([start,end]);
+				}
+		  		this.selectRange(ss - this.tabl,0);
+		  	*/
+			} else if(ss == se) {
+  		  		var charCode  = this.slice(ss - 1,ss), 
+  		      	close     = this.slice(ss,ss+1), 
+  		      	stpair    = this.options.smartTypingPairs[charCode];
+  		  		if($type(stpair) == 'string') stpair = { pair : stpair };
+  		  		if(stpair && stpair.pair == close) {
+  		    		this.value([this.getStart(stpair.pair),this.slice(ss,this.element.value.length)]);
+          			this.selectRange(ss,0);
+  		  		}
+  			}
+  		};
+	
+
 		/* next extra fix for latest Safari 3.1 cause tabs are not catched anymore in the onkeypress
handler */
 		/* TODO: this could be a great workaround for ie as well */
 		if(window.webkit){ 

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css?rev=700248&r1=700247&r2=700248&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css Mon Sep 29 13:49:25
2008
@@ -172,7 +172,7 @@
 	margin-bottom:0.5em;
 }
 h2, h3, h4 {
-	clear:both;
+	clear:left;
 	margin:1em 0 0.5em 0;
 	padding:0.25em 0;
 	line-height:1.2;



Mime
View raw message