Browse Source

Fixed a bug that prevented use of the AltGr key on Polish and other keyboards.

Dan Helfman 8 years ago
parent
commit
932a722284
3 changed files with 7 additions and 3 deletions
  1. 4 0
      NEWS
  2. 1 1
      config/Version.py
  3. 2 2
      static/js/Wiki.js

+ 4 - 0
NEWS View File

@@ -1,3 +1,7 @@
1
+1.6.18: 
2
+ * Fixed a bug that prevented use of the AltGr key on Polish and other
3
+   keyboards.
4
+
1 5
 1.6.17: July 26, 2009
2 6
  * Fixed a bug that caused ever-growing notes in Internet Explorer 8.
3 7
 

+ 1 - 1
config/Version.py View File

@@ -1,2 +1,2 @@
1
-VERSION = u"1.6.17"
1
+VERSION = u"1.6.18"
2 2
 TRIAL = False

+ 2 - 2
static/js/Wiki.js View File

@@ -1111,7 +1111,7 @@ Wiki.prototype.key_pressed = function ( event ) {
1111 1111
     return;
1112 1112
 
1113 1113
   var code = event.key().code;
1114
-  if ( event.modifier().ctrl ) {
1114
+  if ( event.modifier().ctrl && !event.modifier().alt ) { 
1115 1115
     // ctrl-m: make a new note
1116 1116
     if ( code == 77 ) {
1117 1117
       this.create_blank_editor( event );
@@ -1141,7 +1141,7 @@ Wiki.prototype.key_pressed = function ( event ) {
1141 1141
 Wiki.prototype.editor_key_pressed = function ( editor, event ) {
1142 1142
   var code = event.key().code;
1143 1143
 
1144
-  if ( event.modifier().ctrl ) {
1144
+  if ( event.modifier().ctrl && !event.modifier().alt ) { 
1145 1145
     // ctrl-backtick: message with frame HTML contents (for debugging)
1146 1146
     if ( code == 192 || code == 96 ) {
1147 1147
       this.display_message( editor.contents() );