summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakozak2011-11-25 05:29:57 (EST)
committer Winston Prakash2011-12-01 20:47:37 (EST)
commit0fa5a23a18c315ec415276a5410de2fd7f226c29 (patch)
treec71221df2098bd7e7889d990092ebc2b80eee0f9
parent943782308e131c39987b15f8f5f2a2ff1071b6e2 (diff)
downloadorg.eclipse.hudson.core-0fa5a23a18c315ec415276a5410de2fd7f226c29.zip
org.eclipse.hudson.core-0fa5a23a18c315ec415276a5410de2fd7f226c29.tar.gz
org.eclipse.hudson.core-0fa5a23a18c315ec415276a5410de2fd7f226c29.tar.bz2
Resolve HUDSON-9072 (500 Exception adding a slave axis to a matrix build in IE8): Fix IE JS specific name attribute handling. Small javaDoc fix.
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
-rw-r--r--hudson-core/src/main/java/hudson/util/CascadingUtil.java2
-rw-r--r--hudson-war/src/main/webapp/scripts/hudson-behavior.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/hudson-core/src/main/java/hudson/util/CascadingUtil.java b/hudson-core/src/main/java/hudson/util/CascadingUtil.java
index 87ac8a2..a2165f7 100644
--- a/hudson-core/src/main/java/hudson/util/CascadingUtil.java
+++ b/hudson-core/src/main/java/hudson/util/CascadingUtil.java
@@ -519,7 +519,7 @@ public class CascadingUtil {
* As for {@link ParametersDefinitionProperty} single instance doesn't support cascading, so, classes are
* grouped into list of {@link ParametersDefinitionProperty} and whole list could be inherited or overridden.
- * * @param d property descriptor.
+ * @param d property descriptor.
* @return true - if JobProperty could be used for cascading, false - otherwise.
* @see #setParameterDefinitionProperties(hudson.model.Job, String, CopyOnWriteList)
* @see hudson.model.Job#getParameterDefinitionProperties()
diff --git a/hudson-war/src/main/webapp/scripts/hudson-behavior.js b/hudson-war/src/main/webapp/scripts/hudson-behavior.js
index 8342636..8860c36 100644
--- a/hudson-war/src/main/webapp/scripts/hudson-behavior.js
+++ b/hudson-war/src/main/webapp/scripts/hudson-behavior.js
@@ -1650,7 +1650,7 @@ function findFormParent(e,form,static) {
return null; // this field shouldn't contribute to the final result
var name = e.getAttribute("name");
- if(name!=null) {
+ if(name!=null && name!='') {
if(e.tagName=="INPUT" && !static && !xor(e.checked,Element.hasClassName(e,"negative")))
return null; // field is not active