Skip to content

Commit

Permalink
Merge pull request #71 from ondras/master
Browse files Browse the repository at this point in the history
Merge with upstream (ts+svg)
  • Loading branch information
ondras authored Oct 30, 2021
2 parents a3ed8e9 + 1195732 commit 32c963f
Show file tree
Hide file tree
Showing 144 changed files with 11,411 additions and 12,344 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules
.js
88 changes: 24 additions & 64 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,70 +1,30 @@
SOURCES = src/mm.js \
src/promise.js \
src/promise-addons.js \
src/repo.js \
src/item.js \
src/map.js \
src/keyboard.js \
src/tip.js \
src/action.js \
src/clipboard.js \
src/menu.js \
src/command.js \
src/command.edit.js \
src/command.select.js \
src/layout.js \
src/layout.graph.js \
src/layout.tree.js \
src/layout.map.js \
src/shape.js \
src/shape.underline.js \
src/shape.box.js \
src/shape.ellipse.js \
src/format.js \
src/format.json.js \
src/format.freemind.js \
src/format.mma.js \
src/format.mup.js \
src/format.plaintext.js \
src/backend.js \
src/backend.local.js \
src/backend.webdav.js \
src/backend.image.js \
src/backend.file.js \
src/backend.firebase.js \
src/backend.gdrive.js \
src/ui.js \
src/ui.layout.js \
src/ui.shape.js \
src/ui.value.js \
src/ui.status.js \
src/ui.color.js \
src/ui.icon.js \
src/ui.help.js \
src/ui.notes.js \
src/ui.io.js \
src/ui.backend.js \
src/ui.backend.file.js \
src/ui.backend.webdav.js \
src/ui.backend.image.js \
src/ui.backend.local.js \
src/ui.backend.firebase.js \
src/ui.backend.gdrive.js \
src/mouse.js \
src/app.js
MAKEOPTS := "-r"
BIN := $(shell npm bin)
TSC := $(BIN)/tsc
LESSC := $(BIN)/lessc
ESBUILD := $(BIN)/esbuild

.PHONY: all push clean
JS := .js
FLAG := $(JS)/.tsflag
APP := my-mind.js
STYLE := my-mind.css map.css

all: my-mind.js
all: $(APP) $(STYLE)

my-mind.js: $(SOURCES)
@echo "/* My Mind web app: all source files combined. */" > $@
@cat $^ >> $@
%.css: css/*.less
$(LESSC) css/$*.less > $@

push:
@hg bookmark -f master
@hg push ; true
@hg push github ; true
$(APP): $(FLAG)
$(ESBUILD) --bundle $(JS)/$(APP) > $@

$(FLAG): $(shell find src -type f)
$(TSC) -p src
touch $@

watch: all
while inotifywait -e MODIFY -r src css ; do $(MAKE) $^ ; done

clean:
@rm my-mind.js
rm -rf $(JS) $(APP) $(STYLE)

.PHONY: all clean watch
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@

My Mind is a web application for creating and managing Mind maps. It is free to use and you can fork its source code. It is distributed under the terms of the MIT license.

New to Mind maps? They are useful, aesthetic and cool! Read more about these special diagrams in [the Wikipedia article](http://en.wikipedia.org/wiki/Mind_map).
New to Mind maps? They are useful, aesthetic and cool! Read more about these special diagrams in [the Wikipedia article](https://en.wikipedia.org/wiki/Mind_map).

* [Official web page](http://my-mind.github.io/)
* [Sample mind map](http://my-mind.github.io/?map=examples/features.mymind) showcasing many features
* [Official web page](https://my-mind.github.io/)
* [Sample mind map](https://my-mind.github.io/?map=examples/features.mymind) showcasing many features
* [News / Changelog](https://github.com/ondras/my-mind/wiki/News)
* [Documentation](https://github.com/ondras/my-mind/wiki)
* <a target="_blank" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=3340079"><img src="https://www.paypal.com/en_GB/i/btn/btn_donate_LG.gif" alt="Donate" title="Donate to support further development" /></a>

## Installation
Note: there is also an online version, which can be found at [my-mind.github.io](http://my-mind.github.io/)
Note: there is also an online version, which can be found at [my-mind.github.io](https://my-mind.github.io/)

* Download the zip by clicking [here](archive/master.zip) and extract the archive, or clone the repository using git
* Open index.html in your webbrowser
Expand Down
34 changes: 0 additions & 34 deletions bin/image.php

This file was deleted.

63 changes: 0 additions & 63 deletions bin/phantomjs-my-mind.js

This file was deleted.

26 changes: 26 additions & 0 deletions css/context-menu.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#context-menu {
&:not([hidden]) { display: flex; }

position: absolute;
border: 1px solid #666;
background-color: #fff;
box-shadow: 0 0 3px #666;
flex-direction: column;
width: 130px;

button {
background-color: transparent;
border: none;
margin: 0;
padding: 3px 6px;
font-size: 15px;
text-align: left;
&:hover { font-weight: bold; }
}

span {
border-top: 1px solid #666;
margin-top: 4px;
padding-top: 4px;
}
}
6 changes: 0 additions & 6 deletions css/font.css

This file was deleted.

6 changes: 6 additions & 0 deletions css/font.less

Large diffs are not rendered by default.

121 changes: 0 additions & 121 deletions css/item.css

This file was deleted.

Loading

0 comments on commit 32c963f

Please sign in to comment.