1
0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-07-05 19:53:17 +00:00
Commit Graph

440 Commits

Author SHA1 Message Date
Jeremy Ruston
1deb23b82d Added toggleClass method 2012-03-30 16:42:54 +01:00
Jeremy Ruston
ae78b97596 Fixed logic for checking for a dependent context tiddler
And added some documentation
2012-03-30 16:42:35 +01:00
Jeremy Ruston
d8d20a3bc8 Got the edit macro working
A bit rough and ready, but OK for editting `text` and other full text
fields.
2012-03-30 13:50:01 +01:00
Jeremy Ruston
cc3180a1cc Added dependentOnContextTiddler flag to view macro 2012-03-30 13:49:26 +01:00
Jeremy Ruston
05d837aaef Fixed dependency handling for tiddler macro 2012-03-30 13:49:09 +01:00
Jeremy Ruston
65b55925de Added support for committing edits to a draft tiddler 2012-03-30 13:48:59 +01:00
Jeremy Ruston
1df0a50760 Added support for macros to evaluate their own dependencies 2012-03-30 13:48:30 +01:00
Jeremy Ruston
8f3fcda234 Added support for nodes that are dependent on the current context tiddler 2012-03-30 13:48:16 +01:00
Jeremy Ruston
628963d838 Fixed problem with class keyword 2012-03-30 13:47:54 +01:00
Jeremy Ruston
70941b07a6 Added initial support for the command macro
Just the EditTiddler command at the moment
2012-03-29 17:02:05 +01:00
Jeremy Ruston
b0cdd866ee Fixed up classnames
Not sticking to my own conventions is bad
2012-03-29 15:35:52 +01:00
Jeremy Ruston
b81ffdcb58 Added missing semicolon 2012-03-29 15:33:47 +01:00
Jeremy Ruston
1dd6e43a6f First version of the edit macro 2012-03-29 15:32:36 +01:00
Jeremy Ruston
048cc1f6de Added a wrapper around transcluded tiddlers
For styling
2012-03-29 14:57:54 +01:00
Jeremy Ruston
392e717497 Refactored handling of context tiddler
Now the title is passed around, rather than a reference to the tiddler.
This lets the context be a missing tiddler, enabling us to correctly
render missing tiddlers
2012-03-29 14:30:22 +01:00
Jeremy Ruston
cd0f8ebb52 Improving the handling of missing tiddlers
On the way to being able to edit tiddlers
2012-03-29 13:44:45 +01:00
Jeremy Ruston
cbb8ee3bb0 Changed format of story tiddlers to JSON
Allowing us to encode the template for each tiddler
2012-03-29 12:54:51 +01:00
Jeremy Ruston
02aaa3567f Improved comments 2012-03-29 12:23:34 +01:00
Jeremy Ruston
d03d461672 Fixed problem with exponents in CSS values
CSS doesn't like "translateY(1e-13px)"
2012-03-20 16:49:47 +00:00
Jeremy Ruston
b10727f556 Improvements to the zooming navigator 2012-03-20 13:30:59 +00:00
Jeremy Ruston
492ab00577 Added the experimental zooming navigator
It doesn't work properly yet. Swipe in from the right edge of the
screen to try it. iPad/iPhone only at the moment
2012-03-16 15:11:37 +00:00
Jeremy Ruston
3d4e92568f Slowed down the chooser's horizontal scale factor 2012-03-16 15:11:04 +00:00
Jeremy Ruston
5138796ee1 Fixed typo
Thanks to cjhunt
2012-03-16 15:08:30 +00:00
Jeremy Ruston
00f9bdc43f Fixed problem with tiddlers opening twice 2012-03-15 09:32:53 +00:00
Jeremy Ruston
91bba13608 Started using shadow tiddlers
Now the JavaScript modules and templates are put into the shadow store
2012-03-14 18:57:53 +00:00
Jeremy Ruston
1cf54ce08c Improved usability of addTiddler() 2012-03-14 18:57:04 +00:00
Jeremy Ruston
7970745f58 Make the chooser work in Firefox
It doesn't work as well as Chrome, needs investigation
2012-03-14 18:26:44 +00:00
Jeremy Ruston
399e8d710c Slide the chooser in as the touch/mouse moves right 2012-03-14 17:41:18 +00:00
Jeremy Ruston
4354c7dbe2 Fixed chooser so that it works when the screen is scrolled
Or indeed zoomed.
2012-03-14 13:49:05 +00:00
Jeremy Ruston
1d11acf8ec Keeping JSHint happy 2012-03-13 15:15:33 +00:00
Jeremy Ruston
98a681f904 Updated chooser
It sort of works now
2012-03-13 15:12:58 +00:00
Jeremy Ruston
4c01ae392e Added class manipulation utilities 2012-03-13 15:12:36 +00:00
Jeremy Ruston
581d165822 Catch navigation events that fall through to the document
And broadcast them back to the first story macro that accepts them
2012-03-13 15:12:23 +00:00
Jeremy Ruston
f8f3b884a1 Fixed some confusing parameter names 2012-03-11 19:08:50 +00:00
Jeremy Ruston
34fb32b81c Fixed problem with wildcard references in recipes not working if no tiddler files are found 2012-03-11 16:11:17 +00:00
Jeremy Ruston
220a10480e Fixed issue with importing an empty TiddlyWiki document 2012-03-10 19:31:25 +00:00
Jeremy Ruston
b513daaff8 Added an experimental fisheye menu chooser
I'm starting to experiment with interactive features so that I can
finalise the macro architecture. I'm trying to design for touch first;
this menu swipes in from the left
2012-03-07 17:44:12 +00:00
Jeremy Ruston
a65713650e Fixed macro execution in renderTiddler and renderMacro 2012-03-07 17:42:41 +00:00
Jeremy Ruston
b64e44d1af Refactored macro implementation
Now setting event handlers to the macro object, the browser invokes the
handleEvent method. Gets rid of a closure, which is good
2012-03-07 17:42:10 +00:00
Jeremy Ruston
e17772c830 Added domContains()
Lots of event handlers need this
2012-03-07 17:40:59 +00:00
Jeremy Ruston
0f2883b75a Adjust the slider macro to the new Bootstrap styles
And fixed some indentation issues
2012-03-05 15:14:24 +00:00
Jeremy Ruston
bfc1f1aaa5 Fixed custom classes containing a dash 2012-03-05 15:13:52 +00:00
Jeremy Ruston
ed6cc0b7e3 Added Twitter Bootstrap styles
And started converting everything to using the new classes
2012-03-05 15:13:25 +00:00
Jeremy Ruston
cb97295fdb Further refactorings to simplify macro development 2012-03-05 13:36:53 +00:00
Jeremy Ruston
8abf0049cf Refactored slider macro 2012-03-05 12:23:27 +00:00
Jeremy Ruston
8847551bd9 Removed unnecessary type declaration from macros 2012-03-05 12:04:06 +00:00
Jeremy Ruston
3633a40986 Improved slider macro docs 2012-03-05 10:18:22 +00:00
Jeremy Ruston
4649a0bd88 Refactored slider macro to lazily render it's content 2012-03-04 21:58:33 +00:00
Jeremy Ruston
60670509e0 Improved documentation for the slider macro 2012-03-04 13:20:38 +00:00
Jeremy Ruston
86e119dbf2 Replace tabs in JavaScript with spaces
Browsers will render tabs, but most don't let us override their default
of 8 character tab stops
2012-03-04 12:01:44 +00:00
Jeremy Ruston
4a73317193 Refactoring renderer "tree" array to "nodes" 2012-03-03 18:39:13 +00:00
Jeremy Ruston
2ecb1f670c Better error messages in the view and tiddler macros 2012-03-03 18:35:52 +00:00
Jeremy Ruston
7f136dd898 Get rid of the old WikiTextParseTree class
And replace it with a new root Renderer() class
2012-03-03 18:33:16 +00:00
Jeremy Ruston
26b5fc4a6d Fixed default type for unknown typed text blocks 2012-03-03 18:07:47 +00:00
Jeremy Ruston
4999a3b729 Added an option to specify default mime type in parseText() 2012-03-03 18:07:33 +00:00
Jeremy Ruston
588bc550c0 Added plain text parser
Now we display plain text tiddlers properly
2012-03-03 18:07:09 +00:00
Jeremy Ruston
2ce77b3839 Comment update 2012-03-03 18:06:33 +00:00
Jeremy Ruston
9de3bb6f59 Fixed problem with SVG images identified by file extension 2012-03-03 13:52:10 +00:00
Jeremy Ruston
505c332123 Fix for identifying SVG images by file extension 2012-03-03 13:39:35 +00:00
Jeremy Ruston
128c94804a Fixed type block bug 2012-03-03 13:35:51 +00:00
Jeremy Ruston
3bfab9f9da Added support for typed blocks in wikitext
This allows embedded blocks of another mime type to appear in a
tiddler, useful for syntax highlighting fragments of javascript
2012-03-03 12:29:13 +00:00
Jeremy Ruston
12c6239bf5 Keeping JSHint happy 2012-03-02 18:00:40 +00:00
Jeremy Ruston
5eab89d1f0 Improved styles for JavaScript comments
Because we all want skeuomorphic post-it note comments on our code
2012-03-02 15:54:05 +00:00
Jeremy Ruston
d3ca939863 Improved rendering of JavaScript comments 2012-03-02 14:21:02 +00:00
Jeremy Ruston
865a0ad7cc Improved rendering of JavaScript that has parse errors 2012-03-02 12:09:06 +00:00
Jeremy Ruston
488562bd95 Restored the JSONParser as a separate entity
It doesn't really have much in common with the JavaScript parser
2012-03-02 11:31:39 +00:00
Jeremy Ruston
8adfcbdc69 Added syntax highlighting for JavaScript tiddlers 2012-03-02 00:48:05 +00:00
Jeremy Ruston
542561a0fa Trim javascript module tiddlers to exclude the standard header and footer 2012-03-02 00:10:39 +00:00
Jeremy Ruston
8552f2f894 Use the new esprima parser to display javascript modules as parse trees 2012-03-01 23:59:46 +00:00
Jeremy Ruston
a274bad1a2 Tying up the ability to load javascript modules as tiddlers 2012-03-01 23:24:25 +00:00
Jeremy Ruston
96d8c15f72 Added ability to load javascript modules into the tiddler store
When running in the browser
2012-03-01 23:23:37 +00:00
Jeremy Ruston
f6338d9109 Replace pegs parser with Esprima
It preserves comments and text positions, enabling us to do syntax
highlighting. Hopefully.
2012-03-01 22:47:31 +00:00
Jeremy Ruston
470b622bb1 Corrected dependency skinny/fat handling 2012-03-01 19:03:04 +00:00
Jeremy Ruston
46f019ea83 Refactored where we do macro parameter string parsing 2012-02-22 23:27:38 +00:00
Jeremy Ruston
6902ee19de Refactoring name of macro refresh method 2012-02-22 23:27:21 +00:00
Jeremy Ruston
106380b98a Fixed slider to refresh child nodes correctly 2012-02-22 22:47:42 +00:00
Jeremy Ruston
525fd3631e Handle cascadeDefaults in macro parameters 2012-02-22 22:24:51 +00:00
Jeremy Ruston
6d96632bf6 Fixed typo 2012-02-22 22:24:37 +00:00
Jeremy Ruston
c918bb6b35 Removed obsolete parameter from internal method 2012-02-22 21:58:48 +00:00
Jeremy Ruston
52c3e7a146 Extended slider macro to accept a "content" parameter
It specifies wikitext to directly include within the slider, overriding
any specified targetTiddler
2012-02-22 21:39:59 +00:00
Jeremy Ruston
6a0f2006bf Fixed problem with specifying positional parameters by name 2012-02-22 21:39:08 +00:00
Jeremy Ruston
bf6f5e0254 Refactored macro interface
Now 'this' points to the Renderer.MacroNode
2012-02-21 21:57:30 +00:00
Jeremy Ruston
1d007ce6d5 Removing the info macro 2012-02-21 21:56:38 +00:00
Jeremy Ruston
5a51604fdb Get rid of the info macro
We may bring it back, but it's a hassle to keep it up to date at the
moment
2012-02-21 21:56:27 +00:00
Jeremy Ruston
bc385abe23 Merged adjacent if() clauses 2012-02-20 21:19:12 +00:00
Jeremy Ruston
aaedf28904 Minor re-enhancements 2012-02-20 21:00:12 +00:00
Jeremy Ruston
5ca478d106 Get rid of the Renderer() wrapper and use the MacroNode directly 2012-02-20 20:52:54 +00:00
Jeremy Ruston
53f652bf2a Refactored evaluation of macro dependencies
Now the dependencies are evaluated in the constructor for the
Renderer.MacroNode
2012-02-20 19:27:37 +00:00
Jeremy Ruston
b37d3b6670 Refactored macros to use new Dependencies() constructor 2012-02-20 18:05:10 +00:00
Jeremy Ruston
b1a96d8bf5 Refactored renderTiddler() to create macro node directly
This is so that we can get rid of the Renderer() wrapper class entirely
2012-02-20 18:04:50 +00:00
Jeremy Ruston
36f61b4321 Further simplification of the Renderer() class 2012-02-20 18:04:12 +00:00
Jeremy Ruston
0c4f877093 Refactored Dependencies() constructor
Now it's much easier to call
2012-02-20 18:03:51 +00:00
Jeremy Ruston
707a08540c Ceding to JSHint's suggestions 2012-02-20 15:42:21 +00:00
Jeremy Ruston
4d6f8ab8eb Introduced new base class for Renderer nodes
Making the code a bit simpler
2012-02-20 11:06:17 +00:00
Jeremy Ruston
93de843016 Remove unused deepCopy() function 2012-02-19 20:12:25 +00:00
Jeremy Ruston
e4dd63d089 Updated slider macro to have a refresh method 2012-02-19 17:24:01 +00:00
Jeremy Ruston
a0524c2144 Added protection against wikitext recursion
Now attempts to view a tiddler recursively fail gracefully
2012-02-19 17:20:16 +00:00
Jeremy Ruston
3bb0490bee Added defaultText parameter to getTiddlerText() 2012-02-19 17:19:12 +00:00
Jeremy Ruston
1326b12948 Removed "optional" field from macro parameters
Macros need to tolerate missing parameters
2012-02-17 17:32:32 +00:00
Jeremy Ruston
94a84d8bc6 More JSHint hints 2012-02-17 17:31:57 +00:00