Updates

gratajik · Feb 3, 2014 · 0fd622b · 0fd622b
1 parent ac75488
commit 0fd622b
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 59 deletions.
diff --git a/hex0r.css b/hex0r.css
@@ -2,7 +2,7 @@
 {
 	font-family: monospace;
 	background-color: #F2F2F2;
-	padding: 0px;
+	padding: 0;
 	width: 600px;
 }
 div.hex0rwindow
@@ -17,7 +17,7 @@ div.hex0rwindow
 .hex0rwindow_offset
 {
 	background: #A2A2A2;
-	padding-right: 0px;
+	padding-right: 0;
 }
 .hex0rwindow_visual
 {

diff --git a/hex0r.js b/hex0r.js
@@ -1,55 +1,6 @@
 var HEX = '0123456789ABCDEF';
 var BASE64_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
 
-function dec2_to_hex(dec) {
-    if (dec < 0)
-        dec = 0;
-
-    if (dec > 255)
-        dec = 255;
-
-    return HEX.charAt(Math.floor(dec / 16)) + HEX.charAt(dec % 16);
-}
-
-function dec_to_hex8(dec) {
-    var str = "";
-
-    for (var i = 3; i >= 0; i--) {
-        str += dec2_to_hex((dec >> (i * 8)) & 255);
-    }
-
-    return str;
-}
-
-function remove_whitespace(str) {
-    return str.replace(/\n/g, "")
-					  .replace(/\t/g, "")
-					  .replace(/ /g, "")
-					  .replace(/\r/g, "");
-}
-
-function base64_decode(encoded) {
-    var decoded = "";
-
-    for (var i = 0; i < encoded.length; i += 4) {
-        var ch0 = encoded.charAt(i + 0);
-        var ch1 = encoded.charAt(i + 1);
-        var ch2 = encoded.charAt(i + 2);
-        var ch3 = encoded.charAt(i + 3);
-
-        var index0 = BASE64_CHARS.indexOf(ch0);
-        var index1 = BASE64_CHARS.indexOf(ch1);
-        var index2 = BASE64_CHARS.indexOf(ch2);
-        var index3 = BASE64_CHARS.indexOf(ch3);
-
-        decoded += String.fromCharCode((index0 << 2) | (index1 >> 4));
-        decoded += String.fromCharCode(((index1 & 15) << 4) | (index2 >> 2));
-        decoded += String.fromCharCode(((index2 & 3) << 6) | index3);
-    }
-
-    return decoded;
-}
-
 function markup_hex0rwindow(div) {
     var step = parseInt($(div).data('row-width'));
     var wordSize = parseInt($(div).data('word-size'));
@@ -162,6 +113,55 @@ function markup_hex0rwindow(div) {
     }
 }
 
+function dec2_to_hex(dec) {
+    if (dec < 0)
+        dec = 0;
+
+    if (dec > 255)
+        dec = 255;
+
+    return HEX.charAt(Math.floor(dec / 16)) + HEX.charAt(dec % 16);
+}
+
+function dec_to_hex8(dec) {
+    var str = "";
+
+    for (var i = 3; i >= 0; i--) {
+        str += dec2_to_hex((dec >> (i * 8)) & 255);
+    }
+
+    return str;
+}
+
+function remove_whitespace(str) {
+    return str.replace(/\n/g, "")
+					  .replace(/\t/g, "")
+					  .replace(/ /g, "")
+					  .replace(/\r/g, "");
+}
+
+function base64_decode(encoded) {
+    var decoded = "";
+
+    for (var i = 0; i < encoded.length; i += 4) {
+        var ch0 = encoded.charAt(i + 0);
+        var ch1 = encoded.charAt(i + 1);
+        var ch2 = encoded.charAt(i + 2);
+        var ch3 = encoded.charAt(i + 3);
+
+        var index0 = BASE64_CHARS.indexOf(ch0);
+        var index1 = BASE64_CHARS.indexOf(ch1);
+        var index2 = BASE64_CHARS.indexOf(ch2);
+        var index3 = BASE64_CHARS.indexOf(ch3);
+
+        decoded += String.fromCharCode((index0 << 2) | (index1 >> 4));
+        decoded += String.fromCharCode(((index1 & 15) << 4) | (index2 >> 2));
+        decoded += String.fromCharCode(((index2 & 3) << 6) | index3);
+    }
+
+    return decoded;
+}
+
 $(document).ready(function () {
     $("div.hex0rwindow").each(function (index) {
         markup_hex0rwindow($(this), index);

diff --git a/hex0r_example.html b/hex0r_example.html
@@ -20,14 +20,14 @@
         Hex04 will either show the raw text or will attempt to base-64 decode it. This is
         an example of using raw text (no decoding)</div>
     <br />
-    <div class="hex0rwindow" data-row-width="16" data-word-size="1" data-row-break="8"
-        data-trim="true" data-base64="true" data-caption="Hex0r Example - base 64 file, with highlighting"
-        data-highlights="16:17:#F4FA58:Initial value of SP register,128:152:#54FAF8:Portable Executable signature and header"
-        data-show-line-nums="true" title="">
-        /9j/4AAQSkZJRgABAQEASABIAAD/4RzmRXhpZgAATU0AKgAAAAgADAEPAAIAAAAJ AAAAngEQAAIAAAAQAAAAqAESAAMAAAABAAEAAAEaAAUAAAABAAAAuAEbAAUAAAAB
-        AAAAwAEoAAMAAAABAAIAAAExAAIAAAAvAAAAyAEyAAIAAAAUAAAA+AITAAMAAAAB AAIAAIKYAAIAAAAFAAABDIdpAAQAAAABAAABEsSlAAcAAAAcAAAEkAAABKxGVUpJ
-        RklMTQAARmluZVBpeCBGNDU1ICAgAAAAAEgAAAABAAAASAAAAA==
-    </div>
+<div class="hex0rwindow" data-row-width="16" data-word-size="1" data-row-break="8"
+    data-trim="true" data-base64="true" data-caption="Hex0r Example - base 64 file, with highlighting"
+    data-highlights="16:17:#F4FA58:Initial value of SP register,128:152:#54FAF8:Portable Executable signature and header"
+    data-show-line-nums="true" title="">
+    /9j/4AAQSkZJRgABAQEASABIAAD/4RzmRXhpZgAATU0AKgAAAAgADAEPAAIAAAAJ AAAAngEQAAIAAAAQAAAAqAESAAMAAAABAAEAAAEaAAUAAAABAAAAuAEbAAUAAAAB
+    AAAAwAEoAAMAAAABAAIAAAExAAIAAAAvAAAAyAEyAAIAAAAUAAAA+AITAAMAAAAB AAIAAIKYAAIAAAAFAAABDIdpAAQAAAABAAABEsSlAAcAAAAcAAAEkAAABKxGVUpJ
+    RklMTQAARmluZVBpeCBGNDU1ICAgAAAAAEgAAAABAAAASAAAAA==
+</div>
     <br />
 </body>
 </html>