aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2014-02-19 09:06:57 -0600
committerNathan Guse <nathaniel.guse@gmail.com>2014-02-19 09:06:57 -0600
commit823dca737f2dad54a646d0032712e43e452f9b88 (patch)
tree434a71f5b72c22525fe9b9122b743a21276c02f6 /phpBB
parent14017b7032502096b04edc72f968b9407ce3b2cc (diff)
parent43ccfbc6f46ce8926bd37eeddc7bd33b7e93c165 (diff)
downloadforums-823dca737f2dad54a646d0032712e43e452f9b88.tar
forums-823dca737f2dad54a646d0032712e43e452f9b88.tar.gz
forums-823dca737f2dad54a646d0032712e43e452f9b88.tar.bz2
forums-823dca737f2dad54a646d0032712e43e452f9b88.tar.xz
forums-823dca737f2dad54a646d0032712e43e452f9b88.zip
Merge remote-tracking branch 'remotes/prototech/ticket/12093' into develop-olympus
* remotes/prototech/ticket/12093: [ticket/12093] Check that document.selection is supported.
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/adm/style/editor.js2
-rw-r--r--phpBB/styles/prosilver/template/editor.js2
-rw-r--r--phpBB/styles/subsilver2/template/editor.js2
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js
index 217aa699e2..cad01aa9f2 100644
--- a/phpBB/adm/style/editor.js
+++ b/phpBB/adm/style/editor.js
@@ -292,7 +292,7 @@ function mozWrap(txtarea, open, close)
*/
function storeCaret(textEl)
{
- if (textEl.createTextRange)
+ if (textEl.createTextRange && document.selection)
{
textEl.caretPos = document.selection.createRange().duplicate();
}
diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js
index c16b0ef703..42be70be92 100644
--- a/phpBB/styles/prosilver/template/editor.js
+++ b/phpBB/styles/prosilver/template/editor.js
@@ -347,7 +347,7 @@ function mozWrap(txtarea, open, close)
*/
function storeCaret(textEl)
{
- if (textEl.createTextRange)
+ if (textEl.createTextRange && document.selection)
{
textEl.caretPos = document.selection.createRange().duplicate();
}
diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js
index 151cf53ff1..103a271a71 100644
--- a/phpBB/styles/subsilver2/template/editor.js
+++ b/phpBB/styles/subsilver2/template/editor.js
@@ -351,7 +351,7 @@ function mozWrap(txtarea, open, close)
*/
function storeCaret(textEl)
{
- if (textEl.createTextRange)
+ if (textEl.createTextRange && document.selection)
{
textEl.caretPos = document.selection.createRange().duplicate();
}