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 2015/06/28 23:23:28 UTC
svn commit: r1688073 - in /jspwiki/trunk: ./
jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/scripts/lib/ jspwiki-war/src/main/scripts/moo-extend/
jspwiki-war/src/main/scripts/wiki-edit/
Author: brushed
Date: Sun Jun 28 21:23:28 2015
New Revision: 1688073
URL: http://svn.apache.org/r1688073
Log:
2.10.2-svn-20 - few more fixes for the HADDOCK template
[JSPWIKI-891]: Fixed jumping behaviour in Firefox of the Haddock editor
[JSPWIKI-885]: Improvements of the editor LivePreview
Removed:
jspwiki/trunk/jspwiki-war/src/main/scripts/lib/mootools-core-1.4.5.js
jspwiki/trunk/jspwiki-war/src/main/scripts/lib/mootools-more-1.4.0.1.js
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Textarea.js
jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.js
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1688073&r1=1688072&r2=1688073&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Sun Jun 28 21:23:28 2015
@@ -1,5 +1,18 @@
2015-06-28 Dirk Frederickx (brushed AT apache DOT org)
+ * 2.10.2-svn-20
+
+ * JSPWIKI-891: Fixed annoying jumping behaviour in Firefox of the Haddock editor
+
+ * JSPWIKI-885: LivePreview doesn't work
+ The HADDOCK template has refresh mechanism based on "change events".
+ (no periodic refreshes, like the default template)
+ Improved trigger mechanism to catch all keystrokes; and at the same time
+ reducing the debounce period (read - refresh time-out) to 1sec.
+
+
+2015-06-28 Dirk Frederickx (brushed AT apache DOT org)
+
* 2.10.2-svn-19
More Haddock template fixes
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=1688073&r1=1688072&r2=1688073&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 Sun Jun 28 21:23:28 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 = "19";
+ public static final String BUILD = "20";
/**
* 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/moo-extend/Textarea.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Textarea.js?rev=1688073&r1=1688072&r2=1688073&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Textarea.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Textarea.js Sun Jun 28 21:23:28 2015
@@ -264,7 +264,7 @@ var Textarea = new Class({
}
ta.focus();
ta.scrollTop = scrollTop;
- ta.fireEvent("change");
+ //ta.fireEvent("change");
return this;
},
Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.js?rev=1688073&r1=1688072&r2=1688073&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.js Sun Jun 28 21:23:28 2015
@@ -180,7 +180,7 @@ var Snipe = new Class({
});
- //catch shortcut keys when focus on toolbar and/or textarea
+ //catch shortcut keys when focus anywhere on the snipe editor (toolbar, textarea..)
container.addEvent("keydown", self.shortcut);
},
@@ -315,8 +315,7 @@ var Snipe = new Class({
txta = self.textarea,
el = txta.toElement(),
key = e.key,
- caret = txta.getSelectionRange(),
- scroll = el.getScroll();
+ caret = txta.getSelectionRange();
el.focus();
@@ -334,8 +333,6 @@ var Snipe = new Class({
}
- el.scrollTo(scroll);
-
},
/*
@@ -642,6 +639,8 @@ var Snipe = new Class({
this.reset();
}
+ self.fireEvent("change"); //Potential change of the textarea, to be debounced by receiver -- CHECKME
+
},
@@ -972,7 +971,7 @@ console.log(this.context.suggest);
el.scrollLeft = state.scrollLeft;
txta.setSelectionRange( state.cursor.start, state.cursor.end );
- //self.fireEvent("change");
+ self.fireEvent("change");
}
});