Refs #2538: Added vsprintf support to elgg.echo. Added unit tests for normalize_url, added prototype definitions for Array#forEach for compatibility with IE.

git-svn-id: http://code.elgg.org/elgg/trunk@7313 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 12 insertions, 4 deletions

diff --git a/views/default/js/initialise_elgg.php b/views/default/js/initialise_elgg.php
index 3de1c020b..49c12e30c 100644
--- a/views/default/js/initialise_elgg.php
+++ b/views/default/js/initialise_elgg.php
@@ -4,7 +4,14 @@
  */
 global $CONFIG;
 
-include("{$CONFIG->path}js/lib/elgglib.js");
+$prereq_files = array(
+	"vendors/sprintf.js",
+	"js/lib/elgglib.js",
+);
+
+foreach ($prereq_files as $file) {
+	include("{$CONFIG->path}$file");
+}
 
 //No such thing as autoloading classes in javascript
 $model_files = array(
@@ -13,13 +20,14 @@ $model_files = array(
 	'ElggPriorityList',
 );
 
-foreach($model_files as $file) {
+foreach ($model_files as $file) {
 	include("{$CONFIG->path}js/classes/$file.js");
 }
 
 //Include library files
 $libs = array(
 	//libraries
+	'prototypes',
 	'events',
 	'security',
 	'languages',
@@ -31,7 +39,7 @@ $libs = array(
 	'ui.widgets',
 );
 
-foreach($libs as $file) {
+foreach ($libs as $file) {
 	include("{$CONFIG->path}js/lib/$file.js");
 }
 
@@ -43,7 +51,7 @@ foreach($libs as $file) {
 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 ?>
+elgg.security.interval = 5 * 60 * 1000; <?php //@todo make this configurable ?>
 
 //Mimic PHP engine boot process