diff options
| author | Vjacheslav Trushkin <cyberalien@gmail.com> | 2013-05-20 20:33:51 +0300 |
|---|---|---|
| committer | Vjacheslav Trushkin <cyberalien@gmail.com> | 2013-05-20 20:33:51 +0300 |
| commit | 809c51f30d28e5dc1449f817b7563d12e4050f7e (patch) | |
| tree | cd1b883da4392578570e776a23ca5cd62f871ac8 | |
| parent | b2e5cc89344d641394e5c15575379de3c86c0806 (diff) | |
| download | forums-809c51f30d28e5dc1449f817b7563d12e4050f7e.tar forums-809c51f30d28e5dc1449f817b7563d12e4050f7e.tar.gz forums-809c51f30d28e5dc1449f817b7563d12e4050f7e.tar.bz2 forums-809c51f30d28e5dc1449f817b7563d12e4050f7e.tar.xz forums-809c51f30d28e5dc1449f817b7563d12e4050f7e.zip | |
[feature/editor-code-tabs] Check for browser support in function
Check for browser support and valid textarea in function instead of
before applying function.
PHPBB3-11557
| -rw-r--r-- | phpBB/assets/javascript/core.js | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/editor.js | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index ba76ba8c10..1a8beb8224 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -681,6 +681,10 @@ phpbb.applyCodeEditor = function(textarea) { startTagsEnd = ']', endTags = ['[/code]']; + if (!textarea || typeof textarea.selectionStart !== 'number') { + return; + } + if ($(textarea).data('code-editor') === true) { return; } diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js index 6eb8c1e0c4..235cc0025b 100644 --- a/phpBB/styles/prosilver/template/editor.js +++ b/phpBB/styles/prosilver/template/editor.js @@ -415,9 +415,6 @@ function getCaretPosition(txtarea) { } textarea = doc.forms[form_name].elements[text_name]; - if (!textarea || typeof textarea.selectionStart !== 'number') { - return; - } phpbb.applyCodeEditor(textarea); }); |