Merge branch 'master' of git.freeside.biz:/home/git/freeside

1 files changed, 7 insertions, 6 deletions

diff --git a/httemplate/elements/onload.js b/httemplate/elements/onload.js
index bfa7eef94..c7bbbb283 100644
--- a/httemplate/elements/onload.js
+++ b/httemplate/elements/onload.js
@@ -12,11 +12,12 @@ Usage:
 
 </%doc>
 (function() {
-  var tmp = window.onload;
-  window.onload = function() {
-    if (typeof(tmp)== 'function') {
-      tmp();
-    }
+  var myonload = function() {
 <% $m->content %>
-  };
+  }
+  if ( window.addEventListener ) {
+    window.addEventListener('load', myonload);
+  } else if ( window.attachEvent ) {
+    window.attachEvent('onload', myonload);
+  }
 })();