Skip to content

Commit

Permalink
Try to fall back to django.jQuery
Browse files Browse the repository at this point in the history
So that we will function in django admin, when JQUERY_URL is set to None
(because the rest of the site provides a jQuery).
  • Loading branch information
stefanor authored and Neil Muller committed Mar 3, 2020
1 parent ed90067 commit 55a932b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion markitup/static/markitup/ajax_csrf.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
}
}
});
})(jQuery);
})(jQuery || django.jQuery);
2 changes: 1 addition & 1 deletion markitup/static/markitup/jquery.markitup.js
Original file line number Diff line number Diff line change
Expand Up @@ -662,4 +662,4 @@
$('textarea').trigger('insertion', [options]);
}
};
})(jQuery);
})(jQuery || django.jQuery);

0 comments on commit 55a932b

Please sign in to comment.