Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved prevention of b/i/u in win env.

Browse source
This commit is contained in:
Martin Edenhofer 2014-10-10 11:43:59 +02:00
parent b48f5c164a
commit bf18b76cbf
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/assets/javascripts/app/lib/base/jquery.contenteditable.js
View file

@ -133,12 +133,19 @@
return return
} }
newLine = "<br>"
if ( this.options.mode === 'textonly' ) { if ( this.options.mode === 'textonly' ) {
document.execCommand('insertHTML', false, "\n") newLine = "\n"
}
if (document.selection) {
var range = document.selection.createRange()
newLine = "<br/>" // ie is not supporting \n :(
range.pasteHTML(newLine)
} }
else { else {
document.execCommand('insertHTML', false, '<br>') document.execCommand('insertHTML', false, newLine)
} }
// prevent the default behaviour of return key pressed // prevent the default behaviour of return key pressed
return false return false
} }
@ -275,10 +282,14 @@
// e.altKey // e.altKey
// e.ctrlKey // e.ctrlKey
// e.metaKey // e.metaKey
// on mac block e.ctrlKey + i/b/u // on mac block e.metaKey + i/b/u
if ( !e.altKey && e.metaKey && this.options.richTextFormatKey[ e.keyCode ] ) { if ( !e.altKey && e.metaKey && this.options.richTextFormatKey[ e.keyCode ] ) {
return true return true
} }
// on win block e.ctrlKey + i/b/u
if ( !e.altKey && e.ctrlKey && this.options.richTextFormatKey[ e.keyCode ] ) {
return true
}
return false return false
} }