Merge pull request #2 from synopsys-arc-oss/jenkins_15568_ie_fix

[FIXED JENKINS-15568] - Appearance of sections in IE
jenkinsci · Oct 14, 2013 · 4e0d764 · 4e0d764
2 parents 286ea02 + cf8b0e6
commit 4e0d764
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -56,6 +56,27 @@ THE SOFTWARE.
 
     <build>
         <plugins>
+            <!--Validate Java version (1.7 isn't supported)-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>1.2</version>
+                <executions>
+                    <execution>
+                        <id>enforce-versions</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireJavaVersion>
+                                    <version>[1.6,1.7)</version>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>

diff --git a/...ources/org/jvnet/hudson/plugins/collapsingconsolesections/CollapsingSectionNote/script.js b/...ources/org/jvnet/hudson/plugins/collapsingconsolesections/CollapsingSectionNote/script.js
@@ -1,12 +1,22 @@
 function doToggle(o)
 {
     var section = o.parentNode.parentNode;
-    if (section.nextElementSibling.className == "collapsed") {
-        section.nextElementSibling.className = "expanded";
-        o.innerHTML = "Hide Details";
+    if (section.nextElementSibling) {
+        if (section.nextElementSibling.className == "collapsed") {
+            section.nextElementSibling.className = "expanded";
+            o.innerHTML = "Hide Details";
+        } else {
+            section.nextElementSibling.className = "collapsed";
+            o.innerHTML = "Show Details";
+        }
     } else {
-        section.nextElementSibling.className = "collapsed";
-        o.innerHTML = "Show Details";
+	if (section.nextSibling.className == "collapsed") {
+            section.nextSibling.className = "expanded";
+            o.innerHTML = "Hide Details";
+        } else {
+            section.nextSibling.className = "collapsed";
+            o.innerHTML = "Show Details";
+       }
     }
 }
 
@@ -84,13 +94,9 @@ function doToggle(o)
             var id = "console-section-"+(iota++);
             outline.appendChild(parseHtml("<li><a href='#"+id+"'>"+e.childNodes[0].data+"</a></li>"))
 
-            if (document.all)
-                e.innerHTML = '<a name="' + id + '"/>' + e.innerHtml;  // IE8 loses "name" attr in appendChild
-            else {
-                var a = document.createElement("a");
-                a.setAttribute("name",id);
-                e.parentNode.insertBefore(a, e);
-            }
+            var a = document.createElement("a");
+            a.setAttribute("name",id);
+            e.parentNode.insertBefore(a, e);
         }
     }