From 7bf6930c89560a9ef39ef3b3415ed4a74b188a8c Mon Sep 17 00:00:00 2001 From: life Date: Fri, 16 Oct 2015 18:03:50 +0800 Subject: [PATCH] =?UTF-8?q?self.setTopDragWidth=20=E4=B8=8D=E6=98=AF?= =?UTF-8?q?=E6=80=BB=E4=BC=9A=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/version | 2 +- public/js/app/page.js | 8 +++++--- public/themes/basic.less | 2 +- public/themes/default.css | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/data/version b/data/version index 4eaa1f87..a6bf9a74 100644 --- a/data/version +++ b/data/version @@ -1 +1 @@ -{"version":"0.7.0.1","updatedTime":"2015-10-16T07:11:51.505Z"} \ No newline at end of file +{"version":"0.7.0.2","updatedTime":"2015-10-16T07:11:51.505Z"} \ No newline at end of file diff --git a/public/js/app/page.js b/public/js/app/page.js index e34c42f7..2eed206e 100644 --- a/public/js/app/page.js +++ b/public/js/app/page.js @@ -178,10 +178,12 @@ var Resize = { var self = this; if(notebookWidth < 150 || noteListWidth < 100) { + self.setTopDragWidth(); return; } var noteWidth = self.body.width() - notebookWidth - noteListWidth; if(noteWidth < 400) { + self.setTopDragWidth(); return; } @@ -196,7 +198,6 @@ var Resize = { UserInfo.NotebookWidth = notebookWidth; UserInfo.NoteListWidth = noteListWidth; - // console.log("??????????"); self.setTopDragWidth(); }, resize3Columns: function(event, isFromeIfr) { @@ -264,8 +265,9 @@ var Resize = { width = self.leftNotebook.width() + self.noteList.width(); } - // 60是最左的关闭, 50是新建 - $('#topDrag').width((width - 60 - 50) + 'px'); + var w = width - 60 - 50; + w = w > 100 ? w : 100; + $('#topDrag').width(w + 'px'); } }; diff --git a/public/themes/basic.less b/public/themes/basic.less index e7279d0b..b3f94229 100644 --- a/public/themes/basic.less +++ b/public/themes/basic.less @@ -1802,7 +1802,7 @@ body { top: 0; left: 60px; // // right: auto; // 宽度是左+中, 用js来控制 - right: 140px; // 最少 + width: 140px; // 最少 height: 40px; z-index: 1000; cursor: move; diff --git a/public/themes/default.css b/public/themes/default.css index 7b1d4dfb..d224635b 100644 --- a/public/themes/default.css +++ b/public/themes/default.css @@ -1594,7 +1594,7 @@ body.init #pageInner { position: absolute; top: 0; left: 60px; - right: 140px; + width: 140px; height: 40px; z-index: 1000; cursor: move;