code/franz
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

made dev look prettier and removed the log in dev.js (dunno why you kept it in there - it was only sorting the first 20x20 set of data)

Browse source
This commit is contained in:
Dominick Pham 2009-08-15 01:01:33 -04:00
parent c872e9a031
commit 35a2eb79d4
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
css/example.css
View file

@ -160,6 +160,14 @@ a:hover { text-decoration: underline; }
-moz-border-radius: 2px;
margin: 2px 6px 3px 0;
}
.color_boxd {
float: left;
width: 15px;
height: 15px;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
margin: 1px 3px 1px 0;
}
.hideme {
display: none;

6
js/dev.js
View file

@ -165,7 +165,7 @@ var franz = {
var docStr = "";
for(var i = 0; i < franz.alpha.length; i++) {
docStr += '<div class="color_box" style="background-color: rgb(' + franz.red[order_array[i]] + ', ' + franz.green[order_array[i]] + ',' + franz.blue[order_array[i]] + ');"></div>';
docStr += '<div class="color_boxd" style="background-color: rgb(' + franz.red[order_array[i]] + ', ' + franz.green[order_array[i]] + ',' + franz.blue[order_array[i]] + ');"></div>';
}
document.getElementById("log_colors").innerHTML = docStr;
@ -226,15 +226,11 @@ var franz = {
for (var i = start; i < end; i++) {
for (var j = end-1; j >= start; j--) {
var diff = inputArray[j] - inputArray[i]
console.log("j=" + inputArray[j] + " i=" + inputArray[i] + " -> " + diff);
if (diff > 0) {
console.log("swapped");
inputArray.swap(i,j+1);
franz.origIndex.swap(i,j+1);
}
if (j == end-20) break;
}
if (i == 20) break;
}
}