updated jquery to 2.24

IBM-Blockchain-Archive · Mar 27, 2017 · 6b51cab · 6b51cab
1 parent e276dde
commit 6b51cab
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/busters_js.json b/busters_js.json
@@ -1 +1 @@
-{"public/js/singlejshash":"ee0a8b050d8ae8af353f8ed787c3d7ed"}
+{"public/js/singlejshash":"4b7cb8ddd2a1007802cf7c3b5b736c7c"}
diff --git a/public/js/ui_events.js b/public/js/ui_events.js
@@ -256,17 +256,19 @@ $(document).on('ready', function () {
 
 	$('#auditHandle').click(function () {
 		if ($('#auditContentWrap').is(':visible')) {
-			$('#auditContentWrap').fadeOut(300);
-			$('#auditHandle').children().removeClass('fa-angle-down').addClass('fa-angle-up');
-
+			$('#auditContentWrap').slideUp(500);
 			$('.auditingMarble').removeClass('auditingMarble');												//reset
-			$('.txHistoryWrap').html('<div class="auditHint">Click a Marble to Audit Its Transactions</div>');//clear
+			for(var x in pendingTxDrawing) clearTimeout(pendingTxDrawing[x]);
+			setTimeout(function(){
+				$('.txHistoryWrap').html('<div class="auditHint">Click a Marble to Audit Its Transactions</div>');//clear
+			}, 750);
 			$('#marbleId').html('-');
 			fixCss();
 			auditingMarble = null;
 		}
 		else {
-			$('#auditContentWrap').fadeIn(300);
+			//$('#auditContentWrap').fadeIn(300);
+			$('#auditContentWrap').slideDown();
 			$('#auditHandle').children().removeClass('fa-angle-up').addClass('fa-angle-down');
 		}
 	});

diff --git a/public/js/util/jquery-2.2.4.min.js b/public/js/util/jquery-2.2.4.min.js
diff --git a/views/template/layout.jade b/views/template/layout.jade
@@ -20,7 +20,7 @@ html
 		link(rel="icon" href="/imgs/favicon-96.png" sizes="96x96")
 		link(rel="stylesheet" href="/css/font-awesome-4.5.0/css/font-awesome.min.css")
 		link(type="text/css" rel="stylesheet" href="/css/main.min.css?v=#{bag.csshash}")
-		script(src='/js/util/jquery-1.11.1.min.js')
+		script(src='/js/util/jquery-2.2.4.min.js')
 		script(src='/js/util/jquery-ui-1.11.4/jquery-ui.min.js')
 		script(src='/js/util/jquery.ui.touch-punch.min.js')
 		script(src='/js/funk.js?v=#{bag.jshash}')
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"public/js/singlejshash":"ee0a8b050d8ae8af353f8ed787c3d7ed"}
		{"public/js/singlejshash":"4b7cb8ddd2a1007802cf7c3b5b736c7c"}