v1.4.0

lelinhtinh · Oct 11, 2019 · e61437a · e61437a
1 parent 16bfdef
commit e61437a
Show file tree

Hide file tree

Showing 10 changed files with 122 additions and 167 deletions.
diff --git a/_config.yml b/_config.yml
@@ -1,6 +1,6 @@
 name: de4js
 description: JavaScript Deobfuscator and Unpacker
-version: 1.3.2
+version: 1.4.0
 author: Zzbaivong
 author_email: [email protected]
 url: https://lelinhtinh.github.io

diff --git a/_data/options.yml b/_data/options.yml
@@ -15,6 +15,6 @@
 - key: p_a_c_k_e_r
   name: Packer
 - key: javascriptobfuscator
-  name: Javascript Obfuscator
+  name: JS Obfuscator
 - key: myobfuscate
-  name: My Obfuscate
+  name: My Obfuscate
diff --git a/_includes/highlight-js/styles/hljs-theme.css b/_includes/highlight-js/styles/hljs-theme.css
diff --git a/_includes/highlight-js/styles/tomorrow-night-bright.css b/_includes/highlight-js/styles/tomorrow-night-bright.css
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ site.lang | default: " en-US " }}" manifest="de4js.appcache">
+<html lang="{{ site.lang | default: 'en-US' }}" manifest="de4js.appcache">
 
 <head>
     <meta charset='utf-8'>
@@ -44,7 +44,6 @@ <h2>{{ site.description }}</h2>
         <section id="main_content">
             <form class="wrap" name="bvDecode">
                 <textarea id="input" class="content" rows="7" placeholder="Paste code here..."></textarea>
-                <textarea id="output"></textarea>
 
                 <div class="config center">
                     <input id="none" class="magic-radio" type="radio" value="" name="encode" checked>
@@ -57,20 +56,13 @@ <h2>{{ site.description }}</h2>
                     <label for="nicify">Unreadable</label>
                 </div>
 
-                <div class="config center">
-                    <input id="beautify" class="magic-checkbox" type="checkbox" name="beautify" checked>
-                    <label for="beautify">Beautify</label>
-                    <input id="auto" class="magic-checkbox" type="checkbox" name="auto">
-                    <label for="auto">Auto</label>
-                </div>
-
                 <div class="center">
-                    <button id="redecode" class="btn" type="button">
-                        Continue decoding
-                    </button>
                     <button id="clear" class="btn" type="reset">
                         Clear
                     </button>
+                    <button id="auto" class="btn" type="button">
+                        Auto Decode
+                    </button>
                 </div>
 
                 <div class="view-wrap">
@@ -82,7 +74,7 @@ <h2>{{ site.description }}</h2>
                             <img class="btn-icon" src="{{ 'assets/icon/external-link-symbol.png' | relative_url }}" alt="Open in new tab">
                         </a>
                     </div>
-                    <pre id="view" class="hljs">Please choose a right encoding type!</pre>
+                    <pre id="view" class="hljs"></pre>
                 </div>
             </form>
         </section>

diff --git a/assets/css/style.scss b/assets/css/style.scss
@@ -9,7 +9,10 @@ $special-primary-color: #9C27B0;
 $special-disabled-color: #000000;
 
 @import "{{ site.theme }}";
-{% include highlight-js/styles/tomorrow-night-bright.css %}
+{% include highlight-js/styles/hljs-theme.css %}
+.hljs{
+  background: #030303;
+}
 @import "magic-check/sass/magic-check.scss";
 
 body,
@@ -33,10 +36,6 @@ code {
   resize: vertical;
 }
 
-#output {
-  display: none;
-}
-
 .config {
   font-size: smaller;
   color: #595656;
@@ -52,7 +51,7 @@ code {
 
   label {
     display: inline-block;
-    margin: .5em;
+    margin: .3em;
   }
 }
 
@@ -62,6 +61,8 @@ code {
 }
 
 .btn {
+  cursor: pointer;
+
   &:active,
   &:focus,
   &:hover {
@@ -76,13 +77,28 @@ code {
   &::-moz-focus-inner {
     border: 0 none;
   }
+
+  &:disabled {
+    cursor: not-allowed;
+    background: #141414;
+    border-color: #1b1b1b;
+    color: #525252;
+  }
 }
 
 #view {
   transition: opacity ease-in-out .2s;
 
   &.waiting {
     opacity: .3;
+
+    &:empty:before {
+      content: 'Please wait...';
+    }
+  }
+
+  &:empty:before {
+    content: 'Please choose a right encoding type!';
   }
 }