diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-09-08 09:52:22 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-09-08 09:52:22 +0200 |
| commit | 98d5ae91f5a716d415fa3dd639e9819ae7003202 (patch) | |
| tree | 04d4e69423f9c2b1b949e5d59345b8723fb4cf55 | |
| parent | b6115d3c56c4fd07d83525835b2a5288275e0413 (diff) | |
| download | volse-hubzilla-98d5ae91f5a716d415fa3dd639e9819ae7003202.tar.gz volse-hubzilla-98d5ae91f5a716d415fa3dd639e9819ae7003202.tar.bz2 volse-hubzilla-98d5ae91f5a716d415fa3dd639e9819ae7003202.zip | |
patch foundation-6.2.3 to work with jquery-3.1
| -rw-r--r-- | Zotlabs/Render/Comanche.php | 4 | ||||
| -rw-r--r-- | library/foundation/js/foundation.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Zotlabs/Render/Comanche.php b/Zotlabs/Render/Comanche.php index 91f0ce33a..fdb72c9fb 100644 --- a/Zotlabs/Render/Comanche.php +++ b/Zotlabs/Render/Comanche.php @@ -286,7 +286,7 @@ class Comanche { $path = 'library/bootstrap/js/bootstrap.min.js'; break; case 'foundation': - $path = 'library/foundation/js/foundation.min.js'; + $path = 'library/foundation/js/foundation.js'; $init = "\r\n" . '<script>$(document).ready(function() { $(document).foundation(); });</script>'; break; } @@ -458,4 +458,4 @@ class Comanche { return; } -}
\ No newline at end of file +} 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); } |