modified: static/css/side.css

modified:   static/js/hotkeys.js
	modified:   static/js/windows.js
	modified:   views/index.html

conf/users/admin.json

@@ -13,7 +13,7 @@
     "Keymap": "wide",
     "Created": 1414080000000000000,
     "Updated": 1414080000000000000,
-    "Lived": 1414080000000000000,
+    "Lived": 1450087804655438500,
     "Editor": {
         "FontFamily": "Consolas, 'Courier New', monospace",
         "FontSize": "13px",
@@ -22,9 +22,70 @@
         "TabSize": "4"
     },
     "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/nsf/gocode",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0005",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0006",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0009",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0010",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0011",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0012",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0013",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0014",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0015",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0016",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0017",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0018",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0019",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0020",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0021",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0022",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0023",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0024",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0025",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0026",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0027",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0028",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0029",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0030",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0031",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0032",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0033",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0035",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0036",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0037",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0038",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0039",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0040",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0041",
+            "D:/Code/GoGoGo/src/github.com/nsf/gocode/_testing/test.0042",
+            "D:/Code/GoGoGo/src/github.com/visualfc/gotools/gopresent/static",
+            "D:/Code/GoGoGo/src/golang.org",
+            "D:/Code/GoGoGo/src/golang.org/x",
+            "D:/Code/GoGoGo/src/golang.org/x/text",
+            "D:/Code/GoGoGo/src/golang.org/x/text/cases"
         ],
-        "Files": [],
+        "files": [
-        "CurrentFile": ""
+            "D:/Code/GoGoGo/src/golang.org/x/text/cases/cases.go",
+            "D:/Code/GoGoGo/src/golang.org/x/text/cases/context.go"
+        ],
+        "currentFile": "D:/Code/GoGoGo/src/golang.org/x/text/cases/cases.go",
+        "layout": {
+            "side": {
+                "state": "min",
+                "size": 200
+            },
+            "sideRight": {
+                "state": "min",
+                "size": 200
+            },
+            "bottom": {
+                "state": "min",
+                "size": 100
+            }
+        }
     }
 }

static/css/side.css

@@ -82,6 +82,8 @@
 .ztree {
     width: 100%;
     padding: 0;
+    outline: 0px;
+    border: 0px;
 }
 
 .ztree li a.curSelectedNode {

static/js/hotkeys.js

@@ -43,13 +43,9 @@ var hotkeys = {
             which: 49,
             fun: function () {
                 // 有些元素需设置 tabindex 为 -1 时才可以 focus
-                if ($(".footer .ico-restore:eq(0)").css("display") === "inline") {
+                if (windows.outerLayout.west.state.isClosed) {
-                    // 当文件树最小化时
+                    windows.outerLayout.slideOpen('west');
-                    $(".side").css({
-                        "left": "0"
-                    });
                 }
-
                 $("#files").focus();
             }
         },
@@ -60,11 +56,8 @@ var hotkeys = {
             shiftKey: false,
             which: 50,
             fun: function () {
-                if ($(".footer .ico-restore:eq(2)").css("display") === "inline") {
+                if (windows.innerLayout.east.state.isClosed) {
-                    // 当文件树最小化时
+                    windows.innerLayout.slideOpen('east');
-                    $(".side-right").css({
-                        "right": "0"
-                    });
                 }
 
                 $("#outline").focus();
@@ -223,9 +216,9 @@ var hotkeys = {
             if (event.altKey === hotKeys.clearWindow.altKey
                     && event.which === hotKeys.clearWindow.which) {  // Alt-C clear output
                 bottomGroup.clear('output');
-                
+
                 event.preventDefault();
-                
+
                 return;
             }
         });
@@ -452,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();
@@ -473,7 +466,7 @@ var hotkeys = {
                     editors.tabs.setCurrent(nextPath);
                     var nextTId = tree.getTIdByPath(nextPath);
                     wide.curNode = tree.fileTree.getNodeByTId(nextTId);
-                    
+
                     tree.fileTree.selectNode(wide.curNode);
                     wide.refreshOutline();
                     var cursor = wide.curEditor.getCursor();

static/js/windows.js

@@ -271,7 +271,8 @@ var windows = {
         $('.bottom-window-group .search').height($('.bottom-window-group .tabs-panel').height());
     },
     flowBottom: function () {
-        // windows.innerLayout.open('south');
+        if (windows.innerLayout.south.state.isClosed) {
-        // windows.innerLayout.slideOpen('south');
+            windows.innerLayout.slideOpen('south');
+        }
     }
 };

views/index.html

@@ -405,7 +405,7 @@
             </div> 
             <div class="tabs-panel">
                 <div data-index="fileTree">
-                    <ul id="files" class="ztree"></ul>
+                    <ul id="files" class="ztree" tabindex="-1"></ul>
                     <input id="importFileupload" class="fn-none" type="file"
                            name="files[]" onclick="tree.import();" multiple>
                     <!-- directory context menu -->