public inbox for [email protected]
help / color / mirror / Atom feedFrom: Neethu Mariya Joy <[email protected]>
To: Murtuza Zabuawala <[email protected]>
Cc: Joao De Almeida Pereira <[email protected]>
Cc: pgadmin-hackers <[email protected]>
Subject: Re: Bug #2309 fix
Date: Fri, 2 Mar 2018 14:35:10 +0530
Message-ID: <CAAdJd1OduvdrYvk7jnA4tTQrCFeMzTcOiLsPt4WT=kRpZxk8nw@mail.gmail.com> (raw)
In-Reply-To: <CAKKotZQrunVSAH1=GFezerbCFWNRa+hF8g99J9NPTcZsw5SadA@mail.gmail.com>
References: <CAAdJd1Mwu7ths9DfsjZNOshML9wq_guMb5vXzrKhH-8kZojvbQ@mail.gmail.com>
<CAE+jjamYZfYvwqjonCsO_A5FNP-EuSzXNEdR8sk34hCNC3sUKA@mail.gmail.com>
<CAKKotZQrunVSAH1=GFezerbCFWNRa+hF8g99J9NPTcZsw5SadA@mail.gmail.com>
Hi,
A similar workaround fixed #3137 too. I'm attaching the patch below.
Sincerely,
Neethu
On Fri, Mar 2, 2018 at 9:45 AM, Murtuza Zabuawala <
[email protected]> wrote:
> Hi Neethu,
>
> Patch looks good.
>
> We are facing similar issue on dashboard as well where users are not able
> to copy the sql from server activity table, I've attached screenshot for
> your reference.
> Bug: https://redmine.postgresql.org/issues/3137
>
>
> --
> Regards,
> Murtuza Zabuawala
> EnterpriseDB: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
>
> On Fri, Mar 2, 2018 at 3:35 AM, Joao De Almeida Pereira <
> [email protected]> wrote:
>
>> Hello Neethu,
>>
>> We run the patch though our test pipeline and all tests are green.
>> Everything looks good with this patch
>>
>> Thanks
>> Joao
>> On Thu, Mar 1, 2018 at 10:37 AM Neethu Mariya Joy <
>> [email protected]> wrote:
>>
>>> Hi,
>>> I am Neethu Mariya Joy, an undergraduate pursuing BE in Computer Science
>>> at BITS Pilani.
>>>
>>> I've attempted to fix https://redmine.postgresql.org/issues/2309.
>>> Codemirrors catches all the keyboard and mouse events when 'readOnly'
>>> option is set to 'noCursor' and does not allow copying.
>>> So, I've set 'readOnly' option to true. In order to hide the cursor,
>>> I've added a class 'hide-cursor-workaround' and applied css styles to hide
>>> the cursor.
>>>
>>> I'm attaching my patch as bug2309.diff below as per the contribution
>>> guidelines.
>>>
>>> Hope this helps. Thank you for your consideration!
>>>
>>> Sincerely,
>>> Neethu Mariya Joy
>>> GitHub <https://github.com/Roboneet; | Linkedin
>>> <https://www.linkedin.com/in/neethu-mariya-joy-653655128/;
>>>
>>>
>>>
>
Attachments:
[application/octet-stream] bug2309_3137.diff (2.2K, 3-bug2309_3137.diff)
download | inline diff:
diff --git a/web/pgadmin/static/css/codemirror.overrides.css b/web/pgadmin/static/css/codemirror.overrides.css
index 178b038..1b5fcac 100644
--- a/web/pgadmin/static/css/codemirror.overrides.css
+++ b/web/pgadmin/static/css/codemirror.overrides.css
@@ -81,3 +81,8 @@
.sql_textarea .CodeMirror-scroll {
z-index: 0;
}
+
+/* workaround for codemirrors 'readOnly' option which is set to true instead of 'noCursor' */
+.hide-cursor-workaround .CodeMirror-cursors{
+ display: none;
+}
diff --git a/web/pgadmin/static/js/backform.pgadmin.js b/web/pgadmin/static/js/backform.pgadmin.js
index 5bbbf9f..aa811c5 100644
--- a/web/pgadmin/static/js/backform.pgadmin.js
+++ b/web/pgadmin/static/js/backform.pgadmin.js
@@ -2098,10 +2098,11 @@ define([
// Disable editor
if (isDisabled) {
- self.sqlCtrl.setOption('readOnly', 'nocursor');
+ // set read only mode to true instead of 'nocursor', and hide cursor using a class so that copying is enabled
+ self.sqlCtrl.setOption('readOnly', true);
var cm = self.sqlCtrl.getWrapperElement();
if (cm) {
- cm.className += ' cm_disabled';
+ cm.className += ' cm_disabled hide-cursor-workaround';
}
}
diff --git a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
index 56a901a..a84daa3 100644
--- a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
+++ b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
@@ -2019,12 +2019,12 @@ define('tools.querytool', [
}
}
else {
- // Disable codemirror by setting cursor to nocursor and background to dark.
+ // Disable codemirror by setting readOnly option to true, background to dark, and cursor, hidden.
self.init_events();
- self.gridView.query_tool_obj.setOption('readOnly', 'nocursor');
+ self.gridView.query_tool_obj.setOption('readOnly', true);
var cm = self.gridView.query_tool_obj.getWrapperElement();
if (cm) {
- cm.className += ' bg-gray-1 opacity-5';
+ cm.className += ' bg-gray-1 opacity-5 hide-cursor-workaround';
}
self.disable_tool_buttons(true);
self.execute_data_query();
view thread (6+ messages) latest in thread
reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: [email protected]
Cc: [email protected], [email protected], [email protected]
Subject: Re: Bug #2309 fix
In-Reply-To: <CAAdJd1OduvdrYvk7jnA4tTQrCFeMzTcOiLsPt4WT=kRpZxk8nw@mail.gmail.com>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox