diff options
| author | redmatrix <mike@macgirvin.com> | 2016-09-08 13:26:19 -0700 |
|---|---|---|
| committer | redmatrix <mike@macgirvin.com> | 2016-09-08 13:26:19 -0700 |
| commit | d63cfb41f1a90d1f32cde4bd84cd19d8b1f64049 (patch) | |
| tree | da3e57bcc8d87fe2dac4c25f8debf232b5b9d64b /library/foundation/js/foundation.js | |
| parent | 9cfd0dd9d875f3951c10a6a260715c2bc835fbc6 (diff) | |
| parent | 1e8fec93855755aa2a9103b6dab4d0751875b0d5 (diff) | |
| download | volse-hubzilla-d63cfb41f1a90d1f32cde4bd84cd19d8b1f64049.tar.gz volse-hubzilla-d63cfb41f1a90d1f32cde4bd84cd19d8b1f64049.tar.bz2 volse-hubzilla-d63cfb41f1a90d1f32cde4bd84cd19d8b1f64049.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'library/foundation/js/foundation.js')
| -rw-r--r-- | library/foundation/js/foundation.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/foundation/js/foundation.js b/library/foundation/js/foundation.js index 63b04ace2..8570bdd16 100644 --- a/library/foundation/js/foundation.js +++ b/library/foundation/js/foundation.js @@ -1585,7 +1585,7 @@ * @function * @private */ - $(window).load(function () { + $(window).on('load', function () { checkListeners(); }); @@ -4766,7 +4766,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons // Replacing images if (this.$element[0].nodeName === 'IMG') { - this.$element.attr('src', path).load(function () { + this.$element.attr('src', path).on('load', function () { _this.currentPath = path; }).trigger(trigger); } |