[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Fix word jumping (option+arrow key) for Mac

2017-09-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377302 )

Change subject: Fix word jumping (option+arrow key) for Mac
..


Fix word jumping (option+arrow key) for Mac

Bug: T175378
Bug: T174055
Change-Id: I7f648691ec3b36f9abe1c5c7fbe5c97e142f500e
---
M resources/ext.CodeMirror.js
1 file changed, 5 insertions(+), 4 deletions(-)

Approvals:
  Niharika29: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js
index 7a253e7..1ebd32c 100644
--- a/resources/ext.CodeMirror.js
+++ b/resources/ext.CodeMirror.js
@@ -17,6 +17,10 @@
// This can be the string "0" if the user disabled the 
preference - Bug T54542#555387
mw.user.options.get( 'usebetatoolbar' ) > 0;
 
+   // T174055: Do not redefine the browser history navigation keys 
(T175378: for PC only)
+   CodeMirror.keyMap.pcDefault[ 'Alt-Left' ] = false;
+   CodeMirror.keyMap.pcDefault[ 'Alt-Right' ] = false;
+
// function for a textselection function for CodeMirror
function cmTextSelection( command, options ) {
var fn, retval;
@@ -370,10 +374,7 @@
Tab: false,
// T174514: Move the cursor at the 
beginning/end of the current wrapped line
Home: 'goLineLeft',
-   End: 'goLineRight',
-   // T174055: Do not redefine the browser 
history navigation keys
-   'Alt-Left': false,
-   'Alt-Right': false
+   End: 'goLineRight'
},
viewportMargin: Infinity
} );

-- 
To view, visit https://gerrit.wikimedia.org/r/377302
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f648691ec3b36f9abe1c5c7fbe5c97e142f500e
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Pastakhov 
Gerrit-Reviewer: Fomafix 
Gerrit-Reviewer: Niharika29 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Fix word jumping (option+arrow key) for Mac

2017-09-11 Thread Pastakhov (Code Review) 
Pastakhov has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377302 )

Change subject: Fix word jumping (option+arrow key) for Mac
..

Fix word jumping (option+arrow key) for Mac

Bug: T175378
Bug: T174055
Change-Id: I7f648691ec3b36f9abe1c5c7fbe5c97e142f500e
---
M resources/ext.CodeMirror.js
1 file changed, 5 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror 
refs/changes/02/377302/1

diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js
index 072df3c..347f3e2 100644
--- a/resources/ext.CodeMirror.js
+++ b/resources/ext.CodeMirror.js
@@ -17,6 +17,10 @@
// This can be the string "0" if the user disabled the 
preference - Bug T54542#555387
mw.user.options.get( 'usebetatoolbar' ) > 0;
 
+   // T174055: Do not redefine the browser history navigation keys 
(T175378: for PC only)
+   CodeMirror.keyMap.pcDefault["Alt-Left"] = false;
+   CodeMirror.keyMap.pcDefault["Alt-Right"] = false;
+
// function for a textselection function for CodeMirror
function cmTextSelection( command, options ) {
var fn, retval;
@@ -367,10 +371,7 @@
// select mediawiki as text input mode
mode: 'text/mediawiki',
extraKeys: {
-   Tab: false,
-   // T174055: Do not redefine the browser 
history navigation keys
-   'Alt-Left': false,
-   'Alt-Right': false
+   Tab: false
}
} );
$codeMirror = $( codeMirror.getWrapperElement() );

-- 
To view, visit https://gerrit.wikimedia.org/r/377302
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f648691ec3b36f9abe1c5c7fbe5c97e142f500e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Pastakhov 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits