jsLinted session.js, employed elgg type-checker functions, and did some more miscella...

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

diff --git a/js/lib/session.js b/js/lib/session.js
index 227c607eb948b444f444f0986cfff91e1ada2e4d..fc61144be5faed9745220e95fa7c6e4f5f10215d 100644 (file)
--- a/js/lib/session.js
+++ b/js/lib/session.js
@@ -15,19 +15,21 @@ elgg.provide('elgg.session');
  * \r
  * @return {string} The value of the cookie, if only name is specified\r
  */\r
-elgg.session.cookie = function(name, value, options) {\r
+elgg.session.cookie = function (name, value, options) {\r
+       var cookies = [], cookie = [], i = 0, date, valid = true;\r
+       \r
        //elgg.session.cookie()\r
-       if(typeof name == 'undefined') {\r
+       if (elgg.isUndefined(name)) {\r
                return document.cookie;\r
        }\r
        \r
        //elgg.session.cookie(name)\r
-       if (typeof value == 'undefined') {\r
-               if (document.cookie && document.cookie != '') {\r
-                       var cookies = document.cookie.split(';');\r
-                       for (var i = 0; i < cookies.length; i++) {\r
-                               var cookie = jQuery.trim(cookies[i]).split('=');\r
-                               if (cookie[0] == name) {\r
+       if (elgg.isUndefined(value)) {\r
+               if (document.cookie && document.cookie !== '') {\r
+                       cookies = document.cookie.split(';');\r
+                       for (i = 0; i < cookies.length; i += 1) {\r
+                               cookie = jQuery.trim(cookies[i]).split('=');\r
+                               if (cookie[0] === name) {\r
                                        return decodeURIComponent(cookie[1]);\r
                                }\r
                        }\r
@@ -36,30 +38,28 @@ elgg.session.cookie = function(name, value, options) {
        }\r
        \r
        // elgg.session.cookie(name, value[, opts])\r
-       var cookies = [];\r
-\r
        options = options || {};\r
        \r
-       if (value === null) {\r
+       if (elgg.isNull(value)) {\r
                value = '';\r
                options.expires = -1;\r
        }\r
        \r
        cookies.push(name + '=' + value);\r
        \r
-       if (typeof options.expires == 'number') {\r
-               var date, valid = true;\r
-               \r
-               if (typeof options.expires == 'number') {\r
+       if (elgg.isNumber(options.expires)) {\r
+               if (elgg.isNumber(options.expires)) {\r
                        date = new Date();\r
                        date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));\r
-               } else if(options.expires.toUTCString) {\r
+               } else if (options.expires.toUTCString) {\r
                        date = options.expires;\r
                } else {\r
                        valid = false;\r
                }\r
                \r
-               valid ? cookies.push('expires=' + date.toUTCString()) : 0;\r
+               if (valid) {\r
+                       cookies.push('expires=' + date.toUTCString());\r
+               }\r
        }\r
        \r
        // CAUTION: Needed to parenthesize options.path and options.domain\r
@@ -107,10 +107,10 @@ elgg.isloggedin = function() {
  */\r
 elgg.isadminloggedin = function() {\r
        var user = elgg.get_loggedin_user();\r
-       return (user instanceof ElggUser) && user.isAdmin();\r
+       return (user instanceof elgg.ElggUser) && user.isAdmin();\r
 };\r
 \r
 /**\r
  * @deprecated Use elgg.session.cookie instead\r
  */\r
-$.cookie = elgg.session.cookie;
\ No newline at end of file
+jQuery.cookie = elgg.session.cookie;
\ No newline at end of file