From 87f36cabcf03b8fcc4299ee256b61a6d36261a19 Mon Sep 17 00:00:00 2001 From: Yuli Date: Thu, 14 May 2020 00:13:10 +0300 Subject: [PATCH 1/2] cleanup popup contents --- ui/site/admin-view-requests.html | 11 +++++------ ui/site/user-audit.html | 7 +++---- ui/site/user-requests.html | 7 +++---- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/ui/site/admin-view-requests.html b/ui/site/admin-view-requests.html index 82b30e4..4bc47fc 100644 --- a/ui/site/admin-view-requests.html +++ b/ui/site/admin-view-requests.html @@ -56,7 +56,7 @@ return result; } function displayDrillDownLink(rtoken, row, index) { - console.log(row); + //console.log(row); var links = 'view | '; if (row["action"] == "forget-me") { @@ -117,7 +117,7 @@ if (xhr0.status === 200) { var data = JSON.parse(xhr0.responseText); if (data.status == "ok") { - console.log("aaaa", data) + //console.log("aaaa", data) var d = JSON.stringify(data, null, 4); setTimeout(function () { if (data["original"] && data["change"]) { @@ -164,14 +164,13 @@ '' + '' + ''); - modalPopup.find('#okButton').click(function (event) { - //callback(); - //cancelConsent(brief); modalPopup.modal('hide'); }); - modalPopup.modal('show'); + modalPopup.on('hidden.bs.modal', function() { + $('#drilldown').html(null); + }); } $(function () { diff --git a/ui/site/user-audit.html b/ui/site/user-audit.html index 53623f5..8ff4fb7 100644 --- a/ui/site/user-audit.html +++ b/ui/site/user-audit.html @@ -127,14 +127,13 @@ '' + '' + ''); - confirmModal.find('#okButton').click(function (event) { - //callback(); - //cancelConsent(brief); confirmModal.modal('hide'); }); - confirmModal.modal('show'); + confirmModal.on('hidden.bs.modal', function() { + $('#drilldown').html(null); + }); } $(function () { diff --git a/ui/site/user-requests.html b/ui/site/user-requests.html index d28b0d8..fd57666 100644 --- a/ui/site/user-requests.html +++ b/ui/site/user-requests.html @@ -140,14 +140,13 @@ '' + '' + ''); - modalPopup.find('#okButton').click(function (event) { - //callback(); - //cancelConsent(brief); modalPopup.modal('hide'); }); - modalPopup.modal('show'); + modalPopup.on('hidden.bs.modal', function() { + $('#drilldown').html(null); + }); } $(function () { From 525dd7ff9a4b1f9a1268367500b1cdaae9082edc Mon Sep 17 00:00:00 2001 From: Yuli Date: Thu, 14 May 2020 00:13:36 +0300 Subject: [PATCH 2/2] remove console.log --- ui/site/jdiff/jdd.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/ui/site/jdiff/jdd.js b/ui/site/jdiff/jdd.js index 8bcbe5e..3b93ad6 100644 --- a/ui/site/jdiff/jdd.js +++ b/ui/site/jdiff/jdd.js @@ -855,38 +855,26 @@ var jdd = { */ return; } -console.log("left", left) $('div.diffcontainer').show(); - jdd.diffs = []; - var config = jdd.createConfig(); jdd.formatAndDecorate(config, left); $('#out').text(config.out); - var config2 = jdd.createConfig(); jdd.formatAndDecorate(config2, right); $('#out2').text(config2.out); - jdd.formatPRETags(); - config.currentPath = []; config2.currentPath = []; - jdd.diffVal(left, config, right, config2); jdd.processDiffs(); jdd.generateReport(); - - //console.log('diffs: ' + JSON.stringify(jdd.diffs)); - if (jdd.diffs.length > 0) { jdd.highlightDiff(0); jdd.currentDiff = 0; jdd.updateButtonStyles(); } - $('body').removeClass('progress'); - }, getParameterByName: function (name) {