From 86e1d6ecc7fd31d9bce1617e50c9e7de732ffbb3 Mon Sep 17 00:00:00 2001 From: Van Date: Wed, 22 Oct 2014 15:22:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=85=B3=E9=97=AD=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=99=A8=E5=90=8E=E6=8C=89=E7=85=A7=E5=85=A5=E6=A0=88=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=E8=AE=BE=E7=BD=AE=E5=BD=93=E5=89=8Dtab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/js/windows.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/static/js/windows.js b/static/js/windows.js index 1f932ec..1f67550 100644 --- a/static/js/windows.js +++ b/static/js/windows.js @@ -116,10 +116,10 @@ var windows = { if ($(".footer .ico-restore:eq(0)").css("display") === "inline") { // 当文件树最小化时 - $it.css({ - "width": "100%", - "left": "0" - }); + $it.css({ + "width": "100%", + "left": "0" + }); } }, restoreSide: function () { @@ -163,8 +163,10 @@ var windows = { windows.minBottom(); windows.minSide(); - wide.curEditor.focus(); - + if (wide.curEditor) { + wide.curEditor.focus(); + } + windows.isMaxEditor = true; }, restoreEditor: function () { @@ -176,8 +178,10 @@ var windows = { windows.restoreBottom(); windows.restoreSide(); - wide.curEditor.focus(); - + if (wide.curEditor) { + wide.curEditor.focus(); + } + windows.isMaxEditor = false; }, clearFloat: function () { From a7b5fb1bcd70e927842c4f57ef28af3e79ad6f16 Mon Sep 17 00:00:00 2001 From: Van Date: Wed, 22 Oct 2014 15:23:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=B3=E9=97=AD=20tab=20=20=E6=8C=89?= =?UTF-8?q?=E5=85=A5=E6=A0=88=E9=A1=BA=E5=BA=8F=E8=AE=BE=E7=BD=AE=E5=BD=93?= =?UTF-8?q?=E5=89=8D=20tab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/src/mytest/time/index.html | 154 ++++++++++-------- static/css/start.css | 13 +- static/js/tabs.js | 35 ++-- view/start.html | 17 +- 4 files changed, 127 insertions(+), 92 deletions(-) diff --git a/data/user_workspaces/admin/src/mytest/time/index.html b/data/user_workspaces/admin/src/mytest/time/index.html index e7461ac..d90c0cc 100644 --- a/data/user_workspaces/admin/src/mytest/time/index.html +++ b/data/user_workspaces/admin/src/mytest/time/index.html @@ -3,7 +3,8 @@ - {{.i18n.wide}} + {{.i18n.wide}} + @@ -24,25 +25,29 @@