cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 20:13:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3322 from tigercat2000/i_somehow_keep_forgetting_to_make_branches

Browse Source 
Fix #3311, NanoUtility JavaScript errors
This commit is contained in:
Fox McCloud
2016-01-21 19:51:36 -05:00
parent ac6a004421 bfc6d7a233
commit e7ce3bc19e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nano/assets/nano.js
+1 -1
View File
File diff suppressed because one or more lines are too long
nano/scripts/nano/nano_utility.js
+2 -2
View File
@@ -49,7 +49,7 @@ var NanoUtility = function () {
secondVal = second[key];
if (secondVal && Object.prototype.toString.call(secondVal) === "[object Object]") {
first[key] = first[key] || {};
return util.extend(first[key], secondVal);
return NanoUtility.extend(first[key], secondVal);
} else {
return first[key] = secondVal;
}
@@ -73,7 +73,7 @@ var NanoUtility = function () {
command: "nanoclose " + _urlParameters.src
};
this.winset("is-visible", "false");
return location.href = util.href("winset", params);
return location.href = NanoUtility.href("winset", params);
}
}
} ();