makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/12093] Check that document.selection is supported.

Conflicts:
	phpBB/adm/style/editor.js
	phpBB/assets/javascript/editor.js
	phpBB/styles/prosilver/template/editor.js
This commit is contained in:
Nathan Guse 2014-02-19 09:23:02 -06:00
commit bd8951cfbe
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/assets/javascript/editor.js
View file

@ -288,7 +288,7 @@ function mozWrap(txtarea, open, close) {
* http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130 * http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130
*/ */
function storeCaret(textEl) { function storeCaret(textEl) {
if (textEl.createTextRange) { if (textEl.createTextRange && document.selection) {
textEl.caretPos = document.selection.createRange().duplicate(); textEl.caretPos = document.selection.createRange().duplicate();
} }
} }