modified: static/css/wide.css

modified:   static/js/hotkeys.js
	modified:   static/js/windows.js
	modified:   views/index.html
This commit is contained in:
Vanesssa 2015-12-14 21:21:45 +08:00
parent 30f11f3867
commit d9f7bb2869
5 changed files with 38 additions and 19 deletions

View File

@ -13,7 +13,7 @@
"Keymap": "wide", "Keymap": "wide",
"Created": 1414080000000000000, "Created": 1414080000000000000,
"Updated": 1414080000000000000, "Updated": 1414080000000000000,
"Lived": 1414080000000000000, "Lived": 1450160714578458400,
"Editor": { "Editor": {
"FontFamily": "Consolas, 'Courier New', monospace", "FontFamily": "Consolas, 'Courier New', monospace",
"FontSize": "13px", "FontSize": "13px",
@ -23,21 +23,29 @@
}, },
"LatestSessionContent": { "LatestSessionContent": {
"fileTree": [ "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": "", "currentFile": "",
"layout": { "layout": {
"side": { "side": {
"state": "min", "state": "normal",
"size": 200 "size": 200
}, },
"sideRight": { "sideRight": {
"state": "min", "state": "normal",
"size": 200 "size": 200
}, },
"bottom": { "bottom": {
"state": "min", "state": "normal",
"size": 100 "size": 100
} }
} }

View File

@ -18,7 +18,7 @@
* themes for wide. * themes for wide.
* *
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 0.1.0.0, Dec 6, 2015 * @version 0.1.0.1, Dec 15, 2015
*/ */
/* start frame */ /* start frame */
.frame { .frame {
@ -88,6 +88,7 @@
.tabs-panel { .tabs-panel {
overflow: auto; overflow: auto;
flex: 1; flex: 1;
height: 100%;
} }
/* end tabs */ /* end tabs */
@ -248,6 +249,7 @@
line-height: 16px; line-height: 16px;
font-size: 12px; font-size: 12px;
overflow-x: scroll; overflow-x: scroll;
outline: 0;
} }
.bottom-window-group .output pre { .bottom-window-group .output pre {
@ -296,6 +298,10 @@
line-height: 19px; line-height: 19px;
} }
.bottom-window-group .notification {
outline: 0;
}
.bottom-window-group .notification .type, .bottom-window-group .notification .type,
.bottom-window-group .notification .severity { .bottom-window-group .notification .severity {
width: 50px; width: 50px;
@ -305,6 +311,7 @@
.bottom-window-group .search { .bottom-window-group .search {
display: flex; display: flex;
flex-flow: column; flex-flow: column;
outline: 0;
} }
/* end bottom-window-group */ /* end bottom-window-group */

View File

@ -19,7 +19,7 @@
* *
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.0.1, Dec 8, 2015 * @version 1.0.0.2, Dec 15, 2015
*/ */
var hotkeys = { var hotkeys = {
defaultKeyMap: { defaultKeyMap: {
@ -428,7 +428,7 @@ var hotkeys = {
var tabs = ["output", "search", "notification"], var tabs = ["output", "search", "notification"],
nextPath = ""; nextPath = "";
for (var i = 0, ii = tabs.length; i < ii; i++) { 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) { if (i < ii - 1) {
nextPath = tabs[i + 1]; nextPath = tabs[i + 1];
} else { } else {
@ -445,7 +445,7 @@ var hotkeys = {
return false; return false;
} }
if (editors.data.length >= 1) { if (editors.data.length > 1) {
var nextPath = ""; var nextPath = "";
for (var i = 0, ii = editors.data.length; i < ii; i++) { for (var i = 0, ii = editors.data.length; i < ii; i++) {
var currentId = editors.getCurrentId(); var currentId = editors.getCurrentId();

View File

@ -19,7 +19,7 @@
* *
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.1.1.1, Dec 8, 2015 * @version 1.1.1.2, Dec 15, 2015
*/ */
var windows = { var windows = {
isMaxEditor: false, 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) { maxBottom: function ($it) {
$it.data('height', $it.height()).addClass("bottom-window-group-max").find('.ico-min').hide(); $it.data('height', $it.height()).addClass("bottom-window-group-max").find('.ico-min').hide();
windows.outerLayout.hide('west'); windows.outerLayout.hide('west');
@ -220,11 +228,7 @@ var windows = {
if ($it.hasClass('ico-restore')) { if ($it.hasClass('ico-restore')) {
windows.restoreEditor(); windows.restoreEditor();
} else { } else {
windows.outerLayout.close('west'); windows.maxEditor();
windows.innerLayout.close('south');
windows.innerLayout.close('east');
$it.removeClass('ico-max').addClass('ico-restore').attr('title', config.label.min);
windows.isMaxEditor = true;
} }
}, },
restoreBottom: function () { restoreBottom: function () {

View File

@ -538,10 +538,10 @@
</div> </div>
<div class="tabs-panel"> <div class="tabs-panel">
<div data-index="output"> <div data-index="output">
<div class="output"><div></div></div> <div class="output" tabindex="-1"><div></div></div>
</div> </div>
<div class="fn-none" data-index="search"> <div class="fn-none" data-index="search">
<div class="search"> <div class="search" tabindex="-1">
<div class="tabs fn-none"> <div class="tabs fn-none">
<div class="current" data-index="first"> <div class="current" data-index="first">
<span class="first"></span><span class="ico-close font-ico"></span> <span class="first"></span><span class="ico-close font-ico"></span>
@ -553,7 +553,7 @@
</div> </div>
</div> </div>
<div class="fn-none" data-index="notification"> <div class="fn-none" data-index="notification">
<div class="notification"><table cellpadding="0" cellspacing="0"></table></div> <div class="notification" tabindex="-1"><table cellpadding="0" cellspacing="0"></table></div>
</div> </div>
</div> </div>
</div> </div>