From 557fac226dd537202291d7c86f87e5edc47beea0 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Thu, 23 Mar 2017 15:48:51 +0100 Subject: [PATCH] Read devMode from PackageManager in Package --- src/package-manager.coffee | 4 ++-- src/package.coffee | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/package-manager.coffee b/src/package-manager.coffee index e12f1026d..cbebde633 100644 --- a/src/package-manager.coffee +++ b/src/package-manager.coffee @@ -390,7 +390,7 @@ class PackageManager options = { path: pack.rootDirPath, name: packageName, preloadedPackage: true, bundledPackage: true, metadata, packageManager: this, @config, - @styleManager, @commandRegistry, @keymapManager, @devMode, + @styleManager, @commandRegistry, @keymapManager, @notificationManager, @grammarRegistry, @themeManager, @menuManager, @contextMenuManager, @deserializerManager, @viewRegistry } @@ -454,7 +454,7 @@ class PackageManager options = { path: availablePackage.path, name: availablePackage.name, metadata, bundledPackage: availablePackage.isBundled, packageManager: this, - @config, @styleManager, @commandRegistry, @keymapManager, @devMode, + @config, @styleManager, @commandRegistry, @keymapManager, @notificationManager, @grammarRegistry, @themeManager, @menuManager, @contextMenuManager, @deserializerManager, @viewRegistry } diff --git a/src/package.coffee b/src/package.coffee index 6ffed041d..f37e8040d 100644 --- a/src/package.coffee +++ b/src/package.coffee @@ -34,7 +34,7 @@ class Package constructor: (params) -> { @path, @metadata, @bundledPackage, @preloadedPackage, @packageManager, @config, @styleManager, @commandRegistry, - @keymapManager, @devMode, @notificationManager, @grammarRegistry, @themeManager, + @keymapManager, @notificationManager, @grammarRegistry, @themeManager, @menuManager, @contextMenuManager, @deserializerManager, @viewRegistry } = params @@ -719,7 +719,7 @@ class Package isCompatible: -> return @compatible if @compatible? - if @bundledPackage and not @devMode + if @bundledPackage and not @packageManager.devMode # Bundled packages are always considered compatible @compatible = true else if @getMainModulePath() @@ -780,7 +780,7 @@ class Package # This information is cached in local storage on a per package/version basis # to minimize the impact on startup time. getIncompatibleNativeModules: -> - unless @devMode + unless @packageManager.devMode try if arrayAsString = global.localStorage.getItem(@getIncompatibleNativeModulesStorageKey()) return JSON.parse(arrayAsString)