Skip to content
Snippets Groups Projects
Commit c54372fa authored by Jared Hancock's avatar Jared Hancock Committed by Peter Rotich
Browse files

queues: Fix compatibility issues with newer jQuery

parent 13f2f4a3
No related branches found
No related tags found
No related merge requests found
......@@ -42,8 +42,8 @@ if(is_object($thisstaff) && $thisstaff->isStaff()) { ?>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery.pjax.js"></script>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>scp/js/bootstrap-typeahead.js"></script>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>scp/js/scp.js"></script>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery-ui-1.12.1.custom.min.js"></script>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>scp/js/scp.js"></script>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/filedrop.field.js"></script>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/select2.min.js"></script>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>scp/js/tips.js"></script>
......
......@@ -1248,3 +1248,27 @@ window.relativeAdjust = setInterval(function() {
});
}, 20000);
// Add 'afterShow' event to jQuery elements,
// thanks http://stackoverflow.com/a/1225238/1025836
jQuery(function($) {
var _oldShow = $.fn.show;
// This should work with jQuery 3 with or without jQuery UI
$.fn.show = function() {
var argsArray = Array.prototype.slice.call(arguments),
arg = argsArray[0],
options = {};
if (typeof(arg) === 'number')
options.duration = arg;
else
options.effect = arg;
return this.each(function () {
var obj = $(this);
_oldShow.call(obj, $.extend(options, {
complete: function() {
obj.trigger('afterShow');
}
}));
});
}
});
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment