Author: jalkanen
Date: Tue Nov 4 10:45:27 2008
New Revision: 711351
URL: http://svn.apache.org/viewvc?rev=711351&view=rev
Log:
Merged in from 2.8: JSPWIKI-411 & JSPWIKI-381.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java
incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js
incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=711351&r1=711350&r2=711351&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Tue Nov 4 10:45:27 2008
@@ -1,3 +1,7 @@
+2008-11-04 Janne Jalkanen <[EMAIL PROTECTED]>
+
+ * Merged in from 2.8: JSPWIKI-411 & JSPWIKI-381.
+
2008-11-03 Janne Jalkanen <[EMAIL PROTECTED]>
* Merged in changes from 2.8:
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java?rev=711351&r1=711350&r2=711351&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java
Tue Nov 4 10:45:27 2008
@@ -212,18 +212,34 @@
for( Iterator iterator = allPages.iterator();
iterator.hasNext(); )
{
WikiPage page = (WikiPage) iterator.next();
- String text = m_engine.getPageManager().getPageText(
page.getName(),
-
WikiProvider.LATEST_VERSION );
- luceneIndexPage( page, text, writer );
+
+ try
+ {
+ String text =
m_engine.getPageManager().getPageText( page.getName(),
+
WikiProvider.LATEST_VERSION );
+ luceneIndexPage( page, text, writer );
+ }
+ catch( Exception e )
+ {
+ log.info("Unable to index page, continuing to
next: "+page.getName(),e );
+ }
}
Collection allAttachments =
m_engine.getAttachmentManager().getAllAttachments();
for( Iterator iterator = allAttachments.iterator();
iterator.hasNext(); )
{
Attachment att = (Attachment) iterator.next();
- String text = getAttachmentContent( att.getName(),
-
WikiProvider.LATEST_VERSION );
- luceneIndexPage( att, text, writer );
+
+ try
+ {
+ String text = getAttachmentContent( att.getName(),
+
WikiProvider.LATEST_VERSION );
+ luceneIndexPage( att, text, writer );
+ }
+ catch( Exception e )
+ {
+ log.info("Unable to index attachment, continuing
to next: "+att.getName(),e );
+ }
}
writer.optimize();
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=711351&r1=711350&r2=711351&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js (original)
+++ incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js Tue Nov 4
10:45:27 2008
@@ -201,6 +201,9 @@
.addEvent('keyup', this.getSuggestions.bind(this))
.addEvent('change', this.onChangeTextarea.bind(this))
.focus();
+
+ /* regularly refresh section-edit toc and sneak-preview */
+
this.textarea.fireEvent.periodical(3000,this.textarea,['change']);
},
/* add textarea resize drag bar */
@@ -483,12 +486,15 @@
},
onPageLoadPreview : function(){
- if( $$('#sneakpreview','#autopreview').length != 2) return;
- $('autopreview')
+ var checkbox = $('autopreview');
+
+ if(!checkbox) return;
+
+ checkbox
.setProperty('checked', Wiki.prefs.get('autopreview')
|| false)
.addEvent('click', function(){
var ta = this.textarea,
- isOn = $('autopreview').checked;
+ isOn = checkbox.checked;
$('sneakpreview').empty();
ta.removeEvents('preview');
@@ -501,22 +507,14 @@
refreshPreview: function(){
var preview = $('sneakpreview');
- this.bgcolor = this.bgcolor ||
preview.getStyle('background-color');
- var bgcolorfx = (this.bgcolor == 'transparent' ) ? '#fff' :
this.bgcolor,
- previewfx = preview.effect('background-color', {
- duration:2000,
- wait:false,
- onComplete:function(){
preview.setStyle('background-color', this.bgcolor); }
- });
-
- //TODO: put a spinner in the preview result block
+ $('previewSpin').show();
new Ajax( Wiki.TemplateUrl +
"/AJAXPreview.jsp?page="+Wiki.PageName, {
postBody: 'wikimarkup=' +
encodeURIComponent(this.textarea.value),
update: preview,
onComplete: function(){
+ $('previewSpin').hide();
Wiki.renderPage(preview, Wiki.PageName);
- previewfx.start('#ffff88',bgcolorfx);
}
}).request();
},
@@ -645,6 +643,7 @@
* happens when
* (i) textarea is changed and deselected (click outside the
textarea)
* (ii) user clicks a toolbar-button
+ * (iii) periodical
*
* 1) copy section textarea at the right offset of the main textarea
* 2) refresh the section-edit menu
@@ -652,6 +651,9 @@
onChangeTextarea : function(){
var ta = this.textarea, ma = this.mainarea;
+ if(ta.value == this.cacheTextarea) return;
+ this.cacheTextarea=ta.value;
+
if( this.sections ){
var s = ta.value;
if( s.lastIndexOf("\n") + 1 != s.length ) ta.value +=
'\n';
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp?rev=711351&r1=711350&r2=711351&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp Tue
Nov 4 10:45:27 2008
@@ -211,6 +211,7 @@
<div id="sneakpreviewheader">
<input type="checkbox" name="autopreview" id="autopreview"
<%=TextUtil.isPositive((String)session.getAttribute("autopreview")) ?
"checked='checked'" : ""%> />
<label for="autopreview" title="<fmt:message
key='editor.plain.sneakpreview.title'/>"><fmt:message
key="editor.plain.sneakpreview"/></label>
+ <span id="previewSpin" class="spin"
style="position:absolute;display:none;"></span>
</div>
<div id="sneakpreview" ></div>
