From 6babb4ea3f6ef7f67f1b24033406fc4ba60c93d1 Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Wed, 17 Jan 2018 16:07:32 -0500
Subject: [PATCH] refreshTagList: Switch to a callback style that @ere used for
save statuses.
---
themes/bootstrap3/js/record.js | 7 +++----
themes/bootstrap3/templates/record/addtag.phtml | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/themes/bootstrap3/js/record.js b/themes/bootstrap3/js/record.js
index c83e4aa028d..def72064ed0 100644
--- a/themes/bootstrap3/js/record.js
+++ b/themes/bootstrap3/js/record.js
@@ -188,10 +188,6 @@ function ajaxLoadTab($newTab, tabid, setHash) {
function refreshTagList(_target, _loggedin) {
var loggedin = !!_loggedin || userIsLoggedIn;
var target = _target || document;
- if (typeof target.target != "undefined") { // handling calls from lightbox close
- target = document;
- _loggedin = true;
- }
var recordId = $(target).find('.hiddenId').val();
var recordSource = $(target).find('.hiddenSource').val();
var $tagList = $(target).find('.tagList');
@@ -216,6 +212,9 @@ function refreshTagList(_target, _loggedin) {
});
}
}
+function refreshTagListCallback() {
+ refreshTagList(false, true);
+}
function ajaxTagUpdate(_link, tag, _remove) {
var link = _link || document;
diff --git a/themes/bootstrap3/templates/record/addtag.phtml b/themes/bootstrap3/templates/record/addtag.phtml
index dd120a1f2c6..8708ac32b11 100644
--- a/themes/bootstrap3/templates/record/addtag.phtml
+++ b/themes/bootstrap3/templates/record/addtag.phtml
@@ -8,7 +8,7 @@
. '<li class="active">' . $this->transEsc('Add Tag') . '</li>';
?>
<h2><?=$this->transEsc('Add Tags') ?></h2>
-<form method="post" name="tagRecord" class="form-add-tag" data-lightbox-onclose="refreshTagList">
+<form method="post" name="tagRecord" class="form-add-tag" data-lightbox-onclose="refreshTagListCallback">
<input type="hidden" name="submit" value="1" />
<input type="hidden" name="id" value="<?=$this->escapeHtmlAttr($this->driver->getUniqueId())?>" />
<input type="hidden" name="source" value="<?=$this->escapeHtmlAttr($this->driver->getSourceIdentifier())?>" />
--
GitLab