Utilizing elgg.extend, rather than jQuery.extend

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

diff --git a/js/lib/security.js b/js/lib/security.js
index ab5c829be80486fa4f2b9380d412ef5af7f67ff3..7f04f0cfb272a667e192483313c3ec6d2507ddf1 100644 (file)
--- a/js/lib/security.js
+++ b/js/lib/security.js
@@ -8,11 +8,11 @@ elgg.security.token = {};
 elgg.security.setToken = function(json) {\r
        //update the convenience object\r
        elgg.security.token = json;\r
-       \r
+\r
        //also update all forms\r
        $('[name=__elgg_ts]').val(json.__elgg_ts);\r
        $('[name=__elgg_token]').val(json.__elgg_token);\r
-       \r
+\r
        //also update all links\r
        $('[href]').each(function() {\r
                this.href = this.href\r
@@ -34,7 +34,7 @@ elgg.security.refreshToken = function() {
 \r
 /**\r
  * Add elgg action tokens to an object or string (assumed to be url data)\r
- * \r
+ *\r
  * @param {Object|string} data\r
  * @return {Object} The new data object including action tokens\r
  * @private\r
@@ -48,19 +48,19 @@ elgg.security.addToken = function(data) {
                        args.push(data);\r
                }\r
                args.push("__elgg_ts=" + elgg.security.token.__elgg_ts);\r
-               args.push("__elgg_token=" + elgg.security.token.__elgg_token)\r
-               \r
+               args.push("__elgg_token=" + elgg.security.token.__elgg_token);\r
+\r
                return args.join('&');\r
        }\r
-       \r
+\r
        // no input!  acts like a getter\r
        if (elgg.isUndefined(data)) {\r
            return elgg.security.token;\r
        }\r
-       \r
+\r
        // {...}\r
        if (elgg.isPlainObject(data)) {\r
-               return $.extend(data, elgg.security.token);\r
+               return elgg.extend(data, elgg.security.token);\r
        }\r
 \r
        // oops, don't recognize that!\r