Skip to content

Commit 6102f0c

Browse files
authored
Merge pull request #397 from vidartf/fix-contextmenu
Fix lumino message handling (context menu)
2 parents 7dacddf + 99f9a9a commit 6102f0c

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

js/src/_base/Renderable.js

+10-2
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ class RenderableView extends widgets.DOMWidgetView {
197197
}
198198
}
199199

200-
processPhosphorMessage(msg) {
201-
widgets.DOMWidgetView.prototype.processPhosphorMessage.call(this, msg);
200+
_processLuminoMessage(msg, _super) {
201+
_super.call(this, msg);
202202
switch (msg.type) {
203203
case 'after-attach':
204204
this.el.addEventListener('contextmenu', this, true);
@@ -209,6 +209,14 @@ class RenderableView extends widgets.DOMWidgetView {
209209
}
210210
}
211211

212+
processPhosphorMessage(msg) {
213+
this._processLuminoMessage(msg, widgets.DOMWidgetView.prototype.processPhosphorMessage);
214+
}
215+
216+
processLuminoMessage(msg) {
217+
this._processLuminoMessage(msg, widgets.DOMWidgetView.prototype.processLuminoMessage);
218+
}
219+
212220
handleEvent(event) {
213221
switch (event.type) {
214222
case 'contextmenu':

setupbase.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ def _translate_glob(pat):
659659
translated_parts.append(_translate_glob_part(part))
660660
os_sep_class = '[%s]' % re.escape(SEPARATORS)
661661
res = _join_translated(translated_parts, os_sep_class)
662-
return '{res}\\Z(?ms)'.format(res=res)
662+
return '(?ms){res}\\Z'.format(res=res)
663663

664664

665665
def _join_translated(translated_parts, os_sep_class):

0 commit comments

Comments
 (0)