Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 04:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

Browse source
This commit is contained in:
redmatrix 2016-09-08 13:26:19 -07:00
commit d63cfb41f1
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Zotlabs/Render/Comanche.php
View file

@ -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;
}

5
include/text.php
View file

@ -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

4
library/foundation/js/foundation.js vendored
View file

@ -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);
}