diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-03-12 21:51:07 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-03-12 21:51:07 +0000 |
| commit | 19b7ea9a394af6e8366c64faa77badb716d743a5 (patch) | |
| tree | 81382762378c7e5c2f62f4208c5cf6ff3a048b1d /views/default/js | |
| parent | 120488c29722c1cde9a4715ccbe0f1626d4738ae (diff) | |
| download | elgg-19b7ea9a394af6e8366c64faa77badb716d743a5.tar.gz elgg-19b7ea9a394af6e8366c64faa77badb716d743a5.tar.bz2 | |
Fixes #3065, #3089. Merged JS events and hooks to a single system. Updated plugins and core to use it. Added elgg.getURLFragment() and using it elgg.ui.popsUp().
git-svn-id: http://code.elgg.org/elgg/trunk@8671 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default/js')
| -rw-r--r-- | views/default/js/admin.php | 2 | ||||
| -rw-r--r-- | views/default/js/elgg.php | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/views/default/js/admin.php b/views/default/js/admin.php index 15c74d4de..afffe95f0 100644 --- a/views/default/js/admin.php +++ b/views/default/js/admin.php @@ -146,4 +146,4 @@ elgg.admin.moveProfileField = function(e, ui) { }); } -elgg.register_event_handler('init', 'system', elgg.admin.init, 1000);
\ No newline at end of file +elgg.register_hook_handler('init', 'system', elgg.admin.init, 1000);
\ No newline at end of file diff --git a/views/default/js/elgg.php b/views/default/js/elgg.php index 9ddd6907a..018db7967 100644 --- a/views/default/js/elgg.php +++ b/views/default/js/elgg.php @@ -28,7 +28,7 @@ foreach ($model_files as $file) { $libs = array( //libraries 'prototypes', - 'events', + 'hooks', 'security', 'languages', 'ajax', @@ -59,11 +59,12 @@ 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'); +elgg.trigger_hook('boot', 'system'); //After the DOM is ready $(function() { - elgg.trigger_event('init', 'system'); + elgg.trigger_hook('init', 'system'); + elgg.trigger_hook('ready', 'system'); }); <?php |