Skip to content

Commit

Permalink
Merge pull request #133 from PolymerElements/polish
Browse files Browse the repository at this point in the history 
Misc polish and bug fixes.
  • Loading branch information
@aomarks
aomarks authored Jun 13, 2017
2 parents ad6a17d + 27ec3c4 commit aa66c05
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 33 deletions.
4 changes: 2 additions & 2 deletions bower.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"dependencies": {
"app-layout": "PolymerElements/app-layout#1 - 2",
"iron-ajax": "PolymerElements/iron-ajax#1 - 2",
"iron-doc-viewer": "PolymerElements/iron-doc-viewer#master",
"iron-doc-viewer": "PolymerElements/iron-doc-viewer#>=3.0.0-rc.1",
"iron-icons": "PolymerElements/iron-icons#1 - 2",
"paper-icon-button": "PolymerElements/paper-icon-button#1 - 2",
"paper-styles": "PolymerElements/paper-styles#1 - 2",
Expand All @@ -35,7 +35,7 @@
"dependencies": {
"app-layout": "PolymerElements/app-layout#^1.0.0",
"iron-ajax": "PolymerElements/iron-ajax#^1.0.0",
"iron-doc-viewer": "PolymerElements/iron-doc-viewer#master",
"iron-doc-viewer": "PolymerElements/iron-doc-viewer#>=3.0.0-rc.1",
"iron-icons": "PolymerElements/iron-icons#^1.0.0",
"paper-icon-button": "PolymerElements/paper-icon-button#^1.0.0",
"paper-styles": "PolymerElements/paper-styles#^1.0.0",
Expand Down
88 changes: 57 additions & 31 deletions iron-component-page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<link rel="import" href="../app-layout/app-header-layout/app-header-layout.html">
<link rel="import" href="../app-layout/app-toolbar/app-toolbar.html">
<link rel="import" href="../iron-ajax/iron-ajax.html">
<link rel="import" href="../iron-doc-viewer/default-theme.html">
<link rel="import" href="../iron-doc-viewer/iron-doc-nav.html">
<link rel="import" href="../iron-doc-viewer/iron-doc-viewer-default-theme.html">
<link rel="import" href="../iron-doc-viewer/iron-doc-viewer.html">
<link rel="import" href="../iron-icons/iron-icons.html">
<link rel="import" href="../paper-icon-button/paper-icon-button.html">
Expand All @@ -25,9 +25,13 @@

<dom-module id="iron-component-page">
<template>
<style include="iron-doc-viewer-default-theme">
<style include="iron-doc-default-theme">
[hidden] {
display: none;
}

iron-doc-viewer {
margin: 16px 0 0 24px;
margin: 20px 0 0 20px;
max-width: 56em;
}

Expand All @@ -37,6 +41,10 @@
background-color: #5a5a5a;
}

[condensed-title] {
white-space: nowrap;
}

app-drawer {
--app-drawer-content-container: {
background-color: #f9f9f9;
Expand All @@ -49,6 +57,17 @@
overflow-x: hidden;
}

/**
* iron-doc-viewer uses scrollIntoView for fragment links, but this
* doesn't take into account our app-header, so by default when our
* scroll block is the document, we'll scroll things hidden underneath
* the app-header.
*/
#scroller {
overflow-y: auto;
height: calc(100vh - 64px);
}

iron-doc-viewer {
--iron-doc-title: {
display: none;
Expand Down Expand Up @@ -77,7 +96,7 @@
Could not load descriptor "[[descriptorUrl]]". <br> [[_error.error]]
</paper-toast>

<app-drawer-layout id="layout" fullbleed>
<app-drawer-layout fullbleed narrow="{{_narrow}}">

<app-drawer id="drawer" slot="drawer" swipe-open>
<iron-doc-nav
Expand All @@ -90,16 +109,24 @@
<app-header-layout>
<app-header slot="header" fixed>
<app-toolbar>
<paper-icon-button icon="menu" drawer-toggle></paper-icon-button>
<paper-icon-button
icon="menu"
drawer-toggle
hidden$="[[!_narrow]]">
</paper-icon-button>

<div condensed-title>[[_title]]</div>
</app-toolbar>
</app-header>

<iron-doc-viewer
descriptor="[[_descriptor]]"
title="{{_title}}"
path="{{_path}}">
</iron-doc-viewer>
<div id="scroller">
<iron-doc-viewer
descriptor="[[_descriptor]]"
base-href="[[baseHref]]"
title="{{_title}}"
path="{{_path}}">
</iron-doc-viewer>
</div>

</app-header-layout>
</app-drawer-layout>
Expand All @@ -111,11 +138,24 @@
is: 'iron-component-page',

properties: {
/**
* URL of the Polymer Analyzer descriptor to fetch and display.
*/
descriptorUrl: {
type: String,
value: 'analysis.json',
observer: '_descriptorUrlChanged'
},

/**
* By default all routing is performed using the URL fragment
* (e.g. `docs.html#/elements/my-element`). If your server supports
* it and you would like to use the real URL path instead (e.g.
* `/docs/elements/my-element`), set this to the base path where the
* page is mounted (e.g. `/` or `/docs/`).
*/
baseHref: String,

_loading: Boolean,

_error: Object,
Expand All @@ -127,15 +167,20 @@

_path: String,

_narrow: Boolean,

_title: {
type: String,
observer: '_titleChanged'
}
},

_onNavSelect() {
document.body.scrollTop = 0;
if (this.$.layout.narrow) {
// Note we need to listen for this event, and can't rely just on the
// path changing, because the user might click on the nav item they
// are already viewing.
window.document.body.scrollTop = 0;
if (this._narrow) {
this.$.drawer.close();
}
},
Expand All @@ -152,25 +197,6 @@
this._changing = true;
this._descriptor = _flatten(descriptor);
this._changing = false;

return;

var behaviors = descriptor.metadata
&& descriptor.metadata.polymer
&& descriptor.metadata.polymer.behaviors;

if ((descriptor.namespaces || []).length) {
this._path = '/namespaces/' + descriptor.namespaces[0].name;
} else if ((descriptor.elements || []).length) {
var element = descriptor.elements;
this._path = '/elements/' + (element.tagname || element.name);
} else if ((behaviors || []).length) {
this._path = '/behaviors/' + behaviors[0].name;
} else if ((descriptor.mixins || []).length) {
this._path = '/mixins/' + descriptor.mixins[0].name;
} else if ((descriptor.classes || []).length) {
this._path = '/classes/' + descriptor.classes[0].name;
}
},

_titleChanged(title) {
Expand Down

0 comments on commit aa66c05

Please sign in to comment.