Skip to content

Commit

Permalink
Bump deps
Browse files Browse the repository at this point in the history
  • Loading branch information
cmdcolin committed Jul 22, 2024
1 parent 9891ff8 commit c4258fb
Show file tree
Hide file tree
Showing 6 changed files with 1,360 additions and 1,106 deletions.
2 changes: 0 additions & 2 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

node scripts/pre-commit.js
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"dependency-graph": "^1.0.0",
"dotenv": "^16.3.1",
"dotenv-expand": "^11.0.3",
"electron": "31.0.1",
"electron": "31.2.1",
"electron-builder": "^24.9.0",
"electron-mock-ipc": "^0.3.8",
"eslint": "^8.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -513,39 +513,24 @@ export default function stateTreeFactory(pluginManager: PluginManager) {
localStorageGetJSON<string[]>(recentlyUsedK(assemblyNames), []),
)
if (view) {
const val = localStorageGetItem(
const lc = localStorageGetItem(
collapsedK(assemblyNames, view.type),
)
if (!val) {
if (!lc) {
self.expandAllCategories()
const session = getSession(self)
if (
getConf(session, [
'hierarchical',
'defaultCollapsed',
'topLevelCategories',
])
) {
const r = ['hierarchical', 'defaultCollapsed']
if (getConf(session, [...r, 'topLevelCategories'])) {
self.collapseTopLevelCategories()
}
if (
getConf(session, [
'hierarchical',
'defaultCollapsed',
'subCategories',
])
) {
if (getConf(session, [...r, 'subCategories'])) {
self.collapseSubCategories()
}
for (const entry of getConf(session, [
'hierarchical',
'defaultCollapsed',
'categoryNames',
])) {
self.setCategoryCollapsed(`Tracks-${entry}`, true)
for (const elt of getConf(session, [...r, 'categoryNames'])) {
self.setCategoryCollapsed(`Tracks-${elt}`, true)
}
} else {
self.setCollapsedCategories(JSON.parse(val))
self.setCollapsedCategories(JSON.parse(lc))
}
}
}),
Expand All @@ -554,11 +539,19 @@ export default function stateTreeFactory(pluginManager: PluginManager) {
addDisposer(
self,
autorun(() => {
const { assemblyNames, collapsed, view } = self
localStorageSetJSON(recentlyUsedK(assemblyNames), self.recentlyUsed)
localStorageSetJSON(favoritesK(), self.favorites)
localStorageSetJSON(sortTrackNamesK(), self.sortTrackNames)
localStorageSetJSON(sortCategoriesK(), self.sortCategories)
const {
sortTrackNames,
sortCategories,
favorites,
recentlyUsed,
assemblyNames,
collapsed,
view,
} = self
localStorageSetJSON(recentlyUsedK(assemblyNames), recentlyUsed)
localStorageSetJSON(favoritesK(), favorites)
localStorageSetJSON(sortTrackNamesK(), sortTrackNames)
localStorageSetJSON(sortCategoriesK(), sortCategories)
if (view) {
localStorageSetJSON(
collapsedK(assemblyNames, view.type),
Expand Down
4 changes: 2 additions & 2 deletions products/jbrowse-desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@
"use-query-params": "^2.0.0"
},
"devDependencies": {
"electron": "31.0.1"
"electron": "31.2.1"
},
"browserslist": [
"last 1 chrome version"
],
"build": {
"electronVersion": "30.0.9",
"electronVersion": "31.2.1",
"extraMetadata": {
"main": "build/electron.js"
},
Expand Down
Loading

0 comments on commit c4258fb

Please sign in to comment.