From 46a789de5c8c4f7ff9717a9d45abc7cfe66b9b6a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 28 Apr 2015 16:12:58 +0200 Subject: [ticket/12542] Add initial drag-n-drop animation PHPBB3-12542 --- phpBB/assets/javascript/editor.js | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/assets/javascript/editor.js') diff --git a/phpBB/assets/javascript/editor.js b/phpBB/assets/javascript/editor.js index 5fd4f7eae3..45060c113b 100644 --- a/phpBB/assets/javascript/editor.js +++ b/phpBB/assets/javascript/editor.js @@ -355,6 +355,7 @@ function getCaretPosition(txtarea) { textarea = doc.forms[form_name].elements[text_name]; phpbb.applyCodeEditor(textarea); + phpbb.applyDragNDrop(textarea); }); })(jQuery); -- cgit v1.2.1 From c018b3bbc7bf7831d0d78c8006cf9dec5f591719 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 29 Apr 2015 12:24:12 +0200 Subject: [ticket/12542] Rename javascript method and add doc block PHPBB3-12542 --- phpBB/assets/javascript/editor.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'phpBB/assets/javascript/editor.js') diff --git a/phpBB/assets/javascript/editor.js b/phpBB/assets/javascript/editor.js index 45060c113b..c58e4d19dd 100644 --- a/phpBB/assets/javascript/editor.js +++ b/phpBB/assets/javascript/editor.js @@ -355,7 +355,9 @@ function getCaretPosition(txtarea) { textarea = doc.forms[form_name].elements[text_name]; phpbb.applyCodeEditor(textarea); - phpbb.applyDragNDrop(textarea); + if ($('#attach-panel').length) { + phpbb.showDragNDrop(textarea); + } }); })(jQuery); -- cgit v1.2.1 From 143578ad09e45e1d8a8abea0c718bf04043bed70 Mon Sep 17 00:00:00 2001 From: Callum Macrae Date: Fri, 29 May 2015 12:51:28 +0200 Subject: [ticket/13887] Minor JS refactoring PHPBB3-13887 --- phpBB/assets/javascript/editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/assets/javascript/editor.js') diff --git a/phpBB/assets/javascript/editor.js b/phpBB/assets/javascript/editor.js index c58e4d19dd..298526ab1f 100644 --- a/phpBB/assets/javascript/editor.js +++ b/phpBB/assets/javascript/editor.js @@ -159,7 +159,7 @@ function insert_text(text, spaces, popup) { /** * Add inline attachment at position */ -function attach_inline(index, filename) { +function attachInline(index, filename) { insert_text('[attachment=' + index + ']' + filename + '[/attachment]'); document.forms[form_name].elements[text_name].focus(); } -- cgit v1.2.1