Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Ungureanu <udan1107@gmail.com>2015-07-19 14:53:02 +0300
committerDan Ungureanu <udan1107@gmail.com>2015-07-19 14:53:02 +0300
commitd1f494219a88a657bc0b5b637ad645df1e5add11 (patch)
treebcdbc856a3382a3fb01a7628cf1f86c9b09c0e8f /js/console.js
parent8a9a6fd324e2efd0f78728a29614251aa06f3157 (diff)
Enabled lint for console.
Updated sql-parser library to udan11/sql-parser@5e554b3. Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
Diffstat (limited to 'js/console.js')
-rw-r--r--js/console.js14
1 files changed, 12 insertions, 2 deletions
diff --git a/js/console.js b/js/console.js
index 443528e2ec..f80eb5d4b9 100644
--- a/js/console.js
+++ b/js/console.js
@@ -553,7 +553,12 @@ var PMA_consoleInput = {
mode: 'text/x-sql',
lineWrapping: true,
extraKeys: {"Ctrl-Space": "autocomplete"},
- hintOptions: {"completeSingle": false, "completeOnSingleClick": true}
+ hintOptions: {"completeSingle": false, "completeOnSingleClick": true},
+ gutters: ["CodeMirror-lint-markers"],
+ lint: {
+ "getAnnotations": CodeMirror.sqlLint,
+ "async": true,
+ }
});
PMA_consoleInput._inputs.console.on("inputRead", codemirrorAutocompleteOnInputRead);
PMA_consoleInput._inputs.console.on("keydown", function(instance, event) {
@@ -565,7 +570,12 @@ var PMA_consoleInput = {
mode: 'text/x-sql',
lineWrapping: true,
extraKeys: {"Ctrl-Space": "autocomplete"},
- hintOptions: {"completeSingle": false, "completeOnSingleClick": true}
+ hintOptions: {"completeSingle": false, "completeOnSingleClick": true},
+ gutters: ["CodeMirror-lint-markers"],
+ lint: {
+ "getAnnotations": CodeMirror.sqlLint,
+ "async": true,
+ }
});
PMA_consoleInput._inputs.bookmark.on("inputRead", codemirrorAutocompleteOnInputRead);
}