Skip to content

Commit

Permalink
Merge branch 'release/3.44.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
purocean committed Nov 22, 2022
2 parents 0b5c88a + ee73dbf commit 38c8d3d
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "yank.note",
"version": "3.44.0",
"version": "3.44.1",
"description": "Yank Note: A hackable markdown note application for programmers",
"main": "dist/main/app.js",
"license": "AGPL-3.0",
Expand Down
2 changes: 1 addition & 1 deletion src/main/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ const createWindow = () => {
win = new BrowserWindow({
maximizable: true,
show: false,
minWidth: 800,
minWidth: 880,
minHeight: 500,
frame: false,
backgroundColor: '#282a2b',
Expand Down
8 changes: 5 additions & 3 deletions src/renderer/components/SearchPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -234,17 +234,19 @@ async function search () {
}
const normalizeGlobPattern = (pattern: string) => {
return pattern.replace(/\\/g, '/')
return pattern.trim()
.replace(/\\/g, '/')
.replace(/^\.\//, '')
.replace(/\/+$/g, '')
.replace(/^\/|\/$/, '')
}
const obj: Record<string, boolean> = {}
str.split(',')
.map(s => s.trim())
.map(normalizeGlobPattern)
.filter(Boolean)
.forEach(s => {
const patterns = expandGlobalGlob(normalizeGlobPattern(s))
const patterns = expandGlobalGlob(s)
patterns.forEach(p => { obj[p] = true })
})
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/plugins/file-tree-context-menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export default {
{ id: 'refresh', label: t('tree.context-menu.refresh'), onClick: () => ctx.tree.refreshTree() },
...(node.type === 'dir' && !FLAG_DISABLE_XTERM ? [
{ id: 'open-in-terminal', label: t('tree.context-menu.open-in-terminal'), onClick: revealInXterminal },
{ id: 'find-in-folder', label: t('tree.context-menu.find-in-folder'), onClick: () => ctx.base.findInRepository({ include: node.path + '/**/*.md' }) },
{ id: 'find-in-folder', label: t('tree.context-menu.find-in-folder'), onClick: () => ctx.base.findInRepository({ include: node.path.replace(/^\//, '') + '/**/*.md' }) },
] : []),
...(isMarkdown ? [
{ id: 'create-in-cd', label: t('tree.context-menu.create-in-cd'), onClick: () => ctx.doc.createDoc({ repo: node.repo }, node) }
Expand Down

1 comment on commit 38c8d3d

@vercel
Copy link

@vercel vercel bot commented on 38c8d3d Nov 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

yn-api-doc – ./

yn-api-doc.vercel.app
yn-api-doc-git-master-purocean.vercel.app
yn-api-doc-purocean.vercel.app

Please sign in to comment.