Firefox now works... barely

This commit is contained in:
Stefan Zermatten
2017-02-10 14:01:06 +02:00
parent eb4336b3e9
commit 576c1f953b
7 changed files with 119 additions and 122 deletions

View File

@@ -1,53 +1,7 @@
<template name="layout">
<app-drawer-layout class="layout" responsive-width="905px" fullbleed>
<app-drawer>
<app-header-layout class="white" has-scrolling-region>
<app-header id="accountSummary" effects="waterfall parallax-background" condenses fixed>
<app-toolbar>
{{#if currentUser}}
<a href="/account" style="text-decoration: underline; cursor: pointer; font-size: 16px;">
{{profileLink}}
</a>
{{else}}
<a href="/sign-in" style="text-decoration: underline; cursor: pointer; font-size: 16px;">
Sign in
</a>
{{/if}}
</app-toolbar>
</app-header>
<div id="navPanel">
<a href="/" tabindex="-1">
<paper-icon-item id="homeNav">
<iron-icon icon="home" item-icon></iron-icon>
Home
</paper-icon-item>
</a>
<a href="/characterList" tabindex="-1">
<paper-icon-item id="characters">
<iron-icon icon="social:people" item-icon></iron-icon>
Characters
</paper-icon-item>
</a>
<a href="/guide" tabindex="-1">
<paper-icon-item id="guide">
<iron-icon icon="social:school" item-icon></iron-icon>
Guide
</paper-icon-item>
</a>
<paper-icon-item id="feedback">
<iron-icon icon="bug-report" item-icon></iron-icon>
Send Feedback
</paper-icon-item>
<a href="changeLog" tabindex="-1">
<paper-icon-item id="changeLog">
<iron-icon icon="list" item-icon></iron-icon>
Change Log
</paper-icon-item>
</a>
<hr style="margin: 16px 0 24px 0;">
{{> characterSideList}}
</div>
</app-header-layout>
{{> appDrawer}}
</app-drawer>
{{> yield}}
</app-drawer-layout>
@@ -56,3 +10,53 @@
</paper-toast>
{{> dialogStack}}
</template>
<template name="appDrawer">
<app-header-layout class="white" has-scrolling-region>
<app-header id="accountSummary" effects="waterfall parallax-background" condenses fixed>
<app-toolbar>
{{#if currentUser}}
<a href="/account" style="text-decoration: underline; cursor: pointer; font-size: 16px;">
{{profileLink}}
</a>
{{else}}
<a href="/sign-in" style="text-decoration: underline; cursor: pointer; font-size: 16px;">
Sign in
</a>
{{/if}}
</app-toolbar>
</app-header>
<div id="navPanel">
<a href="/" tabindex="-1">
<paper-icon-item id="homeNav">
<iron-icon icon="home" item-icon></iron-icon>
Home
</paper-icon-item>
</a>
<a href="/characterList" tabindex="-1">
<paper-icon-item id="characters">
<iron-icon icon="social:people" item-icon></iron-icon>
Characters
</paper-icon-item>
</a>
<a href="/guide" tabindex="-1">
<paper-icon-item id="guide">
<iron-icon icon="social:school" item-icon></iron-icon>
Guide
</paper-icon-item>
</a>
<paper-icon-item class="feedback">
<iron-icon icon="bug-report" item-icon></iron-icon>
Send Feedback
</paper-icon-item>
<a href="changeLog" tabindex="-1">
<paper-icon-item id="changeLog">
<iron-icon icon="list" item-icon></iron-icon>
Change Log
</paper-icon-item>
</a>
<hr style="margin: 16px 0 24px 0;">
{{> characterSideList}}
</div>
</app-header-layout>
</template>

View File

@@ -2,18 +2,7 @@ Template.layout.onCreated(function() {
this.subscribe("user");
});
Template.layout.rendered = function() {
$(window).on("popstate", GlobalUI.popStateHandler);
};
Template.layout.destroyed = function() {
$(window).off("popstate", GlobalUI.popStateHandler);
};
Template.layout.helpers({
notSelected: function(){
return Session.get("global.ui.detailShow") ? "not-selected" : null;
},
Template.appDrawer.helpers({
profileLink: function() {
var user = Meteor.user();
return user.profile && user.profile.username || user.username || "My Account";
@@ -22,17 +11,18 @@ Template.layout.helpers({
let drawerLayout;
const closeDrawer = function(instance){
if (!drawerLayout) drawerLayout = instance.find("app-drawer-layout");
if (!drawerLayout) drawerLayout = $("app-drawer-layout")[0];
if (drawerLayout && drawerLayout.narrow){
drawerLayout.drawer.close();
}
}
Template.layout.events({
Template.appDrawer.events({
"click app-drawer a": function(event, instance){
closeDrawer(instance);
},
"click #feedback": function(event, instance) {
"click .feedback": function(event, instance) {
console.log("feedback clicked");
pushDialogStack({
template: "feedback",
element: event.currentTarget,