From 3606e130de7a017dd386ab81faa4945f930270a8 Mon Sep 17 00:00:00 2001
From: Michael Miday <midaym@gmail.com>
Date: Mon, 14 Sep 2015 16:26:27 +0200
Subject: [ticket/14139] Fix loading indicator

---
 phpBB/assets/javascript/core.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB/assets/javascript/core.js')

diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index 36e881f5fd..6285a16734 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -27,7 +27,10 @@ phpbb.isTouch = (window && typeof window.ontouchstart !== 'undefined');
  */
 phpbb.loadingIndicator = function() {
 	if (!$loadingIndicator) {
-		$loadingIndicator = $('<div />', { id: 'loading_indicator' });
+		$loadingIndicator = $('<div />', { 
+			id: 'loading_indicator', 
+			class: 'loading_indicator', 
+		});
 		$loadingIndicator.appendTo('#page-footer');
 	}
 
-- 
cgit v1.2.1


From ea591562ae4234633a99865b9539fc5b902dbe69 Mon Sep 17 00:00:00 2001
From: Michael Miday <midaym@gmail.com>
Date: Tue, 15 Sep 2015 23:31:14 +0200
Subject: [ticket/12769] Fix subscription toggling fn

---
 phpBB/assets/javascript/core.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/assets/javascript/core.js')

diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index 6285a16734..6a008ba1ec 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -957,12 +957,6 @@ phpbb.addAjaxCallback('toggle_link', function() {
 	$anchor.each(function() {
 		var $this = $(this);
 
-		// Toggle link text
-		toggleText = $this.attr('data-toggle-text');
-		$this.attr('data-toggle-text', $this.text());
-		$this.attr('title', $.trim(toggleText));
-		$this.text(toggleText);
-
 		// Toggle link url
 		toggleUrl = $this.attr('data-toggle-url');
 		$this.attr('data-toggle-url', $this.attr('href'));
@@ -970,8 +964,14 @@ phpbb.addAjaxCallback('toggle_link', function() {
 
 		// Toggle class of link parent
 		toggleClass = $this.attr('data-toggle-class');
-		$this.attr('data-toggle-class', $this.parent().attr('class'));
-		$this.parent().attr('class', toggleClass);
+		$this.attr('data-toggle-class', $this.children().attr('class'));
+		$this.children('.icon').attr('class', toggleClass);
+
+		// Toggle link text
+		toggleText = $this.attr('data-toggle-text');
+		$this.attr('data-toggle-text', $this.children('span').text());
+		$this.attr('title', $.trim(toggleText));
+		$this.children('span').text(toggleText);
 	});
 });
 
-- 
cgit v1.2.1


From b9854b4c892ea2be07072dfb0ed935b21e497be1 Mon Sep 17 00:00:00 2001
From: kasimi <mail@kasimi.net>
Date: Mon, 21 Aug 2017 15:33:46 +0200
Subject: [ticket/15333] Call callback when confirm dialog is canceled

PHPBB3-15333
---
 phpBB/assets/javascript/core.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'phpBB/assets/javascript/core.js')

diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index 7dcedaef80..c9f0d5b0ba 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -194,9 +194,7 @@ phpbb.confirm = function(msg, callback, fadedark) {
 	$confirmDiv.find('input[type="button"]').one('click.phpbb.confirmbox', function(e) {
 		var confirmed = this.name === 'confirm';
 
-		if (confirmed) {
-			callback(true);
-		}
+		callback(confirmed);
 		$confirmDiv.find('input[type="button"]').off('click.phpbb.confirmbox');
 		phpbb.alert.close($confirmDiv, fadedark || !confirmed);
 
-- 
cgit v1.2.1


From d3305ad13ee352b299a772bc111b02f1fda84f67 Mon Sep 17 00:00:00 2001
From: kasimi <mail@kasimi.net>
Date: Mon, 21 Aug 2017 15:30:07 +0200
Subject: [ticket/15332] Don't remove dark background if fadedark is false

PHPBB3-15332
---
 phpBB/assets/javascript/core.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/assets/javascript/core.js')

diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index 7dcedaef80..1be8a5784d 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -179,7 +179,7 @@ phpbb.alert.close = function($alert, fadedark) {
 phpbb.confirm = function(msg, callback, fadedark) {
 	var $confirmDiv = $('#phpbb_confirm');
 	$confirmDiv.find('.alert_text').html(msg);
-	fadedark = fadedark || true;
+	fadedark = fadedark !== 'undefined' ? fadedark : true;
 
 	$(document).on('keydown.phpbb.alert', function(e) {
 		if (e.keyCode === keymap.ENTER || e.keyCode === keymap.ESC) {
-- 
cgit v1.2.1