diff --git a/js/src/database/events.ts b/js/src/database/events.ts index 319dcdf18d..72063ce2e5 100644 --- a/js/src/database/events.ts +++ b/js/src/database/events.ts @@ -374,9 +374,10 @@ const DatabaseEvents = { * the Definition textarea. */ var $elm = $('textarea[name=item_definition]').last(); - var linterOptions = {}; - linterOptions.eventEditor = true; - that.syntaxHiglighter = Functions.getSqlEditor($elm, {}, 'both', linterOptions); + var linterOptions = { + eventEditor: true, + }; + that.syntaxHiglighter = Functions.getSqlEditor($elm, {}, 'vertical', linterOptions); }); // end $.get() }, diff --git a/js/src/database/multi_table_query.ts b/js/src/database/multi_table_query.ts index 07a568c534..213657bcef 100644 --- a/js/src/database/multi_table_query.ts +++ b/js/src/database/multi_table_query.ts @@ -30,7 +30,7 @@ AJAX.registerTeardown('database/multi_table_query.js', function () { }); AJAX.registerOnload('database/multi_table_query.js', function () { - var editor = Functions.getSqlEditor($('#MultiSqlquery'), {}, 'both'); + var editor = Functions.getSqlEditor($('#MultiSqlquery'), {}, 'vertical'); $('.CodeMirror-line').css('text-align', 'left'); editor.setSize(-1, 50); diff --git a/js/src/database/routines.ts b/js/src/database/routines.ts index fb25ad00ea..97e1008a7f 100644 --- a/js/src/database/routines.ts +++ b/js/src/database/routines.ts @@ -391,9 +391,10 @@ const DatabaseRoutines = { * the Definition textarea. */ var $elm = $('textarea[name=item_definition]').last(); - var linterOptions = {}; - linterOptions.routineEditor = true; - that.syntaxHiglighter = Functions.getSqlEditor($elm, {}, 'both', linterOptions); + var linterOptions = { + routineEditor: true, + }; + that.syntaxHiglighter = Functions.getSqlEditor($elm, {}, 'vertical', linterOptions); // Execute item-specific code that.postDialogShow(data); diff --git a/js/src/database/triggers.ts b/js/src/database/triggers.ts index 7e490fd32e..b75942bc17 100644 --- a/js/src/database/triggers.ts +++ b/js/src/database/triggers.ts @@ -382,9 +382,10 @@ const DatabaseTriggers = { * the Definition textarea. */ var $elm = $('textarea[name=item_definition]').last(); - var linterOptions = {}; - linterOptions.triggerEditor = true; - that.syntaxHiglighter = Functions.getSqlEditor($elm, {}, 'both', linterOptions); + var linterOptions = { + triggerEditor: true, + }; + that.syntaxHiglighter = Functions.getSqlEditor($elm, {}, 'vertical', linterOptions); }); // end $.get() }, diff --git a/js/src/modules/functions.ts b/js/src/modules/functions.ts index 070bcf42c4..06a747bac9 100644 --- a/js/src/modules/functions.ts +++ b/js/src/modules/functions.ts @@ -252,27 +252,8 @@ function getSqlEditor ($textarea, options = undefined, resize = undefined, lintO resizeType = 'vertical'; } - var handles = ''; - if (resizeType === 'vertical') { - handles = 's'; - } - - if (resizeType === 'both') { - handles = 'all'; - } - - if (resizeType === 'horizontal') { - handles = 'e, w'; - } - $(codemirrorEditor.getWrapperElement()) - .css('resize', resizeType) - .resizable({ - handles: handles, - resize: function () { - codemirrorEditor.setSize($(this).width(), $(this).height()); - } - }); + .css('resize', resizeType); // enable autocomplete codemirrorEditor.on('inputRead', Functions.codeMirrorAutoCompleteOnInputRead);