Skip to content

Commit 6b51cab

Browse files
committed
updated jquery to 2.24
1 parent e276dde commit 6b51cab

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

busters_js.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"public/js/singlejshash":"ee0a8b050d8ae8af353f8ed787c3d7ed"}
1+
{"public/js/singlejshash":"4b7cb8ddd2a1007802cf7c3b5b736c7c"}

public/js/ui_events.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -256,17 +256,19 @@ $(document).on('ready', function () {
256256

257257
$('#auditHandle').click(function () {
258258
if ($('#auditContentWrap').is(':visible')) {
259-
$('#auditContentWrap').fadeOut(300);
260-
$('#auditHandle').children().removeClass('fa-angle-down').addClass('fa-angle-up');
261-
259+
$('#auditContentWrap').slideUp(500);
262260
$('.auditingMarble').removeClass('auditingMarble'); //reset
263-
$('.txHistoryWrap').html('<div class="auditHint">Click a Marble to Audit Its Transactions</div>');//clear
261+
for(var x in pendingTxDrawing) clearTimeout(pendingTxDrawing[x]);
262+
setTimeout(function(){
263+
$('.txHistoryWrap').html('<div class="auditHint">Click a Marble to Audit Its Transactions</div>');//clear
264+
}, 750);
264265
$('#marbleId').html('-');
265266
fixCss();
266267
auditingMarble = null;
267268
}
268269
else {
269-
$('#auditContentWrap').fadeIn(300);
270+
//$('#auditContentWrap').fadeIn(300);
271+
$('#auditContentWrap').slideDown();
270272
$('#auditHandle').children().removeClass('fa-angle-up').addClass('fa-angle-down');
271273
}
272274
});

public/js/util/jquery-2.2.4.min.js

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

views/template/layout.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ html
2020
link(rel="icon" href="/imgs/favicon-96.png" sizes="96x96")
2121
link(rel="stylesheet" href="/css/font-awesome-4.5.0/css/font-awesome.min.css")
2222
link(type="text/css" rel="stylesheet" href="/css/main.min.css?v=#{bag.csshash}")
23-
script(src='/js/util/jquery-1.11.1.min.js')
23+
script(src='/js/util/jquery-2.2.4.min.js')
2424
script(src='/js/util/jquery-ui-1.11.4/jquery-ui.min.js')
2525
script(src='/js/util/jquery.ui.touch-punch.min.js')
2626
script(src='/js/funk.js?v=#{bag.jshash}')

0 commit comments

Comments
 (0)