harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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'; $path = 'library/bootstrap/js/bootstrap.min.js';
break; break;
case 'foundation': 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>'; $init = "\r\n" . '<script>$(document).ready(function() { $(document).foundation(); });</script>';
break; 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; $def->info_global_attr['data-drilldown'] = new HTMLPurifier_AttrDef_Text;
//accordion menu //accordion menu
$def->info_global_attr['data-accordion-menu'] = new HTMLPurifier_AttrDef_Text; $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 //magellan
$def->info_global_attr['data-magellan'] = new HTMLPurifier_AttrDef_Text; $def->info_global_attr['data-magellan'] = new HTMLPurifier_AttrDef_Text;
$def->info_global_attr['data-magellan-target'] = 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'] = new HTMLPurifier_AttrDef_Text;
$def->info_global_attr['data-sticky-container'] = new HTMLPurifier_AttrDef_Text; $def->info_global_attr['data-sticky-container'] = new HTMLPurifier_AttrDef_Text;
// f6 common // f6 common
$def->info_global_attr['data-options'] = new HTMLPurifier_AttrDef_Text; $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-toggle'] = new HTMLPurifier_AttrDef_Text;
$def->info_global_attr['data-close'] = 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-open'] = new HTMLPurifier_AttrDef_Text;
$def->info_global_attr['data-position'] = new HTMLPurifier_AttrDef_Text;
//data- attributes used by the bootstrap library //data- attributes used by the bootstrap library

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

@ -1585,7 +1585,7 @@
* @function * @function
* @private * @private
*/ */
$(window).load(function () { $(window).on('load', function () {
checkListeners(); checkListeners();
}); });
@ -4766,7 +4766,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
// Replacing images // Replacing images
if (this.$element[0].nodeName === 'IMG') { if (this.$element[0].nodeName === 'IMG') {
this.$element.attr('src', path).load(function () { this.$element.attr('src', path).on('load', function () {
_this.currentPath = path; _this.currentPath = path;
}).trigger(trigger); }).trigger(trigger);
} }