diff --git a/i18n/en_US.json b/i18n/en_US.json index 43a5083..8fe9525 100644 --- a/i18n/en_US.json +++ b/i18n/en_US.json @@ -117,5 +117,6 @@ "password_no_match": "Password doesn't match the confirmation", "discard": "Discard", "close": "Close", - "close_other": "Close Other" + "close_other": "Close Other", + "clear": "Clear" } \ No newline at end of file diff --git a/i18n/ja_JP.json b/i18n/ja_JP.json index 3c6318c..98a6321 100644 --- a/i18n/ja_JP.json +++ b/i18n/ja_JP.json @@ -117,5 +117,6 @@ "password_no_match": "一貫性のないパスワード入力", "discard": "あきらめる", "close": "クローズ", - "close_other": "閉じるその他" + "close_other": "閉じるその他", + "clear": "空の" } diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json index b0f23a0..9ca394c 100644 --- a/i18n/zh_CN.json +++ b/i18n/zh_CN.json @@ -117,5 +117,6 @@ "password_no_match": "密码输入不一致", "discard": "放弃", "close": "关闭", - "close_other": "关闭其它" + "close_other": "关闭其它", + "clear": "清空" } \ No newline at end of file diff --git a/i18n/zh_TW.json b/i18n/zh_TW.json index 0530a94..3ae3f29 100644 --- a/i18n/zh_TW.json +++ b/i18n/zh_TW.json @@ -117,5 +117,6 @@ "password_no_match": "密碼輸入不一致", "discard": "放棄", "close": "關閉", - "close_other": "關閉其它" + "close_other": "關閉其它", + "clear": "清空" } \ No newline at end of file diff --git a/static/css/wide.css b/static/css/wide.css index 8e6d154..1e79415 100644 --- a/static/css/wide.css +++ b/static/css/wide.css @@ -144,7 +144,6 @@ /* start framework */ .content { position: relative; - overflow: hidden; } /* end framework */ diff --git a/static/js/bottomGroup.js b/static/js/bottomGroup.js index 7c43c9d..163b104 100644 --- a/static/js/bottomGroup.js +++ b/static/js/bottomGroup.js @@ -3,6 +3,31 @@ var bottomGroup = { searchTab: undefined, init: function () { this._initTabs(); + this._initFrame(); + }, + _initFrame: function () { + $(".bottom-window-group .output").mousedown(function (event) { + event.stopPropagation(); + + if (event.button === 0) { // 左键 + $(".bottom-window-group .frame").hide(); + return false; + } + + // event.button === 2 右键 + var left = event.screenX; + if ($(".side").css("left") === "auto" || $(".side").css("left") === "0px") { + left = event.screenX - $(".side").width(); + } + $(".bottom-window-group .frame").show().css({ + "left": left + "px", + "top": (event.offsetY + 20) + "px" + }); + return false; + }); + }, + clear: function () { + $('.bottom-window-group .output > div').text(''); }, clearOutput: function () { $('.bottom-window-group .output > div').text(''); diff --git a/static/js/editors.js b/static/js/editors.js index fafff3a..585984b 100644 --- a/static/js/editors.js +++ b/static/js/editors.js @@ -14,6 +14,9 @@ var editors = { removeData.push($(this).data("index")); } }); + if (removeData.length === 0) { + return false; + } var firstIndex = removeData.splice(0, 1); $("#dialogCloseEditor").data("removeData", removeData); // 开始关闭 diff --git a/views/index.html b/views/index.html index 8a8e6bd..2d02de8 100644 --- a/views/index.html +++ b/views/index.html @@ -175,8 +175,8 @@