Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #5199 from jdlrobson/jquerybrowser
jQuery 3 follow ups: fix merge page and subjects error
  • Loading branch information
cdrini committed May 27, 2021
2 parents 79bf8a8 + 6164054 commit e8b56c1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
4 changes: 0 additions & 4 deletions openlibrary/plugins/openlibrary/js/jquery.customFade.js
Expand Up @@ -4,8 +4,6 @@ export default function addFadeInFunctionsTojQuery($) {
// books/edit/edition.html, publishers/view.html and subjects.html
$.fn.customFadeIn = function(speed, callback) {
$(this).fadeIn(speed, function() {
if (jQuery.browser.msie)
$(this).get(0).style.removeAttribute('filter');
if (callback != undefined)
callback();
});
Expand All @@ -14,8 +12,6 @@ export default function addFadeInFunctionsTojQuery($) {
// covers/change.html
$.fn.customFadeOut = function(speed, callback) {
$(this).fadeOut(speed, function() {
if (jQuery.browser.msie)
$(this).get(0).style.removeAttribute('filter');
if (callback != undefined)
callback();
});
Expand Down
3 changes: 2 additions & 1 deletion openlibrary/templates/type/author/view.html
Expand Up @@ -4,7 +4,8 @@
// <!--
window.q.push(function() {
if ("$query_param('merge', 'false')" == "true") {
\$("#preMerge").parent().andSelf().show();
\$("#preMerge").show();
\$("#preMerge").parent().show();

$ duplicates = ["/authors/" + k for k in query_param("duplicates", "").split(",")]
var data = {
Expand Down

0 comments on commit e8b56c1

Please sign in to comment.