Commit dbadae2c authored by Paul Slaughter's avatar Paul Slaughter

Merge branch '219370-remove-jquery-waitforimages-dependency' into 'master'

Resolve "Remove jquery.waitforimages dependency"

See merge request gitlab-org/gitlab!68850
parents 50a6c22d 9f8c606c
/* eslint-disable func-names, consistent-return, one-var, no-return-assign */ /* eslint-disable func-names, consistent-return, one-var, no-return-assign */
import $ from 'jquery'; import $ from 'jquery';
import 'jquery.waitforimages';
// Width where images must fits in, for 2-up this gets divided by 2 // Width where images must fits in, for 2-up this gets divided by 2
const availWidth = 900; const availWidth = 900;
...@@ -16,11 +15,7 @@ export default class ImageFile { ...@@ -16,11 +15,7 @@ export default class ImageFile {
// Load two-up view after images are loaded // Load two-up view after images are loaded
// so that we can display the correct width and height information // so that we can display the correct width and height information
const $images = $('.two-up.view img', this.file);
$images.waitForImages(() => {
this.initView('two-up'); this.initView('two-up');
});
}), }),
); );
} }
......
...@@ -140,7 +140,6 @@ ...@@ -140,7 +140,6 @@
"jed": "^1.1.1", "jed": "^1.1.1",
"jquery": "^3.6.0", "jquery": "^3.6.0",
"jquery.caret": "^0.3.1", "jquery.caret": "^0.3.1",
"jquery.waitforimages": "^2.2.0",
"js-cookie": "^2.2.1", "js-cookie": "^2.2.1",
"js-yaml": "^3.13.1", "js-yaml": "^3.13.1",
"jszip": "^3.1.3", "jszip": "^3.1.3",
......
...@@ -7640,11 +7640,6 @@ jquery.caret@^0.3.1: ...@@ -7640,11 +7640,6 @@ jquery.caret@^0.3.1:
resolved "https://registry.yarnpkg.com/jquery.caret/-/jquery.caret-0.3.1.tgz#9c093318faf327eff322e826ca9f3241368bc7b8" resolved "https://registry.yarnpkg.com/jquery.caret/-/jquery.caret-0.3.1.tgz#9c093318faf327eff322e826ca9f3241368bc7b8"
integrity sha1-nAkzGPrzJ+/zIugmyp8yQTaLx7g= integrity sha1-nAkzGPrzJ+/zIugmyp8yQTaLx7g=
jquery.waitforimages@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/jquery.waitforimages/-/jquery.waitforimages-2.2.0.tgz#63f23131055a1b060dc913e6d874bcc9b9e6b16b"
integrity sha1-Y/IxMQVaGwYNyRPm2HS8ybnmsWs=
"jquery@>= 1.9.1", jquery@^3.6.0: "jquery@>= 1.9.1", jquery@^3.6.0:
version "3.6.0" version "3.6.0"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment