Update Codemirror version to the latest which allows us to set screen reader labels on Codemirror editor.

refs #5197
This commit is contained in:
Aditya Toshniwal 2020-06-08 12:26:12 +05:30 committed by Akshay Joshi
parent 92d9c41da7
commit eb971a0320
7 changed files with 13 additions and 5 deletions

View File

@ -67,7 +67,7 @@
"bootstrap4-toggle": "3.4.0",
"bowser": "2.1.2",
"browserify": "~16.2.3",
"codemirror": "^5.50.0",
"codemirror": "^5.54.0",
"css-loader": "2.1.0",
"cssnano": "^4.1.10",
"dropzone": "^5.5.1",

View File

@ -428,6 +428,7 @@ define('pgadmin.browser', [
mode: 'text/x-pgsql',
readOnly: true,
extraKeys: pgAdmin.Browser.editor_shortcut_keys,
screenReaderLabel: gettext('SQL'),
});
/* Cache may take time to load for the first time
* Reflect the changes once cache is available

View File

@ -1810,12 +1810,15 @@ define([
// Use the Backform Control's render function
Backform.Control.prototype.render.apply(this, arguments);
var field = _.defaults(this.field.toJSON(), this.defaults);
this.sqlCtrl = CodeMirror.fromTextArea(
(this.$el.find('textarea')[0]), {
lineNumbers: true,
mode: 'text/x-pgsql',
readOnly: true,
extraKeys: pgAdmin.Browser.editor_shortcut_keys,
screenReaderLabel: field.label,
});
this.reflectPreferences();
@ -2574,6 +2577,7 @@ define([
lineNumbers: true,
mode: 'text/x-pgsql',
extraKeys: pgAdmin.Browser.editor_shortcut_keys,
screenReaderLabel: data.label,
});
self.reflectPreferences();

View File

@ -193,6 +193,7 @@ function initFilterDialog(alertify, pgBrowser) {
lineWrapping: that.preferences.wrap_code,
autoCloseBrackets: that.preferences.insert_pair_brackets,
matchBrackets: that.preferences.brace_matching,
screenReaderLabel: gettext('Filter SQL'),
});
let sql_font_size = SqlEditorUtils.calcFontSize(that.preferences.sql_font_size);

View File

@ -1806,6 +1806,7 @@ define([
lineWrapping: pgAdmin.Browser.editor_options.wrapCode,
autoCloseBrackets: pgAdmin.Browser.editor_options.insert_pair_brackets,
matchBrackets: pgAdmin.Browser.editor_options.brace_matching,
screenReaderLabel: gettext('Debugger SQL editor'),
});
// Useful for keyboard navigation, when user presses escape key we will

View File

@ -374,6 +374,7 @@ define('tools.querytool', [
extraKeys: pgBrowser.editor_shortcut_keys,
scrollbarStyle: 'simple',
dragDrop: false,
screenReaderLabel: gettext('SQL editor'),
});
if(self.handler.is_query_tool) {

View File

@ -2363,10 +2363,10 @@ coa@^2.0.2:
chalk "^2.4.1"
q "^1.1.2"
codemirror@^5.50.0:
version "5.52.2"
resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.52.2.tgz#c29e1f7179f85eb0dd17c0586fa810e4838ff584"
integrity sha512-WCGCixNUck2HGvY8/ZNI1jYfxPG5cRHv0VjmWuNzbtCLz8qYA5d+je4QhSSCtCaagyeOwMi/HmmPTjBgiTm2lQ==
codemirror@^5.54.0:
version "5.54.0"
resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.54.0.tgz#82b6adf662b29eeb7b867fe7839d49e25e4a0b38"
integrity sha512-Pgf3surv4zvw+KaW3doUU7pGjF0BPU8/sj7eglWJjzni46U/DDW8pu3nZY0QgQKUcICDXRkq8jZmq0y6KhxM3Q==
collection-visit@^1.0.0:
version "1.0.0"