You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/11/20 13:45:48 UTC
[1/4] git commit: WICKET-5420 Make UploadProgressBar easier to extend
Updated Branches:
refs/heads/wicket-6.x 9eb670b5a -> 5a73fe98b
WICKET-5420 Make UploadProgressBar easier to extend
Allow to set the value of the 'display' property with Wicket.DOM.show()
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/10082e75
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/10082e75
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/10082e75
Branch: refs/heads/wicket-6.x
Commit: 10082e75833c8cb65cf1e7c85be331693c661501
Parents: 0593932
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Nov 20 14:25:48 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Nov 20 14:28:52 2013 +0200
----------------------------------------------------------------------
.../org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/10082e75/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
index 190e1e7..4d6beb0 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
@@ -1527,11 +1527,16 @@
*/
DOM: {
- /** shows an element */
- show: function (e) {
+ /**
+ * Shows an element
+ * @param {HTMLElement} e The HTML element to show
+ * @param {String} display The value of CSS display property to use, e
+ * .g. 'block', 'inline'. Optional
+ */
+ show: function (e, display) {
e = Wicket.$(e);
if (e !== null) {
- e.style.display = "";
+ e.style.display = display || "";
}
},
[3/4] git commit: WICKET-5420 Make UploadProgressBar easier to extend
Posted by mg...@apache.org.
WICKET-5420 Make UploadProgressBar easier to extend
Fix a typo in comments
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/58873efb
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/58873efb
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/58873efb
Branch: refs/heads/wicket-6.x
Commit: 58873efb0f843081824d03484b639c607b177f9d
Parents: 10082e7
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Nov 20 14:26:59 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Nov 20 14:28:53 2013 +0200
----------------------------------------------------------------------
.../main/java/org/apache/wicket/examples/upload/UploadPage.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/58873efb/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java
index f87174a..92e03c8 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java
@@ -103,7 +103,7 @@ public class UploadPage extends WicketExamplePage
{
super(name);
- // set this form to multipart mode (allways needed for uploads!)
+ // set this form to multipart mode (always needed for uploads!)
setMultiPart(true);
// Add one file input field
[2/4] git commit: WICKET-5420 Make UploadProgressBar easier to extend
Posted by mg...@apache.org.
WICKET-5420 Make UploadProgressBar easier to extend
Always remove the custom attribute Wicket sets to form element when calling its onsubmit() method.
onsubmit() may throw an exception and the attribute won't be removed.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/05939320
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/05939320
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/05939320
Branch: refs/heads/wicket-6.x
Commit: 05939320c54949e20372c940622c528024addb71
Parents: 9eb670b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Nov 20 14:20:48 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Nov 20 14:28:52 2013 +0200
----------------------------------------------------------------------
.../org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/05939320/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
index 6144ceb..190e1e7 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
@@ -779,11 +779,12 @@
if (form.onsubmit && !form.getAttribute(submittingAttribute)) {
form.setAttribute(submittingAttribute, submittingAttribute);
- var retValue = form.onsubmit();
- if (typeof(retValue) === "undefined") {
- retValue = true;
+ var retValue = true;
+ try {
+ retValue = form.onsubmit();
+ } finally {
+ form.removeAttribute(submittingAttribute);
}
- form.removeAttribute(submittingAttribute);
if (!retValue) {
return;
}
[4/4] git commit: WICKET-5420 Make UploadProgressBar easier to extend
Posted by mg...@apache.org.
WICKET-5420 Make UploadProgressBar easier to extend
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5a73fe98
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5a73fe98
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5a73fe98
Branch: refs/heads/wicket-6.x
Commit: 5a73fe98b637bf5e00c2925e6f4f3cb7a7f34c09
Parents: 58873ef
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Nov 20 14:27:44 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Nov 20 14:28:53 2013 +0200
----------------------------------------------------------------------
.../html/form/upload/UploadProgressBar.java | 52 ++++++++++----------
.../ajax/markup/html/form/upload/progressbar.js | 16 +++---
2 files changed, 32 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/5a73fe98/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
index 8f3a201..e69582d 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
@@ -19,6 +19,7 @@ package org.apache.wicket.extensions.ajax.markup.html.form.upload;
import java.util.Formatter;
import org.apache.wicket.Application;
+import org.apache.wicket.Component;
import org.apache.wicket.IInitializer;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.markup.head.CssHeaderItem;
@@ -36,10 +37,9 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.request.resource.SharedResourceReference;
import org.apache.wicket.resource.CoreLibrariesContributor;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A panel to show the progress of an HTTP upload.
@@ -71,8 +71,6 @@ import org.slf4j.LoggerFactory;
*/
public class UploadProgressBar extends Panel
{
- private static final Logger log = LoggerFactory.getLogger(UploadProgressBar.class);
-
/**
* Resource key used to retrieve starting message for.
*
@@ -85,26 +83,19 @@ public class UploadProgressBar extends Panel
*/
public final static class ComponentInitializer implements IInitializer
{
- /**
- * @see org.apache.wicket.IInitializer#init(org.apache.wicket.Application)
- */
@Override
public void init(final Application application)
{
// register the upload status resource
- Application.get().getSharedResources().add(RESOURCE_NAME, new UploadStatusResource());
+ application.getSharedResources().add(RESOURCE_NAME, new UploadStatusResource());
}
- /**
- * @see java.lang.Object#toString()
- */
@Override
public String toString()
{
return "UploadProgressBar initializer";
}
- /** {@inheritDoc} */
@Override
public void destroy(final Application application)
{
@@ -123,9 +114,9 @@ public class UploadProgressBar extends Panel
private final Form<?> form;
- private final WebMarkupContainer statusDiv;
+ private Component statusDiv;
- private final WebMarkupContainer barDiv;
+ private Component barDiv;
private final FileUploadField uploadField;
@@ -165,28 +156,37 @@ public class UploadProgressBar extends Panel
uploadField.setOutputMarkupId(true);
}
- this.form = form;
+ this.form = Args.notNull(form, "form");
form.setOutputMarkupId(true);
setRenderBodyOnly(true);
-
- barDiv = new WebMarkupContainer("bar");
- barDiv.setOutputMarkupId(true);
- add(barDiv);
-
- statusDiv = new WebMarkupContainer("status");
- statusDiv.setOutputMarkupId(true);
- add(statusDiv);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void onInitialize()
{
super.onInitialize();
getCallbackForm().setOutputMarkupId(true);
+
+ barDiv = newBarComponent("bar");
+ add(barDiv);
+
+ statusDiv = newStatusComponent("status");
+ add(statusDiv);
+ }
+
+ protected Component newStatusComponent(String id)
+ {
+ WebMarkupContainer status = new WebMarkupContainer(id);
+ status.setOutputMarkupId(true);
+ return status;
+ }
+
+ protected Component newBarComponent(String id)
+ {
+ WebMarkupContainer bar = new WebMarkupContainer(id);
+ bar.setOutputMarkupId(true);
+ return bar;
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/5a73fe98/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js
index b1defb5..0afdd80 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js
@@ -47,21 +47,17 @@
},
start : function(){
- this.displayprogress = true;
- if (this.fileid) {
- var fileupload = Wicket.$(this.fileid);
- this.displayprogress = fileupload && fileupload.value && fileupload.value !== '';
- }
- if (this.displayprogress) {
+ var fileupload = Wicket.$(this.fileid);
+ if (fileupload && fileupload.value) {
this.setPercent(0);
this.setStatus(this.initialStatus);
- Wicket.$(this.statusid).style.display='block';
- Wicket.$(this.barid).style.display='block';
+ Wicket.DOM.show(this.statusid, 'block');
+ Wicket.DOM.show(this.barid, 'block');
this.scheduleUpdate();
}
},
- setStatus : function(status){
+ setStatus : function(status) {
var label = document.createElement("label");
label.innerHTML = status;
var oldLabel = Wicket.$(this.statusid).firstChild;
@@ -71,7 +67,7 @@
Wicket.$(this.statusid).appendChild(label);
},
- setPercent : function(progressPercent){
+ setPercent : function(progressPercent) {
Wicket.$(this.barid).firstChild.firstChild.style.width = progressPercent + '%';
},