Skip to content

Commit e70f832

Browse files
authored
Merge pull request #11 from neatc0der/release/v1.1
Release/v1.1
2 parents 4e419ed + 552da5b commit e70f832

File tree

13 files changed

+33
-21
lines changed

13 files changed

+33
-21
lines changed

.build/mkdocs_markmap_build/release.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,19 @@ def create(self, commit: str = None, dry_run: bool = True):
7777
)
7878
print(f'Release "{self.tag}" published: {release.html_url}')
7979

80+
def verify(self):
81+
try:
82+
next(r for r in self.repository.get_releases() if r.tag_name == self.tag)
83+
except StopIteration:
84+
pass
85+
else:
86+
print(f'release already exists: {self.tag}')
87+
sys.exit(1)
88+
89+
if not self._changelog.path.exists():
90+
print(f'change log for release is missing: {self.tag}')
91+
sys.exit(1)
92+
8093
def delete(self):
8194
try:
8295
next(t for t in self.repository.get_tags() if t.name == self.tag)

.github/workflows/distribute.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Distribution Workflow
33
on:
44
release:
55
types:
6-
- released
6+
- published
77

88
jobs:
99
build:

.github/workflows/verify.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,6 @@ jobs:
2525
python3 setup.py install
2626
2727
- name: Verify Integrity
28+
env:
29+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2830
run: inv verify

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ Add this to `mkdocs.yml`:
2525

2626
```yaml
2727
markdown_extensions:
28-
- markmap:
28+
- markmap
2929
plugins:
30-
- markmap:
30+
- markmap
3131
```
3232
3333
## Advanced Settings

changelog/v1.0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# v1.0
22

33
* Logger for all files
4-
* Javascript templates
4+
* Static files for javascript and css
55
* Build workflow improvement
66
* Readme update

changelog/v1.1.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# v1.1
2+
3+
* Improved initialization
4+
* Build workflow improvement
5+
* Setup.py update

mkdocs_markmap/__meta__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PACKAGE_NAME = 'mkdocs_markmap'
22
PROJECT_NAME = PACKAGE_NAME.replace('_', '-')
3-
PROJECT_VERSION = '1.0'
3+
PROJECT_VERSION = '1.1'
44

55
OWNER = 'neatc0der'
66
REPOSITORY_NAME = f'{OWNER}/{PROJECT_NAME}'

mkdocs_markmap/plugin.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
log = logging.getLogger('mkdocs.markmap')
1818

1919

20-
TEMPLATES_PATH: Path = Path(__file__).parent / 'templates'
21-
STYLE_PATH: Path = TEMPLATES_PATH / 'mkdocs-markmap.css'
22-
SCRIPT_PATH: Path = TEMPLATES_PATH / 'mkdocs-markmap.js'
20+
STATICS_PATH: Path = Path(__file__).parent / 'static_files'
21+
STYLE_PATH: Path = STATICS_PATH / 'mkdocs-markmap.css'
22+
SCRIPT_PATH: Path = STATICS_PATH / 'mkdocs-markmap.js'
2323

2424
class MarkmapPlugin(BasePlugin):
2525
"""

mkdocs_markmap/templates/mkdocs-markmap.css renamed to mkdocs_markmap/static_files/mkdocs-markmap.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ div.mkdocs-markmap {
66
.mkdocs-markmap > svg {
77
width: 100%;
88
height: 100%;
9+
display: block;
910
}

mkdocs_markmap/templates/mkdocs-markmap.js renamed to mkdocs_markmap/static_files/mkdocs-markmap.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,10 @@
99
root = markmap_transformer.transform(content).root;
1010
m = markmap.Markmap.create(svg, null, root);
1111

12-
// todo: this is a dirty workaround to center the mindmap within svg
1312
(function(obj, e, r) {
1413
obj.rescale(1).then(function() {
1514
e.parentElement.style.height = (e.getBBox().height + 10) + "px";
16-
setTimeout(function() {
17-
while (e.firstChild) {
18-
e.removeChild(e.lastChild);
19-
}
20-
markmap.Markmap.create(e, null, r);
21-
}, 500);
15+
requestAnimationFrame(() => { obj.fit(); })
2216
});
2317
})(m, svg, root);
2418
}

0 commit comments

Comments
 (0)