From 0d82a3293cbaa0162d2867a07006ec5fe676b7dc Mon Sep 17 00:00:00 2001
From: shaoying <shaoying@bytedance.com>
Date: Sun, 9 Dec 2018 18:57:25 +0800
Subject: [PATCH] opt onaction

Change-Id: I478f1e0ac6a5dbd3d5807b9e3c250e837b0355cc
---
 usr/librarys/code.js        | 117 ++++++++++++++++++++----------------
 usr/template/code/code.tmpl |   6 +-
 2 files changed, 68 insertions(+), 55 deletions(-)

diff --git a/usr/librarys/code.js b/usr/librarys/code.js
index 98950038..5725b75e 100644
--- a/usr/librarys/code.js
+++ b/usr/librarys/code.js
@@ -342,8 +342,6 @@ function onaction(event, action, arg) {
     var dataset = target.dataset
 
     switch (action) {
-        case "workflow":
-            break
         case "scroll":
             var body = document.getElementsByTagName("body")[0]
             if (target.tagName == "BODY") {
@@ -395,45 +393,60 @@ function onaction(event, action, arg) {
             if (target.tagName == "INPUT" && target.type == "text") {
                 return
             }
+            if (event.ctrlKey) {
+                switch (event.key) {
+                    case "b":
+                        var item = document.querySelector("div.workflow>div")
+                        item.onclick()
+                        break
+                    case "p":
+                        var target = document.querySelector("div.workflow>ul>li>ul>li[data-action=quick_txt]")
+                        code.quick_txt = !code.quick_txt
+                        target.className= code.quick_txt? "quick": ""
+                        break
+                    case "y":
+                        copy_to_clipboard(prompt("text"))
+                        break
+                    case "s":
+                        save_clipboard(document.querySelector("div.workflow>ul>li>ul.txt>li[data-action=save_txt"))
+                        break
+                    case "m":
+                        add_command()
+                        break
+                    case "z":
+                        shrink_command_result()
+                        break
+                    case "r":
+                        location.reload()
+                        break
+                    case "t":
+                        location.search = ""
+                        break
+                    case "g":
+                        document.querySelectorAll("form.option label.keymap").forEach(function(item) {
+                            code.showmap = !(item.className == "keymap show")
+                            item.className = code.showmap? "keymap show": "keymap hide"
+                        })
+                        break
+                    case "0":
+                        document.querySelector("form.option.command input[name=cmd]").focus()
+                        break
+                    case "1":
+                    case "2":
+                    case "3":
+                    case "4":
+                    case "5":
+                    case "6":
+                    case "7":
+                    case "8":
+                    case "9":
+                        document.querySelector("form.option.command"+event.key+" input[name=cmd]").focus()
+                        break
+                }
+                return
+            }
+
             switch (event.key) {
-                case "g":
-                    document.querySelectorAll("form.option label.keymap").forEach(function(item) {
-                        code.showmap = !(item.className == "keymap show")
-                        item.className = code.showmap? "keymap show": "keymap hide"
-                    })
-                    break
-                case "m":
-                    add_command()
-                    break
-                case "z":
-                    shrink_command_result()
-                    break
-                case "s":
-                    save_clipboard(document.querySelector("div.workflow>ul>li>ul.txt>li[data-action=save_txt"))
-                    break
-                case "y":
-                    copy_to_clipboard(prompt("text"))
-                    break
-                case "r":
-                    location.reload()
-                    break
-                case "t":
-                    location.search = ""
-                    break
-                case "0":
-                    document.querySelector("form.option.command input[name=cmd]").focus()
-                    break
-                case "1":
-                case "2":
-                case "3":
-                case "4":
-                case "5":
-                case "6":
-                case "7":
-                case "8":
-                case "9":
-                    document.querySelector("form.option.command"+event.key+" input[name=cmd]").focus()
-                    break
                 default:
                     if (code.inputs[event.key]) {
                         code.inputs[event.key].focus()
@@ -441,16 +454,6 @@ function onaction(event, action, arg) {
                     break
             }
             break
-        case "command":
-            check_option(target.form, target)
-            break
-        case "click":
-            if (target.nodeName == "INPUT" && event.altKey) {
-                var board = document.querySelector(".clipboard")
-                target.value = board.value
-                check_option(target.form, target)
-            }
-            break
         case "input":
             if (event.key == "Escape") {
                 target.blur()
@@ -468,7 +471,6 @@ function onaction(event, action, arg) {
             var result = command.querySelector("code.result pre")
 
             if (event.ctrlKey) {
-// yt
                 switch (event.key) {
                     case "1":
                     case "2":
@@ -600,13 +602,24 @@ function onaction(event, action, arg) {
                         break
                 }
             }
+
             if (dataset["last_char"] == "j" && event.key == "k") {
                 target.value = target.value.substr(0, target.value.length-2)
                 target.blur()
             }
 
             dataset["last_char"] = event.key
-            return false
+            break
+        case "click":
+            if (target.nodeName == "INPUT" && event.altKey) {
+                var board = document.querySelector(".clipboard")
+                target.value = board.value
+                check_option(target.form, target)
+            }
+            break
+        case "command":
+            check_option(target.form, target)
+            break
     }
 }
 
diff --git a/usr/template/code/code.tmpl b/usr/template/code/code.tmpl
index 7ebd1852..c580509d 100644
--- a/usr/template/code/code.tmpl
+++ b/usr/template/code/code.tmpl
@@ -136,7 +136,7 @@
     }
 </style>
 </head>
-<body onkeyup="return onaction(event, 'keymap')" onkeydown="return onaction(event, 'scroll')">
+<body onkeydown="return onaction(event, 'scroll')" onkeyup="return onaction(event, 'keymap')">
 <script>
     {{$id := option . "bench"|option}}
     var bench ={{conf . "bench" $id}}
@@ -164,13 +164,13 @@
 {{$bench := conf . "bench" $key}}
 <script>var workflow = {{conf . "bench"}}</script>
 <div class="workflow">
-    <div>&nbsp;bench</div>
+    <div>&nbsp;bench (Ctrl+B)</div>
     <ul class="docker">
         <li><span>粘贴板</span>
             <ul class="txt">
                 <li data-action="save_txt">+ 保存粘贴板(Ctrl+S)</li>
                 <li data-action="create_txt">+ 添加粘贴板(Ctrl+Y)</li>
-                <li data-action="quick_txt">+ 快捷粘贴板</li>
+                <li data-action="quick_txt">+ 快捷粘贴板(Ctrl+P)</li>
             </ul>
         </li>
         <li><span>命令行</span>