public inbox for [email protected]help / color / mirror / Atom feed
[pgAdmin][RM5131] ctrl + a shortcut does not move cursor in sql editor with macOS 4+ messages / 2 participants [nested] [flat]
* [pgAdmin][RM5131] ctrl + a shortcut does not move cursor in sql editor with macOS @ 2020-09-28 09:52 Aditya Toshniwal <[email protected]> 0 siblings, 1 reply; 4+ messages in thread From: Aditya Toshniwal @ 2020-09-28 09:52 UTC (permalink / raw) To: pgadmin-hackers Hi Hackers, Attached patch removes the incorrect overriding of default CodeMirror shortcuts. Please review. -- Thanks, Aditya Toshniwal pgAdmin hacker | Sr. Software Engineer | *edbpostgres.com* <http://edbpostgres.com; "Don't Complain about Heat, Plant a TREE" Attachments: [application/octet-stream] RM5131.patch (3.2K, 3-RM5131.patch) download | inline diff: diff --git a/web/pgadmin/browser/static/js/browser.js b/web/pgadmin/browser/static/js/browser.js index 0eb7840b0..e9463f2ea 100644 --- a/web/pgadmin/browser/static/js/browser.js +++ b/web/pgadmin/browser/static/js/browser.js @@ -2171,22 +2171,6 @@ define('pgadmin.browser', [ 'Ctrl-Space': 'autocomplete', 'Cmd-Space': 'autocomplete', - // Select All text - 'Ctrl-A': 'selectAll', - 'Cmd-A': 'selectAll', - - // Redo text - 'Ctrl-Y': 'redo', - 'Cmd-Y': 'redo', - - // Undo text - 'Ctrl-Z': 'undo', - 'Cmd-Z': 'undo', - - // Delete Line - 'Ctrl-D': 'deleteLine', - 'Cmd-D': 'deleteLine', - 'Alt-Up': 'goLineUp', 'Alt-Down': 'goLineDown', diff --git a/web/pgadmin/static/scss/_pgadmin.style.scss b/web/pgadmin/static/scss/_pgadmin.style.scss index 2bd4d5a19..52f96170b 100644 --- a/web/pgadmin/static/scss/_pgadmin.style.scss +++ b/web/pgadmin/static/scss/_pgadmin.style.scss @@ -287,6 +287,7 @@ margin-top: 25px !important; position: relative; text-align: center; + font-size: $font-size-base; &:before { font-family: $font-family-icon; diff --git a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js index ddd9ad701..b4ee29e50 100644 --- a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js +++ b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js @@ -76,6 +76,14 @@ define('tools.querytool', [ var is_query_running = false; + const EMPTY_DATA_OUTPUT_CONTENT = '<div role="status" class="pg-panel-message">' + + gettext('No data output. Execute a query to get output.') + + '</div>'; + + const EMPTY_EXPLAIN_CONTENT = '<div role="status" class="pg-panel-message">' + + gettext('Use Explain/Explain analyze button to generate the plan for a query. Alternatively, you can also execute "EXPLAIN (FORMAT JSON) [QUERY]".') + + '</div>'; + // Defining Backbone view for the sql grid. var SQLEditorView = Backbone.View.extend({ initialize: function(opts) { @@ -251,7 +259,7 @@ define('tools.querytool', [ isCloseable: false, isPrivate: true, extraClasses: 'hide-vertical-scrollbar', - content: '<div id ="datagrid" class="sql-editor-grid-container text-12" tabindex="0"></div>', + content: `<div id ="datagrid" class="sql-editor-grid-container text-12" tabindex="0">${EMPTY_DATA_OUTPUT_CONTENT}</div>`, }); var explain = new pgAdmin.Browser.Panel({ @@ -261,7 +269,7 @@ define('tools.querytool', [ height: '100%', isCloseable: false, isPrivate: true, - content: '<div class="sql-editor-explain" tabindex="0"></div>', + content: `<div class="sql-editor-explain pg-el-container" tabindex="0">${EMPTY_EXPLAIN_CONTENT}</div>`, }); var messages = new pgAdmin.Browser.Panel({ @@ -2658,7 +2666,7 @@ define('tools.querytool', [ self.changedModels = []; self.has_oids = data.has_oids; self.oids = data.oids; - $('.sql-editor-explain').empty(); + $('.sql-editor-explain').html(EMPTY_EXPLAIN_CONTENT); self.explain_plan = false; /* If object don't have primary keys then set the ^ permalink raw reply [nested|flat] 4+ messages in thread
* Re: [pgAdmin][RM5131] ctrl + a shortcut does not move cursor in sql editor with macOS @ 2020-09-28 12:29 Akshay Joshi <[email protected]> parent: Aditya Toshniwal <[email protected]> 0 siblings, 1 reply; 4+ messages in thread From: Akshay Joshi @ 2020-09-28 12:29 UTC (permalink / raw) To: Aditya Toshniwal <[email protected]>; +Cc: pgadmin-hackers Hi Aditya The patch is not applying, rebase, and send it again. On Mon, Sep 28, 2020 at 3:23 PM Aditya Toshniwal < [email protected]> wrote: > Hi Hackers, > > Attached patch removes the incorrect overriding of default CodeMirror > shortcuts. > Please review. > > -- > Thanks, > Aditya Toshniwal > pgAdmin hacker | Sr. Software Engineer | *edbpostgres.com* > <http://edbpostgres.com; > "Don't Complain about Heat, Plant a TREE" > -- *Thanks & Regards* *Akshay Joshi* *pgAdmin Hacker | Sr. Software Architect* *EDB Postgres <http://edbpostgres.com>* *Mobile: +91 976-788-8246* ^ permalink raw reply [nested|flat] 4+ messages in thread
* Re: [pgAdmin][RM5131] ctrl + a shortcut does not move cursor in sql editor with macOS @ 2020-09-28 12:42 Aditya Toshniwal <[email protected]> parent: Akshay Joshi <[email protected]> 0 siblings, 1 reply; 4+ messages in thread From: Aditya Toshniwal @ 2020-09-28 12:42 UTC (permalink / raw) To: Akshay Joshi <[email protected]>; +Cc: pgadmin-hackers Hi, Please find the updated patch. On Mon, Sep 28, 2020 at 5:59 PM Akshay Joshi <[email protected]> wrote: > Hi Aditya > > The patch is not applying, rebase, and send it again. > > On Mon, Sep 28, 2020 at 3:23 PM Aditya Toshniwal < > [email protected]> wrote: > >> Hi Hackers, >> >> Attached patch removes the incorrect overriding of default CodeMirror >> shortcuts. >> Please review. >> >> -- >> Thanks, >> Aditya Toshniwal >> pgAdmin hacker | Sr. Software Engineer | *edbpostgres.com* >> <http://edbpostgres.com; >> "Don't Complain about Heat, Plant a TREE" >> > > > -- > *Thanks & Regards* > *Akshay Joshi* > *pgAdmin Hacker | Sr. Software Architect* > *EDB Postgres <http://edbpostgres.com>* > > *Mobile: +91 976-788-8246* > -- Thanks, Aditya Toshniwal pgAdmin hacker | Sr. Software Engineer | *edbpostgres.com* <http://edbpostgres.com; "Don't Complain about Heat, Plant a TREE" Attachments: [application/octet-stream] RM5131.patch (729B, 3-RM5131.patch) download | inline diff: diff --git a/web/pgadmin/browser/static/js/browser.js b/web/pgadmin/browser/static/js/browser.js index 0eb7840b0..e9463f2ea 100644 --- a/web/pgadmin/browser/static/js/browser.js +++ b/web/pgadmin/browser/static/js/browser.js @@ -2171,22 +2171,6 @@ define('pgadmin.browser', [ 'Ctrl-Space': 'autocomplete', 'Cmd-Space': 'autocomplete', - // Select All text - 'Ctrl-A': 'selectAll', - 'Cmd-A': 'selectAll', - - // Redo text - 'Ctrl-Y': 'redo', - 'Cmd-Y': 'redo', - - // Undo text - 'Ctrl-Z': 'undo', - 'Cmd-Z': 'undo', - - // Delete Line - 'Ctrl-D': 'deleteLine', - 'Cmd-D': 'deleteLine', - 'Alt-Up': 'goLineUp', 'Alt-Down': 'goLineDown', ^ permalink raw reply [nested|flat] 4+ messages in thread
* Re: [pgAdmin][RM5131] ctrl + a shortcut does not move cursor in sql editor with macOS @ 2020-10-08 12:57 Akshay Joshi <[email protected]> parent: Aditya Toshniwal <[email protected]> 0 siblings, 0 replies; 4+ messages in thread From: Akshay Joshi @ 2020-10-08 12:57 UTC (permalink / raw) To: Aditya Toshniwal <[email protected]>; +Cc: pgadmin-hackers Thanks, patch applied. On Mon, Sep 28, 2020 at 6:12 PM Aditya Toshniwal < [email protected]> wrote: > Hi, > > Please find the updated patch. > > On Mon, Sep 28, 2020 at 5:59 PM Akshay Joshi < > [email protected]> wrote: > >> Hi Aditya >> >> The patch is not applying, rebase, and send it again. >> >> On Mon, Sep 28, 2020 at 3:23 PM Aditya Toshniwal < >> [email protected]> wrote: >> >>> Hi Hackers, >>> >>> Attached patch removes the incorrect overriding of default CodeMirror >>> shortcuts. >>> Please review. >>> >>> -- >>> Thanks, >>> Aditya Toshniwal >>> pgAdmin hacker | Sr. Software Engineer | *edbpostgres.com* >>> <http://edbpostgres.com; >>> "Don't Complain about Heat, Plant a TREE" >>> >> >> >> -- >> *Thanks & Regards* >> *Akshay Joshi* >> *pgAdmin Hacker | Sr. Software Architect* >> *EDB Postgres <http://edbpostgres.com>* >> >> *Mobile: +91 976-788-8246* >> > > > -- > Thanks, > Aditya Toshniwal > pgAdmin hacker | Sr. Software Engineer | *edbpostgres.com* > <http://edbpostgres.com; > "Don't Complain about Heat, Plant a TREE" > -- *Thanks & Regards* *Akshay Joshi* *pgAdmin Hacker | Sr. Software Architect* *EDB Postgres <http://edbpostgres.com>* *Mobile: +91 976-788-8246* ^ permalink raw reply [nested|flat] 4+ messages in thread
end of thread, other threads:[~2020-10-08 12:57 UTC | newest] Thread overview: 4+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2020-09-28 09:52 [pgAdmin][RM5131] ctrl + a shortcut does not move cursor in sql editor with macOS Aditya Toshniwal <[email protected]> 2020-09-28 12:29 ` Akshay Joshi <[email protected]> 2020-09-28 12:42 ` Aditya Toshniwal <[email protected]> 2020-10-08 12:57 ` Akshay Joshi <[email protected]>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox