[SSE mobile] debug 'Add' options on android

This commit is contained in:
Maxim Kadushkin 2017-01-12 19:27:09 +03:00
parent 8194d6fbf8
commit edf3c79076
2 changed files with 17 additions and 14 deletions

View file

@ -132,15 +132,17 @@ define([
if (root && this.layout) { if (root && this.layout) {
var $content = this.layout; var $content = this.layout;
// Android fix for navigation if ( !$content.find('.navbar').length ) {
if (Framework7.prototype.device.android) { // Android fix for navigation
var html = $content.html() + navbar; if (Framework7.prototype.device.android) {
} else { $content.find('.page').append(navbar);
html = navbar + $content.html(); } else {
$content.prepend(navbar);
}
} }
root.router.load({ root.router.load({
content: html content: $content.html()
}); });
initEvents.call(this); initEvents.call(this);

View file

@ -150,18 +150,19 @@ define([
if (rootView && this.layout) { if (rootView && this.layout) {
var $content = this.layout.find(templateId); var $content = this.layout.find(templateId);
var html, navbar = getNavigation.call(this, templateId); var navbar = getNavigation.call(this, templateId);
// Android fix for navigation if ( !$content.find('.navbar').length ) {
if (Framework7.prototype.device.android) { // Android fix for navigation
// $content.find('.page').append($content.find('.navbar')); if (Framework7.prototype.device.android) {
html = $content.html() + navbar; $content.find('.page').append(navbar);
} else { } else {
html = navbar + $content.html(); $content.prepend(navbar);
}
} }
rootView.router.load({ rootView.router.load({
content: html content: $content.html()
}); });
this.fireEvent('page:show', [this, templateId]); this.fireEvent('page:show', [this, templateId]);