No need for double-namespacing of javascript functions

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

diff --git a/js/lib/languages.js b/js/lib/languages.js
index e8c2ad0ca045cb61e08c9533dcb976e273c86d0c..e464fc0ff85541be37ae0a67c741eae105472cdc 100644 (file)
--- a/js/lib/languages.js
+++ b/js/lib/languages.js
@@ -41,7 +41,7 @@ elgg.reload_all_translations = function(language) {
  * @return {String}
  */
 elgg.get_language = function() {
-       var user = elgg.elgg_get_logged_in_user_entity();
+       var user = elgg.get_logged_in_user_entity();
 
        if (user && user.language) {
                return user.language;

diff --git a/js/lib/session.js b/js/lib/session.js
index 2d319b00f5db2b666f15b4cbf9ab9db057fd420a..48821a2604504d0d851d43000cf0fb7faa0cd7ce 100644 (file)
--- a/js/lib/session.js
+++ b/js/lib/session.js
@@ -83,15 +83,15 @@ elgg.session.cookie = function (name, value, options) {
 /**
  * @return {ElggUser} The logged in user
  */
-elgg.elgg_get_logged_in_user_entity = function() {
+elgg.get_logged_in_user_entity = function() {
        return elgg.session.user;
 };
 
 /**
  * @return {number} The GUID of the logged in user
  */
-elgg.elgg_get_logged_in_user_guid = function() {
-       var user = elgg.elgg_get_logged_in_user_entity();
+elgg.get_logged_in_user_guid = function() {
+       var user = elgg.get_logged_in_user_entity();
        return user ? user.guid : 0;
 };
 
@@ -99,14 +99,14 @@ elgg.elgg_get_logged_in_user_guid = function() {
  * @return {boolean} Whether there is a user logged in
  */
 elgg.elgg_is_logged_in = function() {
-       return (elgg.elgg_get_logged_in_user_entity() instanceof elgg.ElggUser);
+       return (elgg.get_logged_in_user_entity() instanceof elgg.ElggUser);
 };
 
 /**
  * @return {boolean} Whether there is an admin logged in
  */
 elgg.elgg_is_admin_logged_in = function() {
-       var user = elgg.elgg_get_logged_in_user_entity();
+       var user = elgg.get_logged_in_user_entity();
        return (user instanceof elgg.ElggUser) && user.isAdmin();
 };
 

diff --git a/js/lib/ui.widgets.js b/js/lib/ui.widgets.js
index 660548a153ad3e1cad356a2495364568bd1d9e6b..b6e81617afd0c9c924ea5a49e4560cdfab15bf4e 100644 (file)
--- a/js/lib/ui.widgets.js
+++ b/js/lib/ui.widgets.js
@@ -56,7 +56,7 @@ elgg.ui.widgets.add = function(event) {
        elgg.action('widgets/add', {
                data: {
                        handler: type,
-                       user_guid: elgg.elgg_get_logged_in_user_guid(),
+                       user_guid: elgg.get_logged_in_user_guid(),
                        context: $("input[name='widget_context']").val()
                },
                success: function(json) {