1 files changed, 13 insertions, 76 deletions

diff --git a/views/default/js/elgg.php b/views/default/js/elgg.php
index 872a44e52..c3b56e398 100644
--- a/views/default/js/elgg.php
+++ b/views/default/js/elgg.php
@@ -28,11 +28,13 @@ foreach ($model_files as $file) {
 $libs = array(
 	//libraries
 	'prototypes',
-	'events',
+	'hooks',
 	'security',
 	'languages',
 	'ajax',
 	'session',
+	'pageowner',
+	'configuration',
 
 	//ui
 	'ui',
@@ -41,96 +43,31 @@ $libs = array(
 
 foreach ($libs as $file) {
 	include("{$CONFIG->path}js/lib/$file.js");
+	// putting a new line between the files to address https://github.com/elgg/elgg/issues/3081
+	echo "\n";
 }
 
 /**
  * Set some values that are cacheable
  */
+if (0) { ?><script><?php }
 ?>
 
 elgg.version = '<?php echo get_version(); ?>';
 elgg.release = '<?php echo get_version(true); ?>';
 elgg.config.wwwroot = '<?php echo elgg_get_site_url(); ?>';
-elgg.security.interval = 5 * 60 * 1000; <?php //@todo make this configurable ?>
-
-//Mimic PHP engine boot process
-
-//Before the DOM is ready -- note that plugins aren't loaded yet
-elgg.trigger_event('boot', 'system');
+<?php //@todo make this configurable ?>
+elgg.security.interval = 5 * 60 * 1000;
+elgg.config.domReady = false;
+elgg.config.language = '<?php echo isset($CONFIG->language) ? $CONFIG->language : 'en'; ?>';
+elgg.config.languageReady = false;
 
 //After the DOM is ready
 $(function() {
-	elgg.trigger_event('init', 'system');
+	elgg.config.domReady = true;
+	elgg.initWhenReady();
 });
 
-
-// reusable slide in/out toggle function
-function elgg_slide_toggle(activateLink, parentElement, toggleElement) {
-	$(activateLink).closest(parentElement).find(toggleElement).animate({"height": "toggle"}, { duration: 400 });
-	return false;
-}
-
-// ELGG DROP DOWN MENU
-$.fn.elgg_dropdownmenu = function(options) {
-
-options = $.extend({speed: 350}, options || {});
-
-this.each(function() {
-
-	var root = this, zIndex = 5000;
-
-	function getSubnav(ele) {
-	if (ele.nodeName.toLowerCase() == 'li') {
-		var subnav = $('> ul', ele);
-		return subnav.length ? subnav[0] : null;
-	} else {
-
-		return ele;
-	}
-	}
-
-	function getActuator(ele) {
-	if (ele.nodeName.toLowerCase() == 'ul') {
-		return $(ele).parents('li')[0];
-	} else {
-		return ele;
-	}
-	}
-
-	function hide() {
-	var subnav = getSubnav(this);
-	if (!subnav) return;
-	$.data(subnav, 'cancelHide', false);
-	setTimeout(function() {
-		if (!$.data(subnav, 'cancelHide')) {
-		$(subnav).slideUp(100);
-		}
-	}, 250);
-	}
-
-	function show() {
-	var subnav = getSubnav(this);
-	if (!subnav) return;
-	$.data(subnav, 'cancelHide', true);
-	$(subnav).css({zIndex: zIndex++}).slideDown(options.speed);
-	if (this.nodeName.toLowerCase() == 'ul') {
-		var li = getActuator(this);
-		$(li).addClass('hover');
-		$('> a', li).addClass('hover');
-	}
-	}
-
-	$('ul, li', this).hover(show, hide);
-	$('li', this).hover(
-	function() { $(this).addClass('hover'); $('> a', this).addClass('hover'); },
-	function() { $(this).removeClass('hover'); $('> a', this).removeClass('hover'); }
-	);
-
-});
-
-};
-
-
 <?php
 
 $previous_content = elgg_view('js/initialise_elgg');