Also use onDidLoadInitialPackages hook

atom · Nov 5, 2017 · 0658741 · 0658741
1 parent 284c6c7
commit 0658741
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/lib/timecop-view.js b/lib/timecop-view.js
@@ -12,10 +12,17 @@ export default class TimecopView {
   constructor ({uri}) {
     this.uri = uri
     etch.initialize(this)
+    this.refs.cacheLoadingPanel.populate()
+    if (atom.packages.hasLoadedInitialPackages()) {
+      this.populateLoadingViews()
+    } else {
+      atom.packages.onDidLoadInitialPackages(() => this.populateLoadingViews())
+    }
+
     if (atom.packages.hasActivatedInitialPackages()) {
-      this.populateViews()
+      this.populateActivationViews()
     } else {
-      atom.packages.onDidActivateInitialPackages(() => this.populateViews())
+      atom.packages.onDidActivateInitialPackages(() => this.populateActivationViews())
     }
   }
 
@@ -44,12 +51,14 @@ export default class TimecopView {
     )
   }
 
-  populateViews () {
-    this.refs.windowLoadingPanel.populate()
-    this.refs.cacheLoadingPanel.populate()
+  populateLoadingViews () {
     this.showLoadedPackages()
-    this.showActivePackages()
     this.showLoadedThemes()
+  }
+
+  populateActivationViews () {
+    this.refs.windowLoadingPanel.populate()
+    this.showActivePackages()
     this.showActiveThemes()
   }
 

diff --git a/spec/timecop-spec.js b/spec/timecop-spec.js
@@ -48,6 +48,7 @@ describe('Timecop', () => {
 
       spyOn(atom.packages, 'getLoadedPackages').andReturn(packages)
       spyOn(atom.packages, 'getActivePackages').andReturn(packages)
+      spyOn(atom.packages, 'hasLoadedInitialPackages').andReturn(true)
       spyOn(atom.packages, 'hasActivatedInitialPackages').andReturn(true)
 
       timecopView = await atom.workspace.open('atom://timecop')