Merge pull request #9 from gcummings/JENKINS-23867

[FIXED JENKINS-23867] Update javascript to work with new core div layout in Jenkins 1.572
jenkinsci · Jul 23, 2014 · eaaeef1 · eaaeef1
2 parents ff832f2 + f1f5ced
commit eaaeef1
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/main/resources/hudson/plugins/timestamper/annotator/TimestampAnnotatorFactory/script.js b/src/main/resources/hudson/plugins/timestamper/annotator/TimestampAnnotatorFactory/script.js
@@ -85,8 +85,16 @@ function timestampFound() {
         return;
     }
     settingsInserted = true;
+
+    // for div layout in >= 1.572 we need to use 'side-panel-content'
+    var element = document.getElementById('side-panel-content');
+    if (null == element) {
+        // for < 1.572 we need to use 'navigation'
+        element = document.getElementById('navigation');
+    }
+
     new Ajax.Updater(
-        document.getElementById('navigation'),
+        element,
         rootURL + "/extensionList/hudson.console.ConsoleAnnotatorFactory/hudson.plugins.timestamper.annotator.TimestampAnnotatorFactory/usersettings",
         { insertion: Insertion.After, onComplete: init }
     );
@@ -98,4 +106,4 @@ Behaviour.register({
     }
 });
 
-}());
+}());