dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

codemirror 3, thnaks Roberto Perdomo and Mariano Reingart

Browse Source
This commit is contained in:
Massimo
2013-01-17 11:00:56 -06:00
parent 5f9094e7d1
commit 1122ad65ec
48 changed files with 7788 additions and 4568 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/admin/static/js/ajax_editor.js
+13 -10
View File
@@ -44,7 +44,7 @@ function doHighlight(highlight) {
window.ace_editor.gotoLine(highlight.lineno);
} else if (window.mirror) {
window.mirror.setSelection({line:highlight.lineno,ch:0},
{line:highlight.end,ch:0});
{line:highlight.lineno-1,ch:0});
} else if (window.eamy) {
// not implemented
} else if (window.textarea) {
@@ -180,23 +180,25 @@ function doToggleBreakpoint(filename, url, sel) {
.slideDown();
}
else jQuery('.flash').hide();
try {
//try {
if (json.error) {
window.location.href=json.redirect;
} else {
if (json.ok==true && window.mirror) {
// mark the breakpoint if ok=True
editor.setMarker(json.lineno-1,
"<span style='color: red'>●</span> %N%")
editor.setGutterMarker(json.lineno-1, "breakpoints", makeMarker());
//editor.setMarker(json.lineno-1,
// "<span style='color: red'>●</span> %N%")
} else if (json.ok==false && window.mirror) {
// remove mark if ok=False
editor.setMarker(json.lineno-1, "%N%")
editor.setGutterMarker(json.lineno-1, "breakpoints", null);
//editor.setMarker(json.lineno-1, "%N%")
} else {
// do nothing if ok = null
}
// alert(json.ok + json.lineno);
}
} catch(e) { on_error(); }
//} catch(e) { on_error(); }
},
error: function(json) { on_error(); }
});
@@ -221,7 +223,7 @@ function doListBreakpoints(filename, url) {
xhr.setRequestHeader('web2py-component-element',
'doListBreakpoints');},
success: function(json,text,xhr){
try {
//try {
if (json.error) {
window.location.href=json.redirect;
} else {
@@ -229,12 +231,13 @@ function doListBreakpoints(filename, url) {
for (i in json.breakpoints) {
lineno = json.breakpoints[i];
// mark the breakpoint if ok=True
editor.setMarker(lineno-1,
"<span style='color: red'>●</span> %N%");
editor.setGutterMarker(lineno-1, "breakpoints", makeMarker());
//editor.setMarker(lineno-1,
// "<span style='color: red'>●</span> %N%");
}
}
}
} catch(e) { on_error(); }
//} catch(e) { on_error(); }
},
error: function(json) { on_error(); }
});