diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2014-02-19 09:23:02 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2014-02-19 09:23:02 -0600 |
| commit | bd8951cfbec799f685eb89f14a83933cee647112 (patch) | |
| tree | 832ffd69e6dffe9a5e5d9921489b52b268f7d9df | |
| parent | eaf9a41ed8bd016880b11f480f92f1b0cfb32f84 (diff) | |
| parent | 823dca737f2dad54a646d0032712e43e452f9b88 (diff) | |
| download | forums-bd8951cfbec799f685eb89f14a83933cee647112.tar forums-bd8951cfbec799f685eb89f14a83933cee647112.tar.gz forums-bd8951cfbec799f685eb89f14a83933cee647112.tar.bz2 forums-bd8951cfbec799f685eb89f14a83933cee647112.tar.xz forums-bd8951cfbec799f685eb89f14a83933cee647112.zip | |
Merge branch 'develop-olympus' into develop
* 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
| -rw-r--r-- | phpBB/assets/javascript/editor.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/assets/javascript/editor.js b/phpBB/assets/javascript/editor.js index be3d868f13..dfc7dab525 100644 --- a/phpBB/assets/javascript/editor.js +++ b/phpBB/assets/javascript/editor.js @@ -288,7 +288,7 @@ function mozWrap(txtarea, open, close) { * http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130 */ function storeCaret(textEl) { - if (textEl.createTextRange) { + if (textEl.createTextRange && document.selection) { textEl.caretPos = document.selection.createRange().duplicate(); } } |