diff --git a/package.json b/package.json index a35f008e5..29d0de889 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "cached-run-in-this-context": "0.4.1", "chai": "3.5.0", "clear-cut": "^2.0.1", - "coffee-script": "1.11.0", + "coffee-script": "1.11.1", "color": "^0.7.3", "dedent": "^0.6.0", "devtron": "1.3.0", @@ -78,7 +78,7 @@ "solarized-dark-syntax": "1.0.5", "solarized-light-syntax": "1.0.5", "about": "1.7.0", - "archive-view": "0.61.1", + "archive-view": "0.62.0", "autocomplete-atom-api": "0.10.0", "autocomplete-css": "0.13.1", "autocomplete-html": "0.7.2", @@ -89,7 +89,7 @@ "background-tips": "0.26.1", "bookmarks": "0.42.0", "bracket-matcher": "0.82.2", - "command-palette": "0.38.0", + "command-palette": "0.39.0", "deprecation-cop": "0.54.1", "dev-live-reload": "0.47.0", "encoding-selector": "0.22.0", @@ -99,7 +99,7 @@ "git-diff": "1.1.0", "go-to-line": "0.31.0", "grammar-selector": "0.48.2", - "image-view": "0.59.0", + "image-view": "0.60.0", "incompatible-packages": "0.26.1", "keybinding-resolver": "0.35.0", "line-ending-selector": "0.5.0", @@ -115,7 +115,7 @@ "status-bar": "1.4.1", "styleguide": "0.47.2", "symbols-view": "0.113.1", - "tabs": "0.102.0", + "tabs": "0.102.1", "timecop": "0.33.2", "tree-view": "0.210.0", "update-package-dependencies": "0.10.0", diff --git a/resources/app-icons/beta/png/1024.png b/resources/app-icons/beta/png/1024.png index b3d712d4a..3a25d4605 100644 Binary files a/resources/app-icons/beta/png/1024.png and b/resources/app-icons/beta/png/1024.png differ diff --git a/resources/app-icons/beta/png/128.png b/resources/app-icons/beta/png/128.png index e67a95a7a..8b5916694 100644 Binary files a/resources/app-icons/beta/png/128.png and b/resources/app-icons/beta/png/128.png differ diff --git a/resources/app-icons/beta/png/16.png b/resources/app-icons/beta/png/16.png index c7a0c0d72..c004e3afb 100644 Binary files a/resources/app-icons/beta/png/16.png and b/resources/app-icons/beta/png/16.png differ diff --git a/resources/app-icons/beta/png/24.png b/resources/app-icons/beta/png/24.png index dd8dcf22a..f58d0508d 100644 Binary files a/resources/app-icons/beta/png/24.png and b/resources/app-icons/beta/png/24.png differ diff --git a/resources/app-icons/beta/png/256.png b/resources/app-icons/beta/png/256.png index b48fbf1ae..293ffa281 100644 Binary files a/resources/app-icons/beta/png/256.png and b/resources/app-icons/beta/png/256.png differ diff --git a/resources/app-icons/beta/png/32.png b/resources/app-icons/beta/png/32.png index 238539f47..ffcbe6b50 100644 Binary files a/resources/app-icons/beta/png/32.png and b/resources/app-icons/beta/png/32.png differ diff --git a/resources/app-icons/beta/png/48.png b/resources/app-icons/beta/png/48.png index 17b155db6..8da49e368 100644 Binary files a/resources/app-icons/beta/png/48.png and b/resources/app-icons/beta/png/48.png differ diff --git a/resources/app-icons/beta/png/512.png b/resources/app-icons/beta/png/512.png index 1fa42ab4f..28bd1c00e 100644 Binary files a/resources/app-icons/beta/png/512.png and b/resources/app-icons/beta/png/512.png differ diff --git a/resources/app-icons/beta/png/64.png b/resources/app-icons/beta/png/64.png index 19d27487d..05d128905 100644 Binary files a/resources/app-icons/beta/png/64.png and b/resources/app-icons/beta/png/64.png differ diff --git a/resources/app-icons/dev/png/1024.png b/resources/app-icons/dev/png/1024.png index 36dcbf3a7..02d212c64 100644 Binary files a/resources/app-icons/dev/png/1024.png and b/resources/app-icons/dev/png/1024.png differ diff --git a/resources/app-icons/dev/png/128.png b/resources/app-icons/dev/png/128.png index c0b33e630..c1d0441af 100644 Binary files a/resources/app-icons/dev/png/128.png and b/resources/app-icons/dev/png/128.png differ diff --git a/resources/app-icons/dev/png/16.png b/resources/app-icons/dev/png/16.png index 8466559c2..fdb9d1c41 100644 Binary files a/resources/app-icons/dev/png/16.png and b/resources/app-icons/dev/png/16.png differ diff --git a/resources/app-icons/dev/png/24.png b/resources/app-icons/dev/png/24.png index 55e6f2da7..cb7bff8fe 100644 Binary files a/resources/app-icons/dev/png/24.png and b/resources/app-icons/dev/png/24.png differ diff --git a/resources/app-icons/dev/png/256.png b/resources/app-icons/dev/png/256.png index 3faf4d2c5..0886d461a 100644 Binary files a/resources/app-icons/dev/png/256.png and b/resources/app-icons/dev/png/256.png differ diff --git a/resources/app-icons/dev/png/32.png b/resources/app-icons/dev/png/32.png index 5f3a0e68c..586f35aa4 100644 Binary files a/resources/app-icons/dev/png/32.png and b/resources/app-icons/dev/png/32.png differ diff --git a/resources/app-icons/dev/png/48.png b/resources/app-icons/dev/png/48.png index adbbcf751..06c3ce2f8 100644 Binary files a/resources/app-icons/dev/png/48.png and b/resources/app-icons/dev/png/48.png differ diff --git a/resources/app-icons/dev/png/512.png b/resources/app-icons/dev/png/512.png index c03c309fe..8109a009d 100644 Binary files a/resources/app-icons/dev/png/512.png and b/resources/app-icons/dev/png/512.png differ diff --git a/resources/app-icons/dev/png/64.png b/resources/app-icons/dev/png/64.png index 8aba24648..ff59c7be0 100644 Binary files a/resources/app-icons/dev/png/64.png and b/resources/app-icons/dev/png/64.png differ diff --git a/resources/app-icons/stable/png/1024.png b/resources/app-icons/stable/png/1024.png index a09f04805..64a689a04 100644 Binary files a/resources/app-icons/stable/png/1024.png and b/resources/app-icons/stable/png/1024.png differ diff --git a/resources/app-icons/stable/png/128.png b/resources/app-icons/stable/png/128.png index 78948fb24..ff9c64e6e 100644 Binary files a/resources/app-icons/stable/png/128.png and b/resources/app-icons/stable/png/128.png differ diff --git a/resources/app-icons/stable/png/16.png b/resources/app-icons/stable/png/16.png index 52df06fa2..5f8762668 100644 Binary files a/resources/app-icons/stable/png/16.png and b/resources/app-icons/stable/png/16.png differ diff --git a/resources/app-icons/stable/png/24.png b/resources/app-icons/stable/png/24.png index 0bf12cbb0..a1216ab9d 100644 Binary files a/resources/app-icons/stable/png/24.png and b/resources/app-icons/stable/png/24.png differ diff --git a/resources/app-icons/stable/png/256.png b/resources/app-icons/stable/png/256.png index a98caeb7b..ef5b45234 100644 Binary files a/resources/app-icons/stable/png/256.png and b/resources/app-icons/stable/png/256.png differ diff --git a/resources/app-icons/stable/png/32.png b/resources/app-icons/stable/png/32.png index a960acf00..f2dc3b46a 100644 Binary files a/resources/app-icons/stable/png/32.png and b/resources/app-icons/stable/png/32.png differ diff --git a/resources/app-icons/stable/png/48.png b/resources/app-icons/stable/png/48.png index 196717e27..6020091f7 100644 Binary files a/resources/app-icons/stable/png/48.png and b/resources/app-icons/stable/png/48.png differ diff --git a/resources/app-icons/stable/png/512.png b/resources/app-icons/stable/png/512.png index f1d35d951..cd24c9994 100644 Binary files a/resources/app-icons/stable/png/512.png and b/resources/app-icons/stable/png/512.png differ diff --git a/resources/app-icons/stable/png/64.png b/resources/app-icons/stable/png/64.png index b9fcf78ab..aa1c6752e 100644 Binary files a/resources/app-icons/stable/png/64.png and b/resources/app-icons/stable/png/64.png differ diff --git a/spec/package-manager-spec.coffee b/spec/package-manager-spec.coffee index 3015aa786..62e96f81c 100644 --- a/spec/package-manager-spec.coffee +++ b/spec/package-manager-spec.coffee @@ -31,6 +31,19 @@ describe "PackageManager", -> it "returns the value of the core.apmPath config setting", -> expect(atom.packages.getApmPath()).toBe "/path/to/apm" + describe "::loadPackages()", -> + beforeEach -> + spyOn(atom.packages, 'loadPackage') + + afterEach -> + atom.packages.deactivatePackages() + atom.packages.unloadPackages() + + it "sets hasLoadedInitialPackages", -> + expect(atom.packages.hasLoadedInitialPackages()).toBe false + atom.packages.loadPackages() + expect(atom.packages.hasLoadedInitialPackages()).toBe true + describe "::loadPackage(name)", -> beforeEach -> atom.config.set("core.disabledPackages", []) @@ -1022,6 +1035,12 @@ describe "PackageManager", -> jasmine.restoreDeprecationsSnapshot() + it "sets hasActivatedInitialPackages", -> + spyOn(atom.packages, 'activatePackages') + expect(atom.packages.hasActivatedInitialPackages()).toBe false + waitsForPromise -> atom.packages.activate() + runs -> expect(atom.packages.hasActivatedInitialPackages()).toBe true + it "activates all the packages, and none of the themes", -> packageActivator = spyOn(atom.packages, 'activatePackages') themeActivator = spyOn(atom.themes, 'activatePackages') diff --git a/spec/workspace-element-spec.coffee b/spec/workspace-element-spec.coffee index b5812b7b2..9ffa3621a 100644 --- a/spec/workspace-element-spec.coffee +++ b/spec/workspace-element-spec.coffee @@ -1,6 +1,7 @@ {ipcRenderer} = require 'electron' path = require 'path' temp = require('temp').track() +{Disposable} = require 'event-kit' describe "WorkspaceElement", -> describe "when the workspace element is focused", -> @@ -17,9 +18,11 @@ describe "WorkspaceElement", -> it "has a class based on the style of the scrollbar", -> observeCallback = null scrollbarStyle = require 'scrollbar-style' - spyOn(scrollbarStyle, 'observePreferredScrollbarStyle').andCallFake (cb) -> observeCallback = cb - workspaceElement = atom.views.getView(atom.workspace) + spyOn(scrollbarStyle, 'observePreferredScrollbarStyle').andCallFake (cb) -> + observeCallback = cb + new Disposable(->) + workspaceElement = atom.views.getView(atom.workspace) observeCallback('legacy') expect(workspaceElement.className).toMatch 'scrollbars-visible-always' diff --git a/src/package-manager.coffee b/src/package-manager.coffee index f6cf41655..84a36dd78 100644 --- a/src/package-manager.coffee +++ b/src/package-manager.coffee @@ -45,6 +45,8 @@ class PackageManager @packageDirPaths.push(path.join(configDirPath, "packages")) @packagesCache = require('../package.json')?._atomPackages ? {} + @initialPackagesLoaded = false + @initialPackagesActivated = false @loadedPackages = {} @activePackages = {} @activatingPackages = {} @@ -241,6 +243,9 @@ class PackageManager isPackageActive: (name) -> @getActivePackage(name)? + # Public: Returns a {Boolean} indicating whether package activation has occurred. + hasActivatedInitialPackages: -> @initialPackagesActivated + ### Section: Accessing loaded packages ### @@ -271,6 +276,9 @@ class PackageManager isPackageLoaded: (name) -> @getLoadedPackage(name)? + # Public: Returns a {Boolean} indicating whether package loading has occurred. + hasLoadedInitialPackages: -> @initialPackagesLoaded + ### Section: Accessing available packages ### @@ -364,6 +372,7 @@ class PackageManager @config.transact => @loadPackage(packagePath) for packagePath in packagePaths return + @initialPackagesLoaded = true @emitter.emit 'did-load-initial-packages' loadPackage: (nameOrPath) -> @@ -426,6 +435,7 @@ class PackageManager promises = promises.concat(activator.activatePackages(packages)) Promise.all(promises).then => @triggerDeferredActivationHooks() + @initialPackagesActivated = true @emitter.emit 'did-activate-initial-packages' # another type of package manager can handle other package types.