Skip to content

Commit f873a58

Browse files
committed
Merge tag '0.21.2' into develop
2 parents a8b135f + d23cda6 commit f873a58

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

CHANGELOG

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
ChangeLog
33
*********
44

5+
0.21.2 (2017-09-13)
6+
===================
7+
- Fix: Update jQuery onload invocation to be compatible with jQuery 3. (thanks, @sloria!)
8+
59
0.21.1 (2017-07-20)
610
===================
711
- Fix: Quiet some overly-verbose error logging.

mfr/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
__version__ = '0.21.1'
1+
__version__ = '0.21.2'
22
__import__('pkg_resources').declare_namespace(__name__)

mfr/server/static/js/mfr.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
self.pymParent.iframe.setAttribute('scrolling', 'yes');
8383

8484
self.pymParent.el.appendChild(self.spinner);
85-
$(self.pymParent.iframe).load(function () {
85+
$(self.pymParent.iframe).on('load', function () {
8686
self.pymParent.el.removeChild(self.spinner);
8787
});
8888

0 commit comments

Comments
 (0)