Cleaned up leftover code from old view content resizing method. Fixed bug where Table view could be left blank until options changed.

kshetline · kshetline · commit a1eb925e7ade · 2018-08-09T04:24:54.000-04:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svc-ng",
-  "version": "1.4.11",
+  "version": "1.4.12",
   "license": "MIT AND GPL-3.0-or-later",
   "author": "Kerry Shetline <kerry@shetline.com>",
   "scripts": {
diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -2,7 +2,7 @@
   <div class="about-dialog">
     <img src="/assets/resources/svc_lunar_eclipse.png" alt="lunar eclipse" width="64" height="64">
     <h2>Sky View Café NP</h2>
-    Version 1.4.11<br><br>
+    Version 1.4.12<br><br>
     Copyright © 2016-2018 Kerry Shetline.
   </div>
 </p-dialog>
diff --git a/src/app/svc/generic-view.ts b/src/app/svc/generic-view.ts
@@ -63,7 +63,6 @@ export abstract class GenericView implements AfterViewInit {
 
   protected wrapper: HTMLDivElement;
   protected canvas: HTMLCanvasElement;
-  protected marquee: HTMLDivElement;
   protected lastWidth = -1;
   protected lastHeight = -1;
   protected width = -1;
diff --git a/src/app/svc/svc-ecliptic-view/svc-ecliptic-view.component.html b/src/app/svc/svc-ecliptic-view/svc-ecliptic-view.component.html
@@ -8,4 +8,4 @@
     ></canvas>
   </div>
 </div>
-<ks-marquee #marquee class="marquee" [text]="marqueeText"></ks-marquee>
+<ks-marquee class="marquee" [text]="marqueeText"></ks-marquee>
diff --git a/src/app/svc/svc-ecliptic-view/svc-ecliptic-view.component.ts b/src/app/svc/svc-ecliptic-view/svc-ecliptic-view.component.ts
@@ -83,7 +83,6 @@ export class SvcEclipticViewComponent extends GenericSkyView implements AfterVie
 
   @ViewChild('canvasWrapper') private wrapperRef: ElementRef;
   @ViewChild('skyCanvas') private canvasRef: ElementRef;
-  @ViewChild('marquee', {read: ElementRef}) private marqueeRef: ElementRef;
 
   constructor(appService: AppService) {
     super(appService, CurrentTab.ECLIPTIC);
@@ -142,7 +141,6 @@ export class SvcEclipticViewComponent extends GenericSkyView implements AfterVie
   ngAfterViewInit(): void {
     this.wrapper = this.wrapperRef.nativeElement;
     this.canvas = this.canvasRef.nativeElement;
-    this.marquee = this.marqueeRef.nativeElement;
 
     setTimeout(() => this.appService.requestViewSettings(VIEW_ECLIPTIC));
 
diff --git a/src/app/svc/svc-insolation-view/svc-insolation-view.component.html b/src/app/svc/svc-insolation-view/svc-insolation-view.component.html
@@ -6,6 +6,6 @@
     ></canvas>
   </div>
 </div>
-<div #marquee class="marquee">&nbsp;
+<div class="marquee">&nbsp;
   <span class="marquee-sampler" [ngStyle]="{'background-color': skyColor}">&nbsp;</span><span class="marquee-sampler" [ngStyle]="{'background-color': moonColor}">&nbsp;</span>
-  &nbsp;{{marqueeText}}&nbsp;</div>
+  &nbsp;{{marqueeText}}&nbsp;</div>
diff --git a/src/app/svc/svc-insolation-view/svc-insolation-view.component.ts b/src/app/svc/svc-insolation-view/svc-insolation-view.component.ts
@@ -80,7 +80,6 @@ export class SvcInsolationViewComponent extends GenericView implements AfterView
 
   @ViewChild('canvasWrapper') private wrapperRef: ElementRef;
   @ViewChild('insolationCanvas') private canvasRef: ElementRef;
-  @ViewChild('marquee') private marqueeRef: ElementRef;
 
   skyColor = 'black';
   moonColor = 'black';
@@ -125,7 +124,6 @@ export class SvcInsolationViewComponent extends GenericView implements AfterView
   ngAfterViewInit(): void {
     this.wrapper = this.wrapperRef.nativeElement;
     this.canvas = this.canvasRef.nativeElement;
-    this.marquee = this.marqueeRef.nativeElement;
 
     setTimeout(() => this.appService.requestViewSettings(VIEW_INSOLATION));
 
diff --git a/src/app/svc/svc-map-view/svc-map-view.component.html b/src/app/svc/svc-map-view/svc-map-view.component.html
@@ -9,4 +9,4 @@
     ></canvas>
   </div>
 </div>
-<ks-marquee #marquee class="marquee" [text]="'\u00A0' + marqueeText"></ks-marquee>
+<ks-marquee class="marquee" [text]="'\u00A0' + marqueeText"></ks-marquee>
diff --git a/src/app/svc/svc-map-view/svc-map-view.component.ts b/src/app/svc/svc-map-view/svc-map-view.component.ts
@@ -97,7 +97,6 @@ export class SvcMapViewComponent extends GenericView implements AfterViewInit {
 
   @ViewChild('canvasWrapper') private wrapperRef: ElementRef;
   @ViewChild('mapCanvas') private canvasRef: ElementRef;
-  @ViewChild('marquee', {read: ElementRef}) private marqueeRef: ElementRef;
 
   public showLocationDialog = false;
   public latitude: number;
@@ -154,7 +153,6 @@ export class SvcMapViewComponent extends GenericView implements AfterViewInit {
   ngAfterViewInit(): void {
     this.wrapper = this.wrapperRef.nativeElement;
     this.canvas = this.canvasRef.nativeElement;
-    this.marquee = this.marqueeRef.nativeElement;
 
     setTimeout(() => this.appService.requestViewSettings(VIEW_MAP));
 
diff --git a/src/app/svc/svc-moons-view/svc-moons-view.component.html b/src/app/svc/svc-moons-view/svc-moons-view.component.html
@@ -9,4 +9,4 @@
     ></canvas>
   </div>
 </div>
-<ks-marquee #marquee class="marquee" [text]="'\u00A0' + marqueeText"></ks-marquee>
+<ks-marquee class="marquee" [text]="'\u00A0' + marqueeText"></ks-marquee>
diff --git a/src/app/svc/svc-moons-view/svc-moons-view.component.ts b/src/app/svc/svc-moons-view/svc-moons-view.component.ts
@@ -98,7 +98,6 @@ export class SvcMoonsViewComponent extends GenericPlanetaryView implements After
 
   @ViewChild('canvasWrapper') private wrapperRef: ElementRef;
   @ViewChild('orbitCanvas') private canvasRef: ElementRef;
-  @ViewChild('marquee', {read: ElementRef}) private marqueeRef: ElementRef;
 
   constructor(appService: AppService, private astroDataService: AstroDataService, private httpClient: HttpClient) {
     super(appService, CurrentTab.MOONS_GRS);
@@ -134,7 +133,6 @@ export class SvcMoonsViewComponent extends GenericPlanetaryView implements After
   ngAfterViewInit(): void {
     this.wrapper = this.wrapperRef.nativeElement;
     this.canvas = this.canvasRef.nativeElement;
-    this.marquee = this.marqueeRef.nativeElement;
 
     JupiterDrawer.getJupiterDrawer(this.astroDataService, this.httpClient).then((drawer: JupiterDrawer) => {
       this.jupiterDrawer = drawer;
diff --git a/src/app/svc/svc-orbit-view/svc-orbit-view.component.html b/src/app/svc/svc-orbit-view/svc-orbit-view.component.html
@@ -24,4 +24,4 @@
     ></canvas>
   </div>
 </div>
-<ks-marquee #marquee class="marquee" [text]="'\u00A0' + marqueeText"></ks-marquee>
+<ks-marquee class="marquee" [text]="'\u00A0' + marqueeText"></ks-marquee>
diff --git a/src/app/svc/svc-orbit-view/svc-orbit-view.component.ts b/src/app/svc/svc-orbit-view/svc-orbit-view.component.ts
@@ -148,7 +148,6 @@ export class SvcOrbitViewComponent extends GenericPlanetaryView implements After
 
   @ViewChild('canvasWrapper') private wrapperRef: ElementRef;
   @ViewChild('orbitCanvas') private canvasRef: ElementRef;
-  @ViewChild('marquee', {read: ElementRef}) private marqueeRef: ElementRef;
 
   constructor(appService: AppService) {
     super(appService, CurrentTab.ORBITS);
@@ -210,7 +209,6 @@ export class SvcOrbitViewComponent extends GenericPlanetaryView implements After
   ngAfterViewInit(): void {
     this.wrapper = this.wrapperRef.nativeElement;
     this.canvas = this.canvasRef.nativeElement;
-    this.marquee = this.marqueeRef.nativeElement;
 
     setTimeout(() => this.appService.requestViewSettings(VIEW_ORBITS));
 
diff --git a/src/app/svc/svc-sky-view/svc-sky-view.component.html b/src/app/svc/svc-sky-view/svc-sky-view.component.html
@@ -24,4 +24,4 @@
     ></canvas>
   </div>
 </div>
-<ks-marquee #marquee class="marquee" [text]="'\u00A0' + marqueeText"></ks-marquee>
+<ks-marquee class="marquee" [text]="'\u00A0' + marqueeText"></ks-marquee>
diff --git a/src/app/svc/svc-sky-view/svc-sky-view.component.ts b/src/app/svc/svc-sky-view/svc-sky-view.component.ts
@@ -139,7 +139,6 @@ export class SvcSkyViewComponent extends GenericSkyView implements AfterViewInit
 
   @ViewChild('canvasWrapper') private wrapperRef: ElementRef;
   @ViewChild('skyCanvas') private canvasRef: ElementRef;
-  @ViewChild('marquee', {read: ElementRef}) private marqueeRef: ElementRef;
 
   private readonly gridFont  = 'italic bold 14px Arial, Helvetica, sans-serif';
 
@@ -280,7 +279,6 @@ export class SvcSkyViewComponent extends GenericSkyView implements AfterViewInit
   ngAfterViewInit(): void {
     this.wrapper = this.wrapperRef.nativeElement;
     this.canvas = this.canvasRef.nativeElement;
-    this.marquee = this.marqueeRef.nativeElement;
 
     setTimeout(() => this.appService.requestViewSettings(VIEW_SKY));
 
diff --git a/src/app/svc/svc-table-view/svc-table-view.component.ts b/src/app/svc/svc-table-view/svc-table-view.component.ts
@@ -103,6 +103,7 @@ export class SvcTableViewComponent implements AfterViewInit {
     appService.getCurrentTabUpdates((currentTab: CurrentTab) => {
       if (currentTab === CurrentTab.TABLES) {
         setTimeout(() => {
+          this.throttledResize();
           this.updateView();
           (<any> this.tableTypesDropdown).updateDimensions();
           (<any> this.planetsDropdown).updateDimensions();
diff --git a/src/assets/about.html b/src/assets/about.html
@@ -60,6 +60,8 @@
   <h2 class="header-sans"><a name="history">What's New / Version History</a></h2>
   <div  style="padding-left: 1em; text-indent: -1em">
 
+  <p><b>1.4.12, 2018-08-09:</b> Fixed bug where Table view could be left blank until options changed.</p>
+
   <p><b>1.4.11, 2018-08-08:</b> Improved adaptation to different screen and window sizes.</p>
 
   <p><b>1.4.10, 2018-08-06:</b> Added touch zoom to Orbits and Moons/GRS views. Improved mobile keyboard input.</p>
diff --git a/src/index.html b/src/index.html
@@ -46,7 +46,7 @@
 
         if (height / ratio < minHeight) {
           width = Math.round(minHeight * ratio);
-          // The extra +2 ensures that a tiny amount of scrolling is possibly, needed in some cases the clear
+          // The extra +2 ensures that a tiny amount of scrolling is possible, needed in some cases to scroll away
           // browser tabs and/or the address bar from a mobile screen.
           height = minHeight + 2;
         }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "svc-ng",`
`3`		`- "version": "1.4.11",`
	`3`	`+ "version": "1.4.12",`
`4`	`4`	`"license": "MIT AND GPL-3.0-or-later",`
`5`	`5`	`"author": "Kerry Shetline <kerry@shetline.com>",`
`6`	`6`	`"scripts": {`