aboutsummaryrefslogtreecommitdiff
path: root/views/default/js
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-14 11:33:29 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-14 11:33:29 +0000
commitc9f5c056862553d5102d1dfb7d964ea449573d59 (patch)
tree1b005cf7858d8358d76ed3ed8966170a6d4bab99 /views/default/js
parent72a4b251503eeb2ae4cc8efdea1f522817652406 (diff)
downloadelgg-c9f5c056862553d5102d1dfb7d964ea449573d59.tar.gz
elgg-c9f5c056862553d5102d1dfb7d964ea449573d59.tar.bz2
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
Diffstat (limited to 'views/default/js')
-rw-r--r--views/default/js/initialise_elgg.php16
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