Skip to content

Commit cf0b128

Browse files
committed
Merge branch 'obsidian_1.1'
2 parents 32f6b7c + f1bd258 commit cf0b128

22 files changed

+2045
-1696
lines changed

.github/workflows/release.yml

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -14,74 +14,74 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/checkout@v3
18-
- name: Use Node.js
19-
uses: actions/setup-node@v3
20-
with:
21-
node-version: '16.x' # You might need to adjust this value to your own version
22-
- name: Build
23-
id: build
24-
run: |
25-
yarn
26-
yarn run build --if-present
27-
mkdir ${{ env.PLUGIN_NAME }}
28-
cp main.js manifest.json styles.css ${{ env.PLUGIN_NAME }}
29-
zip -r ${{ env.PLUGIN_NAME }}.zip ${{ env.PLUGIN_NAME }}
30-
ls
31-
echo "tag_name=$(git tag --sort version:refname | tail -n 1)" >> $GITHUB_OUTPUT
17+
- uses: actions/checkout@v3
18+
- name: Use Node.js
19+
uses: actions/setup-node@v3
20+
with:
21+
node-version: '16.x' # You might need to adjust this value to your own version
22+
- name: Build
23+
id: build
24+
run: |
25+
yarn
26+
yarn run build --if-present
27+
mkdir ${{ env.PLUGIN_NAME }}
28+
cp main.js manifest.json styles.css ${{ env.PLUGIN_NAME }}
29+
zip -r ${{ env.PLUGIN_NAME }}.zip ${{ env.PLUGIN_NAME }}
30+
ls
31+
echo "tag_name=$(git tag --sort version:refname | tail -n 1)" >> $GITHUB_OUTPUT
3232
33-
- name: Create Release
34-
id: create_release
35-
uses: actions/create-release@v1
36-
env:
37-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
38-
VERSION: ${{ github.ref }}
39-
with:
40-
tag_name: ${{ github.ref }}
41-
release_name: ${{ github.ref }}
42-
draft: false
43-
prerelease: false
33+
- name: Create Release
34+
id: create_release
35+
uses: actions/create-release@v1
36+
env:
37+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
38+
VERSION: ${{ github.ref }}
39+
with:
40+
tag_name: ${{ github.ref }}
41+
release_name: ${{ github.ref }}
42+
draft: false
43+
prerelease: false
4444

45-
- name: Upload zip file
46-
id: upload-zip
47-
uses: actions/upload-release-asset@v1
48-
env:
49-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
50-
with:
51-
upload_url: ${{ steps.create_release.outputs.upload_url }}
52-
asset_path: ./${{ env.PLUGIN_NAME }}.zip
53-
asset_name: ${{ env.PLUGIN_NAME }}-${{ steps.build.outputs.tag_name }}.zip
54-
asset_content_type: application/zip
45+
- name: Upload zip file
46+
id: upload-zip
47+
uses: actions/upload-release-asset@v1
48+
env:
49+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
50+
with:
51+
upload_url: ${{ steps.create_release.outputs.upload_url }}
52+
asset_path: ./${{ env.PLUGIN_NAME }}.zip
53+
asset_name: ${{ env.PLUGIN_NAME }}-${{ steps.build.outputs.tag_name }}.zip
54+
asset_content_type: application/zip
5555

56-
- name: Upload main.js
57-
id: upload-main
58-
uses: actions/upload-release-asset@v1
59-
env:
60-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
61-
with:
62-
upload_url: ${{ steps.create_release.outputs.upload_url }}
63-
asset_path: ./main.js
64-
asset_name: main.js
65-
asset_content_type: text/javascript
56+
- name: Upload main.js
57+
id: upload-main
58+
uses: actions/upload-release-asset@v1
59+
env:
60+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
61+
with:
62+
upload_url: ${{ steps.create_release.outputs.upload_url }}
63+
asset_path: ./main.js
64+
asset_name: main.js
65+
asset_content_type: text/javascript
6666

67-
- name: Upload manifest.json
68-
id: upload-manifest
69-
uses: actions/upload-release-asset@v1
70-
env:
71-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
72-
with:
73-
upload_url: ${{ steps.create_release.outputs.upload_url }}
74-
asset_path: ./manifest.json
75-
asset_name: manifest.json
76-
asset_content_type: application/json
67+
- name: Upload manifest.json
68+
id: upload-manifest
69+
uses: actions/upload-release-asset@v1
70+
env:
71+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
72+
with:
73+
upload_url: ${{ steps.create_release.outputs.upload_url }}
74+
asset_path: ./manifest.json
75+
asset_name: manifest.json
76+
asset_content_type: application/json
7777

78-
- name: Upload styles.css
79-
id: upload-css
80-
uses: actions/upload-release-asset@v1
81-
env:
82-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
83-
with:
84-
upload_url: ${{ steps.create_release.outputs.upload_url }}
85-
asset_path: ./styles.css
86-
asset_name: styles.css
87-
asset_content_type: text/css
78+
- name: Upload styles.css
79+
id: upload-css
80+
uses: actions/upload-release-asset@v1
81+
env:
82+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
83+
with:
84+
upload_url: ${{ steps.create_release.outputs.upload_url }}
85+
asset_path: ./styles.css
86+
asset_name: styles.css
87+
asset_content_type: text/css

LICENSE.md

Lines changed: 57 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# GNU GENERAL PUBLIC LICENSE
1+
# GNU GENERAL PUBLIC LICENSE
2+
23
Version 3, 29 June 2007
34

45
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
@@ -212,25 +213,25 @@ produce it from the Program, in the form of source code under the
212213
terms of section 4, provided that you also meet all of these conditions:
213214

214215
a) The work must carry prominent notices stating that you modified
215-
it, and giving a relevant date.
216+
it, and giving a relevant date.
216217

217218
b) The work must carry prominent notices stating that it is
218-
released under this License and any conditions added under section 7.
219-
This requirement modifies the requirement in section 4 to
220-
"keep intact all notices".
219+
released under this License and any conditions added under section 7.
220+
This requirement modifies the requirement in section 4 to
221+
"keep intact all notices".
221222

222223
c) You must license the entire work, as a whole, under this
223-
License to anyone who comes into possession of a copy. This
224-
License will therefore apply, along with any applicable section 7
225-
additional terms, to the whole of the work, and all its parts,
226-
regardless of how they are packaged. This License gives no
227-
permission to license the work in any other way, but it does not
228-
invalidate such permission if you have separately received it.
224+
License to anyone who comes into possession of a copy. This
225+
License will therefore apply, along with any applicable section 7
226+
additional terms, to the whole of the work, and all its parts,
227+
regardless of how they are packaged. This License gives no
228+
permission to license the work in any other way, but it does not
229+
invalidate such permission if you have separately received it.
229230

230231
d) If the work has interactive user interfaces, each must display
231-
Appropriate Legal Notices; however, if the Program has interactive
232-
interfaces that do not display Appropriate Legal Notices, your
233-
work need not make them do so.
232+
Appropriate Legal Notices; however, if the Program has interactive
233+
interfaces that do not display Appropriate Legal Notices, your
234+
work need not make them do so.
234235

235236
A compilation of a covered work with other separate and independent
236237
works, which are not by their nature extensions of the covered work,
@@ -250,45 +251,45 @@ machine-readable Corresponding Source under the terms of this License,
250251
in one of these ways:
251252

252253
a) Convey the object code in, or embodied in, a physical product
253-
(including a physical distribution medium), accompanied by the
254-
Corresponding Source fixed on a durable physical medium
255-
customarily used for software interchange.
254+
(including a physical distribution medium), accompanied by the
255+
Corresponding Source fixed on a durable physical medium
256+
customarily used for software interchange.
256257

257258
b) Convey the object code in, or embodied in, a physical product
258-
(including a physical distribution medium), accompanied by a
259-
written offer, valid for at least three years and valid for as
260-
long as you offer spare parts or customer support for that product
261-
model, to give anyone who possesses the object code either (1) a
262-
copy of the Corresponding Source for all the software in the
263-
product that is covered by this License, on a durable physical
264-
medium customarily used for software interchange, for a price no
265-
more than your reasonable cost of physically performing this
266-
conveying of source, or (2) access to copy the
267-
Corresponding Source from a network server at no charge.
259+
(including a physical distribution medium), accompanied by a
260+
written offer, valid for at least three years and valid for as
261+
long as you offer spare parts or customer support for that product
262+
model, to give anyone who possesses the object code either (1) a
263+
copy of the Corresponding Source for all the software in the
264+
product that is covered by this License, on a durable physical
265+
medium customarily used for software interchange, for a price no
266+
more than your reasonable cost of physically performing this
267+
conveying of source, or (2) access to copy the
268+
Corresponding Source from a network server at no charge.
268269

269270
c) Convey individual copies of the object code with a copy of the
270-
written offer to provide the Corresponding Source. This
271-
alternative is allowed only occasionally and noncommercially, and
272-
only if you received the object code with such an offer, in accord
273-
with subsection 6b.
271+
written offer to provide the Corresponding Source. This
272+
alternative is allowed only occasionally and noncommercially, and
273+
only if you received the object code with such an offer, in accord
274+
with subsection 6b.
274275

275276
d) Convey the object code by offering access from a designated
276-
place (gratis or for a charge), and offer equivalent access to the
277-
Corresponding Source in the same way through the same place at no
278-
further charge. You need not require recipients to copy the
279-
Corresponding Source along with the object code. If the place to
280-
copy the object code is a network server, the Corresponding Source
281-
may be on a different server (operated by you or a third party)
282-
that supports equivalent copying facilities, provided you maintain
283-
clear directions next to the object code saying where to find the
284-
Corresponding Source. Regardless of what server hosts the
285-
Corresponding Source, you remain obligated to ensure that it is
286-
available for as long as needed to satisfy these requirements.
277+
place (gratis or for a charge), and offer equivalent access to the
278+
Corresponding Source in the same way through the same place at no
279+
further charge. You need not require recipients to copy the
280+
Corresponding Source along with the object code. If the place to
281+
copy the object code is a network server, the Corresponding Source
282+
may be on a different server (operated by you or a third party)
283+
that supports equivalent copying facilities, provided you maintain
284+
clear directions next to the object code saying where to find the
285+
Corresponding Source. Regardless of what server hosts the
286+
Corresponding Source, you remain obligated to ensure that it is
287+
available for as long as needed to satisfy these requirements.
287288

288289
e) Convey the object code using peer-to-peer transmission, provided
289-
you inform other peers where the object code and Corresponding
290-
Source of the work are being offered to the general public at no
291-
charge under subsection 6d.
290+
you inform other peers where the object code and Corresponding
291+
Source of the work are being offered to the general public at no
292+
charge under subsection 6d.
292293

293294
A separable portion of the object code, whose source code is excluded
294295
from the Corresponding Source as a System Library, need not be
@@ -363,27 +364,27 @@ add to a covered work, you may (if authorized by the copyright holders of
363364
that material) supplement the terms of this License with terms:
364365

365366
a) Disclaiming warranty or limiting liability differently from the
366-
terms of sections 15 and 16 of this License; or
367+
terms of sections 15 and 16 of this License; or
367368

368369
b) Requiring preservation of specified reasonable legal notices or
369-
author attributions in that material or in the Appropriate Legal
370-
Notices displayed by works containing it; or
370+
author attributions in that material or in the Appropriate Legal
371+
Notices displayed by works containing it; or
371372

372373
c) Prohibiting misrepresentation of the origin of that material, or
373-
requiring that modified versions of such material be marked in
374-
reasonable ways as different from the original version; or
374+
requiring that modified versions of such material be marked in
375+
reasonable ways as different from the original version; or
375376

376377
d) Limiting the use for publicity purposes of names of licensors or
377-
authors of the material; or
378+
authors of the material; or
378379

379380
e) Declining to grant rights under trademark law for use of some
380-
trade names, trademarks, or service marks; or
381+
trade names, trademarks, or service marks; or
381382

382383
f) Requiring indemnification of licensors and authors of that
383-
material by anyone who conveys the material (or modified versions of
384-
it) with contractual assumptions of liability to the recipient, for
385-
any liability that these contractual assumptions directly impose on
386-
those licensors and authors.
384+
material by anyone who conveys the material (or modified versions of
385+
it) with contractual assumptions of liability to the recipient, for
386+
any liability that these contractual assumptions directly impose on
387+
those licensors and authors.
387388

388389
All other non-permissive additional terms are considered "further
389390
restrictions" within the meaning of section 10. If the Program as you

exampleVault/Input Fields/Date and Time.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
date1: Friday, May 13th 2022
3-
date2: Thursday, May 19th 2022
2+
date1: Tuesday, September 13th 2022
3+
date2: Saturday, May 21st 2022
44
time: 14:12
55
---
66

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
image: Other/Images/img_butterfly.webp
2+
image: Other/Images/img_flower.webp
33
---
44

55
```meta-bind
6-
INPUT[imageSuggester(suggestOptionQuery("Other/Images"), showcase):image]
6+
INPUT[imageSuggester(optionQuery("Other/Images"), showcase):image]
77
```

exampleVault/Input Fields/Slider.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
slider1: 44
2+
slider1: 57
33
slider2: 11
44
---
55

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
---
22
fileSuggest: "[[Other/Example Notes/Example Note with Image.md|Example Note with Image]]"
3-
suggest: option 2
3+
suggest: option 3
44
---
55

66
### Simple Suggester
77
```meta-bind
88
INPUT[suggester(
9-
suggestOption(option 1),
10-
suggestOption(option 2),
11-
suggestOption(option 3),
9+
option(option 1),
10+
option(option 2),
11+
option(option 3),
1212
showcase
1313
):suggest]
1414
```
1515

1616
### Suggester with Dataview
1717
Note, that this will error, if dataview is not enabled.
1818
```meta-bind
19-
INPUT[suggester(suggestOptionQuery(#example-note), showcase):fileSuggest]
19+
INPUT[suggester(optionQuery(#example-note), showcase):fileSuggest]
2020
```

exampleVault/examples.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
---
2-
slider1: 9
2+
slider1: 5
33
nested:
44
object: dfgdf
55
suggest: test
66
toggle1: false
7+
Domestic_tasks:
8+
- Lunch 🍲
79
---
810

911
## In callouts
@@ -26,6 +28,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque sit amet p
2628

2729
```meta-bind
2830
INPUT[text_area(
31+
title(text area),
2932
class(meta-bind-full-width),
3033
class(meta-bind-high)
3134
):other note#title]

exampleVault/other note.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
tags: test
3-
title: "test test test "
3+
title: test
44
select: option b
55
date: Friday, June 10th 2022
66
time: 19:20

0 commit comments

Comments
 (0)