From 252ed9df030b4ad1637428018913e3a8d8038312 Mon Sep 17 00:00:00 2001 From: travis dewolf Date: Sat, 19 Mar 2016 15:40:12 -0400 Subject: [PATCH 1/5] prevent resizing when holding ctrl key --- nengo_gui/static/components/component.js | 10 ++++++++++ nengo_gui/static/components/netgraph_item.js | 12 ++++++++++++ 2 files changed, 22 insertions(+) diff --git a/nengo_gui/static/components/component.js b/nengo_gui/static/components/component.js index c02b908b..0bab85c1 100644 --- a/nengo_gui/static/components/component.js +++ b/nengo_gui/static/components/component.js @@ -117,6 +117,16 @@ Nengo.Component = function(parent, args) { self.save_layout(); }); + $(document).bind('keydown', function(event) { + if (event.ctrlKey) { + interact(self.div).resizable(false); + } + }); + $(document).bind('keyup', function(event) { + interact(self.div).resizable(true); + }); + + /** Open a WebSocket to the server */ this.uid = args.uid; if (this.uid != undefined) { diff --git a/nengo_gui/static/components/netgraph_item.js b/nengo_gui/static/components/netgraph_item.js index 63a239cd..169ff9b7 100644 --- a/nengo_gui/static/components/netgraph_item.js +++ b/nengo_gui/static/components/netgraph_item.js @@ -296,6 +296,18 @@ Nengo.NetGraphItem = function(ng, info, minimap, mini_item) { x:item.x, y:item.y, width:item.width, height:item.height}); }); + + $(document).bind('keydown', function(event) { + if (event.ctrlKey) { + interact(self.area).resizable(false); + } + }); + $(document).bind('keyup', function(event) { + if (event.ctrlKey) { + interact(self.area).resizable(true); + } + }); + } // Determine when to pull up the menu From 740bca3c39d9f3e6c954987d368a771368038eed Mon Sep 17 00:00:00 2001 From: travis dewolf Date: Mon, 21 Mar 2016 15:36:23 -0400 Subject: [PATCH 2/5] changed keyup check to keyCode 17 --- nengo_gui/static/components/component.js | 4 +++- nengo_gui/static/components/netgraph_item.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nengo_gui/static/components/component.js b/nengo_gui/static/components/component.js index 0bab85c1..d7ca68a3 100644 --- a/nengo_gui/static/components/component.js +++ b/nengo_gui/static/components/component.js @@ -123,7 +123,9 @@ Nengo.Component = function(parent, args) { } }); $(document).bind('keyup', function(event) { - interact(self.div).resizable(true); + if (event.keyCode == 17) { + interact(self.div).resizable(true); + } }); diff --git a/nengo_gui/static/components/netgraph_item.js b/nengo_gui/static/components/netgraph_item.js index 169ff9b7..b675ebfb 100644 --- a/nengo_gui/static/components/netgraph_item.js +++ b/nengo_gui/static/components/netgraph_item.js @@ -303,7 +303,7 @@ Nengo.NetGraphItem = function(ng, info, minimap, mini_item) { } }); $(document).bind('keyup', function(event) { - if (event.ctrlKey) { + if (event.keyCode == 17) { interact(self.area).resizable(true); } }); From b0c65ffd0a615c28ee4a1e8558c5728e990cd532 Mon Sep 17 00:00:00 2001 From: travis dewolf Date: Mon, 21 Mar 2016 17:58:24 -0400 Subject: [PATCH 3/5] added comment for magic keycode 17 --- nengo_gui/static/components/component.js | 1 + nengo_gui/static/components/netgraph_item.js | 1 + 2 files changed, 2 insertions(+) diff --git a/nengo_gui/static/components/component.js b/nengo_gui/static/components/component.js index d7ca68a3..291da864 100644 --- a/nengo_gui/static/components/component.js +++ b/nengo_gui/static/components/component.js @@ -123,6 +123,7 @@ Nengo.Component = function(parent, args) { } }); $(document).bind('keyup', function(event) { + // keyCode 17 == ctrlKey if (event.keyCode == 17) { interact(self.div).resizable(true); } diff --git a/nengo_gui/static/components/netgraph_item.js b/nengo_gui/static/components/netgraph_item.js index b675ebfb..1180cdaa 100644 --- a/nengo_gui/static/components/netgraph_item.js +++ b/nengo_gui/static/components/netgraph_item.js @@ -303,6 +303,7 @@ Nengo.NetGraphItem = function(ng, info, minimap, mini_item) { } }); $(document).bind('keyup', function(event) { + // keyCode 17 == ctrlKey if (event.keyCode == 17) { interact(self.area).resizable(true); } From 79a044644673f022b4ebdb611ccc32b46fd68587 Mon Sep 17 00:00:00 2001 From: travis dewolf Date: Tue, 22 Mar 2016 16:08:03 -0400 Subject: [PATCH 4/5] added hotkeys description for disable resize --- nengo_gui/static/modal.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nengo_gui/static/modal.js b/nengo_gui/static/modal.js index 2471acaf..b0829ef4 100644 --- a/nengo_gui/static/modal.js +++ b/nengo_gui/static/modal.js @@ -168,6 +168,8 @@ Nengo.Modal.prototype.help_body = function() { '' + ctrl + '-1'); //TODO: possibly pick a better shortcut key $body.append('Toggle auto-update'+ '' + ctrl + '-' + shift + '-1'); + $body.append('Disable resize'+ + '' + ctrl + ''); $body.append('Show hotkeys'+ '?'); $body.append(''); From 3fa78a267e1f069fc233fef2546c614d5559418d Mon Sep 17 00:00:00 2001 From: Jan Gosmann Date: Tue, 2 Aug 2016 14:00:32 -0400 Subject: [PATCH 5/5] squash! added hotkeys description for disable resize Use self-documenting code instead of comment. Be consistent in use of key codes instead of ctrlKey flag. --- nengo_gui/static/components/component.js | 6 +++--- nengo_gui/static/components/netgraph_item.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nengo_gui/static/components/component.js b/nengo_gui/static/components/component.js index 291da864..f687433b 100644 --- a/nengo_gui/static/components/component.js +++ b/nengo_gui/static/components/component.js @@ -117,14 +117,14 @@ Nengo.Component = function(parent, args) { self.save_layout(); }); + var ctrlKey = 17; $(document).bind('keydown', function(event) { - if (event.ctrlKey) { + if (event.keyCode == ctrlKey) { interact(self.div).resizable(false); } }); $(document).bind('keyup', function(event) { - // keyCode 17 == ctrlKey - if (event.keyCode == 17) { + if (event.keyCode == ctrlKey) { interact(self.div).resizable(true); } }); diff --git a/nengo_gui/static/components/netgraph_item.js b/nengo_gui/static/components/netgraph_item.js index 1180cdaa..2346c46a 100644 --- a/nengo_gui/static/components/netgraph_item.js +++ b/nengo_gui/static/components/netgraph_item.js @@ -297,14 +297,14 @@ Nengo.NetGraphItem = function(ng, info, minimap, mini_item) { width:item.width, height:item.height}); }); + var ctrlKey = 17; $(document).bind('keydown', function(event) { - if (event.ctrlKey) { + if (event.keyCode = ctrlKey) { interact(self.area).resizable(false); } }); $(document).bind('keyup', function(event) { - // keyCode 17 == ctrlKey - if (event.keyCode == 17) { + if (event.keyCode == ctrlKey) { interact(self.area).resizable(true); } });