diff --git a/conf/users/admin.json b/conf/users/admin.json index db6a224..f683b80 100644 --- a/conf/users/admin.json +++ b/conf/users/admin.json @@ -13,7 +13,7 @@ "Keymap": "wide", "Created": 1414080000000000000, "Updated": 1414080000000000000, - "Lived": 1414080000000000000, + "Lived": 1450160714578458400, "Editor": { "FontFamily": "Consolas, 'Courier New', monospace", "FontSize": "13px", @@ -23,21 +23,29 @@ }, "LatestSessionContent": { "fileTree": [ + "D:/Code/GoGoGo/src", + "D:/Code/GoGoGo/src/github.com", + "D:/Code/GoGoGo/src/github.com/b3log", + "D:/Code/GoGoGo/src/github.com/b3log/wide", + "D:/Code/GoGoGo/src/github.com/b3log/wide/static", + "D:/Code/GoGoGo/src/github.com/b3log/wide/static/css", + "D:/Code/GoGoGo/src/github.com/b3log/wide/static/css/fonts", + "D:/Code/GoGoGo/src/github.com/b3log/wide/static/css/themes", + "D:/Code/GoGoGo/src/github.com/go-fsnotify" ], - "files": [ - ], + "files": [], "currentFile": "", "layout": { "side": { - "state": "min", + "state": "normal", "size": 200 }, "sideRight": { - "state": "min", + "state": "normal", "size": 200 }, "bottom": { - "state": "min", + "state": "normal", "size": 100 } } diff --git a/static/css/wide.css b/static/css/wide.css index 67ac8d0..0da1c20 100644 --- a/static/css/wide.css +++ b/static/css/wide.css @@ -18,7 +18,7 @@ * themes for wide. * * @author Liyuan Li - * @version 0.1.0.0, Dec 6, 2015 + * @version 0.1.0.1, Dec 15, 2015 */ /* start frame */ .frame { @@ -88,6 +88,7 @@ .tabs-panel { overflow: auto; flex: 1; + height: 100%; } /* end tabs */ @@ -248,6 +249,7 @@ line-height: 16px; font-size: 12px; overflow-x: scroll; + outline: 0; } .bottom-window-group .output pre { @@ -296,6 +298,10 @@ line-height: 19px; } +.bottom-window-group .notification { + outline: 0; +} + .bottom-window-group .notification .type, .bottom-window-group .notification .severity { width: 50px; @@ -305,6 +311,7 @@ .bottom-window-group .search { display: flex; flex-flow: column; + outline: 0; } /* end bottom-window-group */ diff --git a/static/js/hotkeys.js b/static/js/hotkeys.js index 0e8cd7c..d6b8bba 100644 --- a/static/js/hotkeys.js +++ b/static/js/hotkeys.js @@ -19,7 +19,7 @@ * * @author Liyuan Li * @author Liang Ding - * @version 1.0.0.1, Dec 8, 2015 + * @version 1.0.0.2, Dec 15, 2015 */ var hotkeys = { defaultKeyMap: { @@ -428,7 +428,7 @@ var hotkeys = { var tabs = ["output", "search", "notification"], nextPath = ""; for (var i = 0, ii = tabs.length; i < ii; i++) { - if (document.activeElement.className === tabs[i]) { + if (bottomGroup.tabs.getCurrentId() === tabs[i]) { if (i < ii - 1) { nextPath = tabs[i + 1]; } else { @@ -445,7 +445,7 @@ var hotkeys = { return false; } - if (editors.data.length >= 1) { + if (editors.data.length > 1) { var nextPath = ""; for (var i = 0, ii = editors.data.length; i < ii; i++) { var currentId = editors.getCurrentId(); diff --git a/static/js/windows.js b/static/js/windows.js index c5f1df2..30663b1 100644 --- a/static/js/windows.js +++ b/static/js/windows.js @@ -19,7 +19,7 @@ * * @author Liyuan Li * @author Liang Ding - * @version 1.1.1.1, Dec 8, 2015 + * @version 1.1.1.2, Dec 15, 2015 */ var windows = { isMaxEditor: false, @@ -198,6 +198,14 @@ var windows = { }); }, + maxEditor: function () { + var $it = $(".toolbars .font-ico"); + windows.outerLayout.close('west'); + windows.innerLayout.close('south'); + windows.innerLayout.close('east'); + $it.removeClass('ico-max').addClass('ico-restore').attr('title', config.label.min); + windows.isMaxEditor = true; + }, maxBottom: function ($it) { $it.data('height', $it.height()).addClass("bottom-window-group-max").find('.ico-min').hide(); windows.outerLayout.hide('west'); @@ -220,11 +228,7 @@ var windows = { if ($it.hasClass('ico-restore')) { windows.restoreEditor(); } else { - windows.outerLayout.close('west'); - windows.innerLayout.close('south'); - windows.innerLayout.close('east'); - $it.removeClass('ico-max').addClass('ico-restore').attr('title', config.label.min); - windows.isMaxEditor = true; + windows.maxEditor(); } }, restoreBottom: function () { diff --git a/views/index.html b/views/index.html index 22882da..6154d94 100644 --- a/views/index.html +++ b/views/index.html @@ -538,10 +538,10 @@