From 657d62d13eedf89bbc762656b73ae6f6d538c406 Mon Sep 17 00:00:00 2001 From: opus1269 Date: Mon, 8 Apr 2019 10:30:15 -0500 Subject: [PATCH] cleanup --- app/elements/app-main/app-main.ts | 6 ++---- .../screensaver-element/screensaver-element.ts | 3 +-- app/scripts/screensaver/views/ss_view_frame.ts | 15 +++++---------- app/scripts/screensaver/views/ss_view_full.ts | 8 ++------ 4 files changed, 10 insertions(+), 22 deletions(-) diff --git a/app/elements/app-main/app-main.ts b/app/elements/app-main/app-main.ts index 83ff27ba..1ef4007a 100644 --- a/app/elements/app-main/app-main.ts +++ b/app/elements/app-main/app-main.ts @@ -139,7 +139,7 @@ const PUSHY_URI = /** * Array of pages - * @type {module:els/app_main.Page[]} + * @type {Page[]} */ const pages: Page[] = [ { @@ -189,8 +189,6 @@ const pages: Page[] = [ /** * Google Photos Page - * @type {module:els/pgs/google_photos.GooglePhotosPage} - * @private */ let gPhotosPage: any; @@ -726,7 +724,7 @@ Polymer({ if (request.message === ChromeMsg.HIGHLIGHT.message) { // highlight ourselves and let the sender know we are here const chromep = new ChromePromise(); - chromep.tabs.getCurrent().then((tab: chrome.tabs.Tab): any => { + chromep.tabs.getCurrent().then((tab: chrome.tabs.Tab): chrome.tabs.Tab => { chrome.tabs.update(tab.id, {highlighted: true}); return null; }).catch((err: Error) => { diff --git a/app/elements/screensaver-element/screensaver-element.ts b/app/elements/screensaver-element/screensaver-element.ts index 384b1e3b..d46e911c 100644 --- a/app/elements/screensaver-element/screensaver-element.ts +++ b/app/elements/screensaver-element/screensaver-element.ts @@ -442,8 +442,7 @@ const Screensaver = Polymer({ /** * Event: Error state changed for a photo view - * @param {Event} ev - the event object - * @param {Object} ev.model - template model + * @param ev - the event object */ _onErrorChanged: async function(ev: any) { const isError: boolean = ev.detail.value; diff --git a/app/scripts/screensaver/views/ss_view_frame.ts b/app/scripts/screensaver/views/ss_view_frame.ts index 176370d5..a6137bfa 100644 --- a/app/scripts/screensaver/views/ss_view_frame.ts +++ b/app/scripts/screensaver/views/ss_view_frame.ts @@ -17,10 +17,8 @@ import SSPhoto from '../ss_photo.js'; /** * Frame view - * @extends module:ss/views/view.SSView - * @alias module:ss/views/view_frame.SSViewFrame */ -class SSViewFrame extends SSView { +export default class SSViewFrame extends SSView { /** * Set style info for a label @@ -31,13 +29,13 @@ class SSViewFrame extends SSView { * @static * @private */ - private static _setLabelStyle(style: any, width: number, height: number, isLeft: boolean) { + private static _setLabelStyle(style: CSSStyleDeclaration, width: number, height: number, isLeft: boolean) { style.textOverflow = 'ellipsis'; style.whiteSpace = 'nowrap'; style.color = 'black'; - style.opacity = 1.0; + style.opacity = '1.0'; style.fontSize = '2.5vh'; - style.fontWeight = 400; + style.fontWeight = '400'; // percent of screen width for label padding const padPer = 0.5; @@ -66,7 +64,7 @@ class SSViewFrame extends SSView { /** * Create new SSViewFrame - * @param {module:ss/photo.SSPhoto} photo + * @param photo - the photo to render * @constructor */ constructor(photo: SSPhoto) { @@ -85,7 +83,6 @@ class SSViewFrame extends SSView { const timeStyle = this.time.style; const image = this.image; const imageStyle = image.style; - // @ts-ignore const img: any = image.$.img; const imgStyle = img.style; const photo = this.photo; @@ -153,5 +150,3 @@ class SSViewFrame extends SSView { } } -export default SSViewFrame; - diff --git a/app/scripts/screensaver/views/ss_view_full.ts b/app/scripts/screensaver/views/ss_view_full.ts index 1e1d3e7e..d04b8298 100644 --- a/app/scripts/screensaver/views/ss_view_full.ts +++ b/app/scripts/screensaver/views/ss_view_full.ts @@ -17,14 +17,13 @@ import SSPhoto from '../ss_photo.js'; /** * Full view - * @extends module:ss/views/view.SSView * @alias module:ss/views/view_full.SSViewFull */ -class SSViewFull extends SSView { +export default class SSViewFull extends SSView { /** * Create new SSViewFull - * @param {module:ss/photo.SSPhoto} photo - An {@link module:ss/photo.SSPhoto} + * @param photo - An {@link SSPhoto} * @constructor */ constructor(photo: SSPhoto) { @@ -37,7 +36,6 @@ class SSViewFull extends SSView { public render() { super.render(); - // @ts-ignore const img: any = this.image.$.img; img.style.width = '100%'; img.style.height = '100%'; @@ -45,5 +43,3 @@ class SSViewFull extends SSView { } } -export default SSViewFull; -