Merge remote-tracking branch 'upstream/pull/5823'

diff --git a/app/assets/javascripts/edit/id.js.erb b/app/assets/javascripts/edit/id.js.erb
index cabd15b56e776227b030f76a600b8643beb38855..b32f6cb011819c7ced3c5bc70d8f7921dd7f5de3 100644 (file)
--- a/app/assets/javascripts/edit/id.js.erb
+++ b/app/assets/javascripts/edit/id.js.erb
@@ -37,7 +37,7 @@ $(function () {
 
   id.attr("src", idData.url + "#" + params);
 
-  id.on("load", function () {
+  id.ready(function () {
     if (!this.contentWindow.location.href.startsWith(idData.url)) {
       location.reload();
     }