You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2013/11/19 20:32:02 UTC
git commit: TAP5-2188: Typo & Java Script error in Upload component /
JavaScript module "injected-uploader.js"
Updated Branches:
refs/heads/master 303f7e00a -> 7030ba26f
TAP5-2188: Typo & Java Script error in Upload component / JavaScript module "injected-uploader.js"
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/7030ba26
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/7030ba26
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/7030ba26
Branch: refs/heads/master
Commit: 7030ba26f10882dc043b33ef6344add267a3aebd
Parents: 303f7e0
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Tue Nov 19 11:31:55 2013 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Tue Nov 19 11:31:55 2013 -0800
----------------------------------------------------------------------
.../java/org/apache/tapestry5/upload/components/Upload.java | 4 ++--
.../resources/META-INF/modules/t5/core/injected-upload.js | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7030ba26/tapestry-upload/src/main/java/org/apache/tapestry5/upload/components/Upload.java
----------------------------------------------------------------------
diff --git a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/components/Upload.java b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/components/Upload.java
index 9047587..db92161 100755
--- a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/components/Upload.java
+++ b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/components/Upload.java
@@ -1,4 +1,4 @@
-// Copyright 2007, 2008, 2009, 2011, 2012 The Apache Software Foundation
+// Copyright 2007-2013 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -139,7 +139,7 @@ public class Upload extends AbstractField
// TAPESTRY-2453
if (request.isXHR())
{
- javaScriptSupport.require("t5/core/injected-uploader").with(getClientId());
+ javaScriptSupport.require("t5/core/injected-upload").with(getClientId());
}
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7030ba26/tapestry-upload/src/main/resources/META-INF/modules/t5/core/injected-upload.js
----------------------------------------------------------------------
diff --git a/tapestry-upload/src/main/resources/META-INF/modules/t5/core/injected-upload.js b/tapestry-upload/src/main/resources/META-INF/modules/t5/core/injected-upload.js
index d7b94be..fe3cb95 100644
--- a/tapestry-upload/src/main/resources/META-INF/modules/t5/core/injected-upload.js
+++ b/tapestry-upload/src/main/resources/META-INF/modules/t5/core/injected-upload.js
@@ -1,4 +1,4 @@
-// Copyright 2012 The Apache Software Foundation
+// Copyright 2012-2013 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -20,11 +20,11 @@ define(["./dom"],
function (dom) {
return function (elementId) {
- var form = dom(elementId).findContainer("form");
+ var form = dom(elementId).closest("form");
if (form) {
- form.element.enctype = "multipart/form-data";
- form.element.encoding = "multipart/form-data";
+ form.attribute("enctype", "multipart/form-data");
+ form.attribute("encoding", "multipart/form-data");
}
}
});