Index: branches/RC/core/admin_templates/js/application.js
===================================================================
diff -u -r9639 -r11368
--- branches/RC/core/admin_templates/js/application.js	(.../application.js)	(revision 9639)
+++ branches/RC/core/admin_templates/js/application.js	(.../application.js)	(revision 11368)
@@ -1,12 +1,5 @@
 function kApplication() {
 	this.Hooks = new Array ();
-
-	addLoadEvent(
-		function () {
-			Application.processHooks('m:OnAfterWindowLoad');
-		}
-	);
-
 }
 
 kApplication.prototype.SetVar = function ($name, $value) {
@@ -23,6 +16,14 @@
 		$hook_mode = hBEFORE;
 	}
 	if (typeof $hook_to == 'string') {
+		if ($hook_to == 'm:OnAfterWindowLoad') {
+			$(document).ready($do_code);
+
+			// call add load method here, when jquery not available
+//			this.addLoadEvent($do_code);
+			return ;
+		}
+
 		setArrayValue(this.Hooks, $hook_to, $hook_mode, $do_code);
 	}
 	else {
@@ -34,6 +35,21 @@
 	}
 }
 
+kApplication.prototype.addLoadEvent = function (func, wnd) {
+	if (!wnd) wnd = window
+	var oldonload = wnd.onload;
+	if (typeof wnd.onload != 'function') {
+    	wnd.onload = func;
+	} else {
+		wnd.onload = function() {
+			if (oldonload) {
+	        	oldonload();
+			}
+			func();
+		}
+	}
+}
+
 kApplication.prototype.processHooks = function ($hook_to, $hook_mode) {
 	if (!isset($hook_mode)) {
 		$hook_mode = hBEFORE;