-
-
Notifications
You must be signed in to change notification settings - Fork 651
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4 from ondras/master
Merge
- Loading branch information
Showing
52 changed files
with
4,399 additions
and
223 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,60 @@ | ||
.PHONY: push | ||
SOURCES = src/mm.js \ | ||
src/promise.js \ | ||
src/promise-addons.js \ | ||
src/repo.js \ | ||
src/item.js \ | ||
src/map.js \ | ||
src/keyboard.js \ | ||
src/action.js \ | ||
src/clipboard.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/backend.js \ | ||
src/backend.local.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.help.js \ | ||
src/ui.io.js \ | ||
src/ui.backend.js \ | ||
src/ui.backend.file.js \ | ||
src/ui.backend.local.js \ | ||
src/ui.backend.firebase.js \ | ||
src/ui.backend.gdrive.js \ | ||
src/app.js | ||
|
||
all: | ||
.PHONY: all push clean | ||
|
||
all: my-mind.js | ||
|
||
my-mind.js: $(SOURCES) | ||
@echo "/* My Mind web app: all source files combined. */" > $@ | ||
@cat $^ >> $@ | ||
|
||
push: | ||
@hg bookmark -f master | ||
@hg push ; true | ||
@hg push github ; true | ||
|
||
clean: | ||
@rm my-mind.js |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,190 @@ | ||
{ | ||
"root": { | ||
"id": "ujfdpxoz", | ||
"text": "My Mind\nFeatures", | ||
"layout": "map", | ||
"children": [ | ||
{ | ||
"id": "cmetfpcz", | ||
"text": "Basic features", | ||
"side": "right", | ||
"color": "#e33", | ||
"children": [ | ||
{ | ||
"id": "oufzmqvy", | ||
"text": "Node selection, manipulation" | ||
}, | ||
{ | ||
"id": "hsthllrc", | ||
"text": "<b>Rich</b> <i>text</i> <strike>editing</strike>" | ||
}, | ||
{ | ||
"id": "spnaifjx", | ||
"text": "Auto-linking" | ||
}, | ||
{ | ||
"id": "meeftorp", | ||
"text": "Colors" | ||
}, | ||
{ | ||
"id": "pphsgpvu", | ||
"text": "Zooming" | ||
}, | ||
{ | ||
"id": "avzourxv", | ||
"text": "Shapes" | ||
}, | ||
{ | ||
"id": "bhszysqp", | ||
"text": "Full keyboard control" | ||
} | ||
] | ||
}, | ||
{ | ||
"id": "nkrfhzwg", | ||
"text": "I/O", | ||
"side": "left", | ||
"color": "#3e3", | ||
"children": [ | ||
{ | ||
"id": "fpbtygky", | ||
"text": "Multiple backends", | ||
"children": [ | ||
{ | ||
"id": "ezwvmtko", | ||
"text": "Local storage" | ||
}, | ||
{ | ||
"id": "sczzbjgf", | ||
"text": "Local filesystem" | ||
}, | ||
{ | ||
"id": "megldbuw", | ||
"text": "Firebase" | ||
}, | ||
{ | ||
"id": "rmxmrpum", | ||
"text": "Google Drive" | ||
} | ||
] | ||
}, | ||
{ | ||
"id": "bmatbsiz", | ||
"text": "Multiple file formats", | ||
"children": [ | ||
{ | ||
"id": "lyzyawpn", | ||
"text": "Native" | ||
}, | ||
{ | ||
"id": "chfwbjrp", | ||
"text": "Freemind" | ||
}, | ||
{ | ||
"id": "vhsldewc", | ||
"text": "Mind Architect" | ||
}, | ||
{ | ||
"id": "whmzheiy", | ||
"text": "MindMup" | ||
} | ||
] | ||
}, | ||
{ | ||
"id": "hjialeal", | ||
"text": "Permalinks" | ||
} | ||
] | ||
}, | ||
{ | ||
"id": "scoyihcg", | ||
"text": "Advanced features", | ||
"side": "right", | ||
"color": "#33e", | ||
"children": [ | ||
{ | ||
"id": "bvfjpmrm", | ||
"text": "Numerical node values", | ||
"value": "sum", | ||
"children": [ | ||
{ | ||
"id": "fppldjcr", | ||
"text": "Constant values", | ||
"value": 3.14 | ||
}, | ||
{ | ||
"id": "lhqwyqwq", | ||
"text": "Functions", | ||
"value": 42 | ||
} | ||
] | ||
}, | ||
{ | ||
"id": "pjqwdjad", | ||
"text": "Bool node statuses", | ||
"value": "maybe", | ||
"status": "maybe", | ||
"children": [ | ||
{ | ||
"id": "jsrxnhgy", | ||
"text": "Yes/No", | ||
"value": "yes", | ||
"status": "no" | ||
}, | ||
{ | ||
"id": "oqzwbzvf", | ||
"text": "Auto-propagation to parent", | ||
"value": "no", | ||
"status": "maybe" | ||
} | ||
] | ||
}, | ||
{ | ||
"id": "adqojbln", | ||
"text": "Variable layouts", | ||
"layout": "tree-right", | ||
"children": [ | ||
{ | ||
"id": "uglsvbbi", | ||
"text": "Map" | ||
}, | ||
{ | ||
"id": "mvqxmutu", | ||
"text": "Graph" | ||
}, | ||
{ | ||
"id": "uonrboqe", | ||
"text": "Tree" | ||
} | ||
] | ||
}, | ||
{ | ||
"id": "rsruxymh", | ||
"text": "Infinite undo/redo" | ||
} | ||
] | ||
}, | ||
{ | ||
"id": "rbahwqul", | ||
"text": "Planned features", | ||
"side": "left", | ||
"color": "#d3d", | ||
"children": [ | ||
{ | ||
"id": "krsvhker", | ||
"text": "Realtime sync (Firebase)" | ||
}, | ||
{ | ||
"id": "vcmxdsvj", | ||
"text": "Custom styles" | ||
}, | ||
{ | ||
"id": "bsddmwik", | ||
"text": "Custom icons" | ||
} | ||
] | ||
} | ||
] | ||
}, | ||
"id": "dwqxduay" | ||
} |
This file was deleted.
Oops, something went wrong.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.