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/core.js | 8 ++++++++ phpBB/assets/javascript/editor.js | 1 + 2 files changed, 9 insertions(+) (limited to 'phpBB/assets/javascript') diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 806db7d35f..c15a51d959 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -1232,6 +1232,14 @@ phpbb.applyCodeEditor = function(textarea) { }); }; +phpbb.applyDragNDrop = function(textarea) { + $('html').on('dragenter dragover', function () { + $(textarea).addClass('drag-n-drop'); + }).on('dragleave dragout dragend drop', function() { + $(textarea).removeClass('drag-n-drop'); + }); +}; + /** * List of classes that toggle dropdown menu, * list of classes that contain visible dropdown menu 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 ae8129b69902959212594e83435081a4bf0b5412 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 29 Apr 2015 00:12:55 +0200 Subject: [ticket/12542] Add different outline colors for body & textarea PHPBB3-12542 --- phpBB/assets/javascript/core.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'phpBB/assets/javascript') diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index c15a51d959..6238b2c1f2 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -1233,11 +1233,16 @@ phpbb.applyCodeEditor = function(textarea) { }; phpbb.applyDragNDrop = function(textarea) { - $('html').on('dragenter dragover', function () { + $('body').on('dragenter dragover', function () { $(textarea).addClass('drag-n-drop'); }).on('dragleave dragout dragend drop', function() { $(textarea).removeClass('drag-n-drop'); }); + $(textarea).on('dragenter dragover', function () { + $(textarea).addClass('drag-n-drop-highlight'); + }).on('dragleave dragout dragend drop', function() { + $(textarea).removeClass('drag-n-drop-highlight'); + }); }; /** -- 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/core.js | 14 +++++++++++++- phpBB/assets/javascript/editor.js | 4 +++- 2 files changed, 16 insertions(+), 2 deletions(-) (limited to 'phpBB/assets/javascript') diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 6238b2c1f2..23521824ff 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -1232,7 +1232,19 @@ phpbb.applyCodeEditor = function(textarea) { }); }; -phpbb.applyDragNDrop = function(textarea) { +/** + * Show drag and drop animation when textarea is present + * + * This function will enable the drag and drop animation for a specified + * textarea. + * + * @param {object} textarea Textarea DOM object to apply editor to + */ +phpbb.showDragNDrop = function(textarea) { + if (textarea === 'undefined') { + return; + } + $('body').on('dragenter dragover', function () { $(textarea).addClass('drag-n-drop'); }).on('dragleave dragout dragend drop', function() { 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 b7a89187b5b4b42d931f5e86e825c1a80395b6f7 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 20 May 2015 15:32:00 +0200 Subject: [ticket/12542] Properly check if textarea is undefined or null PHPBB3-12542 --- phpBB/assets/javascript/core.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/assets/javascript') diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 23521824ff..9eb931270a 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -1241,7 +1241,7 @@ phpbb.applyCodeEditor = function(textarea) { * @param {object} textarea Textarea DOM object to apply editor to */ phpbb.showDragNDrop = function(textarea) { - if (textarea === 'undefined') { + if (textarea == null) { return; } -- cgit v1.2.1