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

Borked NanoUI

Browse Source
This commit is contained in:
ZomgPonies
2014-04-19 21:25:57 -04:00
parent 7ef8b46012
commit 042551e586
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nano/js/nano_base_helpers.js
+2 -6
View File
@@ -207,15 +207,11 @@ NanoBaseHelpers = function ()
{
status = 'selected';
}
<<<<<<< HEAD
html += '<div class="link ' + status + ' dnaSubBlock" data-href="' + generateHref(parameters) + '" id="dnaBlock' + index + '">' + characters[index] + '</div>';
=======
html += '<div class="link ' + status + ' dnaSubBlock" data-href="' + generateHref(parameters) + '" id="dnaBlock' + index + '">' + characters[index] + '</div>'
>>>>>>> 16f787a... Virology - NanoUI, gameplay tweaks, bugfixes
index++;
if (index % blockSize == 0 && index < characters.length)
{