jsLinted security.js + using elgg typecheckers rather than ===

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

diff --git a/js/lib/security.js b/js/lib/security.js
index bdd762560b1f0bc4f9588cf548974e11b9916395..ab5c829be80486fa4f2b9380d412ef5af7f67ff3 100644 (file)
--- a/js/lib/security.js
+++ b/js/lib/security.js
@@ -41,10 +41,10 @@ elgg.security.refreshToken = function() {
  */\r
 elgg.security.addToken = function(data) {\r
 \r
-       //addToken('data=sofar')\r
-       if (typeof data == 'string') {\r
+       // 'http://example.com?data=sofar'\r
+       if (elgg.isString(data)) {\r
                var args = [];\r
-               if(data) {\r
+               if (data) {\r
                        args.push(data);\r
                }\r
                args.push("__elgg_ts=" + elgg.security.token.__elgg_ts);\r
@@ -53,12 +53,17 @@ elgg.security.addToken = function(data) {
                return args.join('&');\r
        }\r
        \r
-       //addToken({...})\r
-       if (typeof data == 'object' || typeof data == 'undefined') {\r
+       // no input!  acts like a getter\r
+       if (elgg.isUndefined(data)) {\r
+           return elgg.security.token;\r
+       }\r
+       \r
+       // {...}\r
+       if (elgg.isPlainObject(data)) {\r
                return $.extend(data, elgg.security.token);\r
        }\r
 \r
-       //addToken(???)\r
+       // oops, don't recognize that!\r
        throw new TypeError("elgg.security.addToken not implemented for " + (typeof data) + "s");\r
 };\r
 \r