diff --git a/conf/wide.json b/conf/wide.json index 260faf5..c5925af 100644 --- a/conf/wide.json +++ b/conf/wide.json @@ -27,9 +27,20 @@ "LineHeight": "17px" }, "LatestSessionContent": { - "FileTree": [], - "Files": [], - "CurrentFile": "" + "FileTree": [ + "E:\\Work\\go\\src", + "E:\\Work\\go\\src\\code.google.com\\p", + "E:\\Work\\go\\src\\code.google.com\\p\\go.net", + "E:\\Work\\go\\src\\github.com", + "E:\\Work\\go\\src\\github.com\\88250", + "E:\\Work\\go\\src\\github.com\\88250\\gohtml" + ], + "Files": [ + "E:\\Work\\go\\src\\github.com\\88250\\gohtml\\consts.go", + "E:\\Work\\go\\src\\github.com\\88250\\gohtml\\doc.go", + "E:\\Work\\go\\src\\github.com\\88250\\gohtml\\formatter.go" + ], + "CurrentFile": "E:\\Work\\go\\src\\github.com\\88250\\gohtml\\formatter.go" } } ] diff --git a/static/js/editors.js b/static/js/editors.js index a9cbdad..1872def 100644 --- a/static/js/editors.js +++ b/static/js/editors.js @@ -371,11 +371,11 @@ var editors = { }); CodeMirror.commands.autocompleteAfterDot = function (cm) { - var token = cm.getTokenAt(cm.getCursor()); - if ("comment" === token.type) { - return; - } - + var token = cm.getTokenAt(cm.getCursor()); + if ("comment" === token.type) { + return; + } + setTimeout(function () { if (!cm.state.completionActive) { cm.showHint({hint: CodeMirror.hint.go, completeSingle: false}); @@ -448,6 +448,7 @@ var editors = { var request = newWideRequest(); request.path = data.path; + // TODO: refactor $.ajax({ type: 'POST', url: '/file', @@ -466,7 +467,7 @@ var editors = { data.cursorLine = cursorLine; data.cursorCh = cursorCh; - editors.newEditor(data); + tree.openFile(wide.curNode); } }); } @@ -577,30 +578,6 @@ var editors = { $(".toolbars").show(); var id = wide.curNode.tId; - var cursor = CodeMirror.Pos(0, 0); - if (data.cursorLine && data.cursorCh) { - cursor = CodeMirror.Pos(data.cursorLine - 1, data.cursorCh - 1); - } - - $(".footer .cursor").text('| ' + (cursor.line + 1) + ':' + (cursor.ch + 1) + ' |'); - - for (var i = 0, ii = editors.data.length; i < ii; i++) { - if (editors.data[i].id === id) { - editors.tabs.setCurrent(id); - wide.curEditor = editors.data[i].editor; - var editor = wide.curEditor; - - editor.setCursor(cursor); - - var half = Math.floor(editor.getScrollInfo().clientHeight / editor.defaultTextHeight() / 2); - var cursorCoords = editor.cursorCoords({line: cursor.line - half, ch: 0}, "local"); - editor.scrollTo(0, cursorCoords.top); - - editor.focus(); - return false; - } - } - editors.tabs.add({ id: id, title: ' input:eq(0)").keyup(function (event) { + $("#dialogSearchForm > input:eq(0)").keyup(function (event) { var $okBtn = $(this).closest(".dialog-main").find(".dialog-footer > button:eq(0)"); if (event.which === 13 && !$okBtn.prop("disabled")) { $okBtn.click(); diff --git a/static/js/wide.js b/static/js/wide.js index aface28..8687461 100644 --- a/static/js/wide.js +++ b/static/js/wide.js @@ -262,6 +262,7 @@ var wide = { $("#dialogGoFilePrompt").on("dblclick", "li", function () { var tId = tree.getTIdByPath($(this).find(".ft-small").text()); tree.openFile(tree.fileTree.getNodeByTId(tId)); + tree.fileTree.selectNode(wide.curNode); $("#dialogGoFilePrompt").dialog("close"); }); @@ -275,6 +276,7 @@ var wide = { hotkeys.bindList($("#dialogGoFilePrompt > input"), $("#dialogGoFilePrompt > .list"), function ($selected) { var tId = tree.getTIdByPath($selected.find(".ft-small").text()); tree.openFile(tree.fileTree.getNodeByTId(tId)); + tree.fileTree.selectNode(wide.curNode); $("#dialogGoFilePrompt").dialog("close"); }); @@ -330,6 +332,7 @@ var wide = { "ok": function () { var tId = tree.getTIdByPath($("#dialogGoFilePrompt .selected .ft-small").text()); tree.openFile(tree.fileTree.getNodeByTId(tId)); + tree.fileTree.selectNode(wide.curNode); $("#dialogGoFilePrompt").dialog("close"); } });