mirror
/
c9-core
kopia lustrzana https://github.com/c9/core
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge branch 'fix/testpanel' of github.com:c9/newclient into fix/testpanel

pull/223/head
Ruben Daniels 2015-09-30 16:16:37 -07:00
rodzic b0d6bc8c82 241e14da31
commit c8826e2b13
3 zmienionych plików z 7 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
node_modules/ace/lib/ace/line_widgets.js wygenerowano vendored
Wyświetl plik

@ -294,6 +294,8 @@ function LineWidgets(session) {
if (!w || !w.el) continue; if (!w || !w.el) continue;
if (w.session != this.session) continue; if (w.session != this.session) continue;
if (!w._inDocument) { if (!w._inDocument) {
if (this.session.lineWidgets[w.row] != w)
continue;
w._inDocument = true; w._inDocument = true;
renderer.container.appendChild(w.el); renderer.container.appendChild(w.el);
} }

6
node_modules/ace/lib/ace/selection.js wygenerowano vendored
Wyświetl plik

@ -799,8 +799,10 @@ var Selection = function(session) {
var docPos = this.session.screenToDocumentPosition(screenPos.row + rows, screenPos.column); var docPos = this.session.screenToDocumentPosition(screenPos.row + rows, screenPos.column);
if (rows !== 0 && chars === 0 && docPos.row === this.lead.row && docPos.column === this.lead.column) { if (rows !== 0 && chars === 0 && docPos.row === this.lead.row && docPos.column === this.lead.column) {
if (this.session.lineWidgets && this.session.lineWidgets[docPos.row]) if (this.session.lineWidgets && this.session.lineWidgets[docPos.row]) {
docPos.row++; if (docPos.row > 0 || rows > 0)
docPos.row++;
}
} }
// move the cursor and update the desired column // move the cursor and update the desired column

2
package.json
Wyświetl plik

@ -108,7 +108,7 @@
"c9.ide.save": "#e00549cb0f", "c9.ide.save": "#e00549cb0f",
"c9.ide.scm": "#2398826541", "c9.ide.scm": "#2398826541",
"c9.ide.terminal.monitor": "#b76f1c9f24", "c9.ide.terminal.monitor": "#b76f1c9f24",
"c9.ide.test": "#045e0872db", "c9.ide.test": "#2d7d12cdf7",
"c9.ide.test.mocha": "#fef601f0b9", "c9.ide.test.mocha": "#fef601f0b9",
"c9.ide.theme.flat": "#2de8414db7", "c9.ide.theme.flat": "#2de8414db7",
"c9.ide.threewaymerge": "#229382aa0b", "c9.ide.threewaymerge": "#229382aa0b",