diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2011-09-29 18:16:03 -0700 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2011-09-29 18:16:03 -0700 |
| commit | bfdb9bb8a87a29038ba1ae25355684ae19678fdd (patch) | |
| tree | a074e2d6bfa19c17b284c3950b4555cf584eabe2 /js/lib | |
| parent | 7be23080f34a8f92ca1f8d49c3aa0e6ce3472f4c (diff) | |
| parent | a458ae4e0f8e5b19884860fead6e5f901b95eca4 (diff) | |
| download | elgg-bfdb9bb8a87a29038ba1ae25355684ae19678fdd.tar.gz elgg-bfdb9bb8a87a29038ba1ae25355684ae19678fdd.tar.bz2 | |
Merge branch 'master' of github.com:brettp/Elgg
Diffstat (limited to 'js/lib')
| -rw-r--r-- | js/lib/elgglib.js | 17 | ||||
| -rw-r--r-- | js/lib/languages.js | 2 | ||||
| -rw-r--r-- | js/lib/ui.js | 1 |
3 files changed, 19 insertions, 1 deletions
diff --git a/js/lib/elgglib.js b/js/lib/elgglib.js index f2545fb6c..9a372738d 100644 --- a/js/lib/elgglib.js +++ b/js/lib/elgglib.js @@ -379,4 +379,19 @@ elgg.getSelectorFromUrlFragment = function(url) { } } return ''; -};
\ No newline at end of file +}; + +/** + * Triggers the init hook when the library is ready + * + * Current requirements: + * - DOM is ready + * - languages loaded + * + */ +elgg.initWhenReady = function() { + if (elgg.config.languageReady && elgg.config.domReady) { + elgg.trigger_hook('init', 'system'); + elgg.trigger_hook('ready', 'system'); + } +}
\ No newline at end of file diff --git a/js/lib/languages.js b/js/lib/languages.js index 4cfe84968..ae7ba63e2 100644 --- a/js/lib/languages.js +++ b/js/lib/languages.js @@ -32,6 +32,8 @@ elgg.reload_all_translations = function(language) { }, success: function(json) { elgg.add_translation(lang, json); + elgg.config.languageReady = true; + elgg.initWhenReady(); } }); }; diff --git a/js/lib/ui.js b/js/lib/ui.js index 4426917ed..7abf7626f 100644 --- a/js/lib/ui.js +++ b/js/lib/ui.js @@ -275,5 +275,6 @@ elgg.ui.initDatePicker = function() { }); } + elgg.register_hook_handler('init', 'system', elgg.ui.init); elgg.register_hook_handler('getOptions', 'ui.popup', elgg.ui.LoginHandler);
\ No newline at end of file |