Fixes �#32

os-js · Nov 10, 2014 · 08f490b · 08f490b
1 parent ffe0971
commit 08f490b
Showing 1 changed file with 12 additions and 15 deletions.
diff --git a/src/javascript/main.js b/src/javascript/main.js
@@ -51,22 +51,19 @@
   // Main initialization code
   /////////////////////////////////////////////////////////////////////////////
 
-  function _onLoad() {
+  var loaded = false;
+  document.addEventListener('DOMContentLoaded', function() {
+    if ( loaded ) { return; }
+    loaded = true;
     OSjs.Core.initialize();
-  }
-
-  function _onUnload() {
+  });
+  document.addEventListener('load', function() {
+    if ( loaded ) { return; }
+    loaded = true;
+    OSjs.Core.initialize();
+  });
+  document.addEventListener('unload', function() {
     OSjs.Core.shutdown(false, true);
-  }
-
-  var jQuery = window.$ || window.jQuery;
-  if ( typeof jQuery !== 'undefined' ) {
-    console.warn('Using jQuery initialization');
-    jQuery(window).on('load', _onLoad);
-    jQuery(window).on('unload', _onUnload);
-  } else {
-    window.onload   = _onLoad;
-    window.onunload = _onUnload;
-  }
+  });
 
 })();