From 9876d5382d6815224f795df5ecc11731fc1ae6a7 Mon Sep 17 00:00:00 2001 From: Arne Hassel Date: Tue, 6 Aug 2019 17:27:34 +0200 Subject: [PATCH 1/4] Will now refresh pane as expected But does not handle the green plus icon properly, will fix in next commit --- src/acl-control.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/acl-control.js b/src/acl-control.js index 03c252761..abe618e23 100644 --- a/src/acl-control.js +++ b/src/acl-control.js @@ -567,16 +567,18 @@ UI.aclControl.ACLControlBox5 = function (subject, dom, noun, kb, callback) { }) try { kb.fetcher.putBack(targetACLDoc) + .then(function () { + statusBlock.textContent = ' (Now editing specific access for this ' + noun + ')' + bottomRightCell.removeChild(editPlease) + renderBox() + }) } catch (e) { let msg = ' Error writing back access control file! ' + e console.error(msg) statusBlock.textContent += msg return } - kb.fetcher.requested[targetACLDoc.uri] = 'done' // cheat - say cache is now in sync - statusBlock.textContent = ' (Now editing specific access for this ' + noun + ')' - bottomRightCell.removeChild(editPlease) - renderBox() + // kb.fetcher.requested[targetACLDoc.uri] = 'done' // cheat - say cache is now in sync }) } // defaults.length } else { // Not using defaults @@ -593,7 +595,7 @@ UI.aclControl.ACLControlBox5 = function (subject, dom, noun, kb, callback) { kb.fetcher.delete(targetACLDoc.uri) .then(function () { statusBlock.textContent = ' The sharing for this ' + noun + ' is now the default.' - bottomRow.removeChild(useDefault) + bottomRightCell.removeChild(useDefault) box.style.cssText = 'color: #777;' renderBox() }) From b9575a87a8cf0dbf3dc434d043fdfc5478eb75cc Mon Sep 17 00:00:00 2001 From: Arne Hassel Date: Tue, 6 Aug 2019 17:54:31 +0200 Subject: [PATCH 2/4] A hacky fix to the never-ending spawning green plus icons --- src/acl-control.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/acl-control.js b/src/acl-control.js index abe618e23..aeff186c3 100644 --- a/src/acl-control.js +++ b/src/acl-control.js @@ -597,6 +597,7 @@ UI.aclControl.ACLControlBox5 = function (subject, dom, noun, kb, callback) { statusBlock.textContent = ' The sharing for this ' + noun + ' is now the default.' bottomRightCell.removeChild(useDefault) box.style.cssText = 'color: #777;' + bottomLeftCell.innerHTML = '' renderBox() }) .catch(function (e) { From e2eaf0dcd689935cd7493ac36dcbacadce67625c Mon Sep 17 00:00:00 2001 From: Arne Hassel Date: Tue, 6 Aug 2019 17:54:31 +0200 Subject: [PATCH 3/4] Revert "A hacky fix to the never-ending spawning green plus icons" This reverts commit b9575a87a8cf0dbf3dc434d043fdfc5478eb75cc. --- src/acl-control.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/acl-control.js b/src/acl-control.js index aeff186c3..abe618e23 100644 --- a/src/acl-control.js +++ b/src/acl-control.js @@ -597,7 +597,6 @@ UI.aclControl.ACLControlBox5 = function (subject, dom, noun, kb, callback) { statusBlock.textContent = ' The sharing for this ' + noun + ' is now the default.' bottomRightCell.removeChild(useDefault) box.style.cssText = 'color: #777;' - bottomLeftCell.innerHTML = '' renderBox() }) .catch(function (e) { From 6d21f11a4c5a19715791669f91d4bbab44986614 Mon Sep 17 00:00:00 2001 From: Arne Hassel Date: Tue, 6 Aug 2019 17:54:31 +0200 Subject: [PATCH 4/4] Revert "Revert "A hacky fix to the never-ending spawning green plus icons"" This reverts commit e2eaf0dcd689935cd7493ac36dcbacadce67625c. --- src/acl-control.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/acl-control.js b/src/acl-control.js index abe618e23..aeff186c3 100644 --- a/src/acl-control.js +++ b/src/acl-control.js @@ -597,6 +597,7 @@ UI.aclControl.ACLControlBox5 = function (subject, dom, noun, kb, callback) { statusBlock.textContent = ' The sharing for this ' + noun + ' is now the default.' bottomRightCell.removeChild(useDefault) box.style.cssText = 'color: #777;' + bottomLeftCell.innerHTML = '' renderBox() }) .catch(function (e) {