Merge branch 'master' of https://github.com/paranoidguy/databunker

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 = '<a href=\'javascript:displayRequest(\"' + rtoken +
         '\");\'>view</a>&nbsp;|&nbsp;';
       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 @@
           '</a>' +
           '</div>' +
           '</div></div></div>');
-
       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 () {

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) {

ui/site/user-audit.html

@@ -127,14 +127,13 @@
           '</a>' +
           '</div>' +
           '</div></div></div>');
-
       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 () {

ui/site/user-requests.html

@@ -140,14 +140,13 @@
           '</a>' +
           '</div>' +
           '</div></div></div>');
-
       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 () {