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 | |
| 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
| -rw-r--r-- | Zotlabs/Render/Comanche.php | 4 | ||||
| -rw-r--r-- | include/text.php | 5 | ||||
| -rw-r--r-- | library/foundation/js/foundation.js | 4 |
3 files changed, 8 insertions, 5 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/include/text.php b/include/text.php index e828594b9..8b2e8b9e0 100644 --- a/include/text.php +++ b/include/text.php @@ -147,6 +147,9 @@ function purify_html($s, $allow_position = false) { $def->info_global_attr['data-drilldown'] = new HTMLPurifier_AttrDef_Text; //accordion menu $def->info_global_attr['data-accordion-menu'] = new HTMLPurifier_AttrDef_Text; + //responsive navigation + $def->info_global_attr['data-responsive-menu'] = new HTMLPurifier_AttrDef_Text; + $def->info_global_attr['data-responsive-toggle'] = new HTMLPurifier_AttrDef_Text; //magellan $def->info_global_attr['data-magellan'] = new HTMLPurifier_AttrDef_Text; $def->info_global_attr['data-magellan-target'] = new HTMLPurifier_AttrDef_Text; @@ -194,13 +197,13 @@ function purify_html($s, $allow_position = false) { $def->info_global_attr['data-sticky'] = new HTMLPurifier_AttrDef_Text; $def->info_global_attr['data-sticky-container'] = new HTMLPurifier_AttrDef_Text; - // f6 common $def->info_global_attr['data-options'] = new HTMLPurifier_AttrDef_Text; $def->info_global_attr['data-toggle'] = new HTMLPurifier_AttrDef_Text; $def->info_global_attr['data-close'] = new HTMLPurifier_AttrDef_Text; $def->info_global_attr['data-open'] = new HTMLPurifier_AttrDef_Text; + $def->info_global_attr['data-position'] = new HTMLPurifier_AttrDef_Text; //data- attributes used by the bootstrap library 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); } |