diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-10-08 21:27:07 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-10-08 21:27:07 +0200 |
| commit | e1abc3105b309cfe4573b6422d12bce6137a939a (patch) | |
| tree | 0517f02bd33517cc4042ebbea1e025919ef5da0c | |
| parent | 8bdb2ce6ba6c2caef6a74b2308c81027de19b209 (diff) | |
| parent | 5e70c9b831d7f316132b98ee90b301a8b358b32e (diff) | |
| download | forums-e1abc3105b309cfe4573b6422d12bce6137a939a.tar forums-e1abc3105b309cfe4573b6422d12bce6137a939a.tar.gz forums-e1abc3105b309cfe4573b6422d12bce6137a939a.tar.bz2 forums-e1abc3105b309cfe4573b6422d12bce6137a939a.tar.xz forums-e1abc3105b309cfe4573b6422d12bce6137a939a.zip | |
Merge pull request #5251 from senky/ticket/15668
[ticket/15668] Replace .load() with .on('load')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/forum_fn.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 32be1cf6ed..02d7323dfb 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -1643,7 +1643,7 @@ phpbb.lazyLoadAvatars = function loadAvatars() { }); }; -$(window).load(phpbb.lazyLoadAvatars); +$(window).on('load', phpbb.lazyLoadAvatars); /** * Apply code editor to all textarea elements with data-bbcode attribute diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index 3f59709ac6..474570e84e 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -612,7 +612,7 @@ function parseDocument($container) { // If there are any images in the links list, run the check again after they have loaded $linksAll.find('img').each(function() { - $(this).load(function() { + $(this).on('load', function() { check(); }); }); |