Refs #3182: Feeding language loading through /ajax/view to keep thing simpler for...

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

diff --git a/js/lib/elgglib.js b/js/lib/elgglib.js
index 5ba80fc067ef7db732c240c20155dcb6a76761e5..f2545fb6c9236350912cb0af1be8a8e62b91bbe0 100644 (file)
--- a/js/lib/elgglib.js
+++ b/js/lib/elgglib.js
@@ -379,4 +379,4 @@ elgg.getSelectorFromUrlFragment = function(url) {
                }
        }
        return '';
-}
\ No newline at end of file
+};
\ No newline at end of file

diff --git a/js/lib/languages.js b/js/lib/languages.js
index 0e3cf4472153535f12ef88231903a95c3cb7cb8b..28b82e2e93ae7fd3e77cf527daa179be4dfe00a0 100644 (file)
--- a/js/lib/languages.js
+++ b/js/lib/languages.js
@@ -25,12 +25,8 @@ elgg.add_translation = function(lang, translations) {
  */
 elgg.reload_all_translations = function(language) {
        var lang = language || elgg.get_language();
-       // This...................vvvvv is a double encoded question mark (? -> %2f -> %252f)
-       elgg.getJSON('js/languages%252f' + lang + '.js', {
-               data: {
-                       'viewtype': 'default',
-                       'lastcache': elgg.config.lastcache
-               },
+
+       elgg.getJSON('ajax/view/js/languages/' + lang, {
                success: function(json) {
                        elgg.add_translation(lang, json);
                }

diff --git a/views/default/js/elgg.php b/views/default/js/elgg.php
index a434afc7d558b13a2d6b2fa77182bb80c9b7aa28..76388f80cf6378ad556b674d29f45d5d5909b4c5 100644 (file)
--- a/views/default/js/elgg.php
+++ b/views/default/js/elgg.php
@@ -57,11 +57,6 @@ 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_hook('boot', 'system');
-
 //After the DOM is ready
 $(function() {
        elgg.trigger_hook('init', 'system');

diff --git a/views/default/js/initialize_elgg.php b/views/default/js/initialize_elgg.php
index 9032d8a63d316b83845117b807df8375582ee695..cdadd4d32f023835e6844bdbdcf4b209032c1792 100644 (file)
--- a/views/default/js/initialize_elgg.php
+++ b/views/default/js/initialize_elgg.php
@@ -1,6 +1,6 @@
 <?php 
 /**
- * 
+ * Initialize Elgg's js lib with the uncacheable data
  */
 
 ?>
@@ -8,11 +8,15 @@
  * Don't want to cache these -- they could change for every request
  */
 elgg.config.lastcache = <?php echo (int)elgg_get_config('lastcache'); ?>;
+elgg.config.viewtype = '<?php echo elgg_get_viewtype(); ?>';
+elgg.config.simplecache_enabled = <?php echo elgg_is_simplecache_enabled(); ?>;
 
 elgg.security.token.__elgg_ts = <?php echo $ts = time(); ?>;
 elgg.security.token.__elgg_token = '<?php echo generate_action_token($ts); ?>';
 
 <?php
+// @todo json export should be smoother than this...  
+// @todo Might also be nice to make url exportable. $entity->url? yes please!
 $page_owner = elgg_get_page_owner_entity();
 
 if ($page_owner instanceof ElggEntity) {
@@ -24,7 +28,7 @@ if ($page_owner instanceof ElggEntity) {
        $page_owner_json['subtype'] = $page_owner->getSubtype();
        $page_owner_json['url'] = $page_owner->getURL();
        
-       echo 'elgg.page_owner =  '.json_encode($page_owner_json).';'; 
+       echo 'elgg.page_owner =  ' . json_encode($page_owner_json) . ';'; 
 }
 
 $user = elgg_get_logged_in_user_entity();
@@ -38,6 +42,9 @@ if ($user instanceof ElggUser) {
        $user_json['subtype'] = $user->getSubtype();
        $user_json['url'] = $user->getURL();
        
-       echo 'elgg.session.user = new elgg.ElggUser('.json_encode($user_json).');'; 
+       echo 'elgg.session.user = new elgg.ElggUser(' . json_encode($user_json) . ');'; 
 }
 ?>
+
+//Before the DOM is ready, but elgg's js framework is fully initalized
+elgg.trigger_hook('boot', 'system');
\ No newline at end of file