1
0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-24 10:37:20 +00:00
Commit Graph

304 Commits

Author SHA1 Message Date
Jeremy Ruston
26c7177752 Introduced new class for constructing and processing HTML trees
Intended to simplify various bits of HTML generation code
2012-02-06 10:56:55 +00:00
Jeremy Ruston
e579630249 Added explanatory comment to the view macro 2012-02-04 15:56:20 +00:00
Jeremy Ruston
2ff56c193c Fixed return value for macro events 2012-02-04 15:56:06 +00:00
Jeremy Ruston
15cfed83f4 Restored operation of sliders in info macro
Accidentally clobbered in the last refactoring
2012-02-02 18:15:59 +00:00
Jeremy Ruston
58ab36ef51 Refactored navigation to use new macro event mechanism
Phew. This gets rid of a lot of hacks
2012-02-02 18:00:42 +00:00
Jeremy Ruston
f576c86b41 Refactored macro event handling
Updated the slider macro to use the new mechanism to start with
2012-02-02 17:48:09 +00:00
Jeremy Ruston
449f322a86 Refactoring navigation handling
Not done yet, but the tests are passing so it's a good point to check
in. The idea is to let macros register for events to handle both the
click and the navigation request.
2012-02-02 15:13:50 +00:00
Jeremy Ruston
6707034ae5 Corrected typo 2012-02-02 12:49:26 +00:00
Jeremy Ruston
0458c538b0 Removed unneeded variable declaration 2012-02-01 16:13:49 +00:00
Jeremy Ruston
b0336c527c Changed the signature of WikiStore.renderTiddler
The parameters are more sensible and predictable now
2012-02-01 16:12:49 +00:00
Jeremy Ruston
5b301dc30b Added rerender support to the story macro
Allowing the selective refresh of the story tiddlers
2012-02-01 12:37:29 +00:00
Jeremy Ruston
121907fd36 Added a video embed macro
Playing videos makes it easier to verify that a particular tiddler
hasn't been inadvertently refreshed (which would cause the video to
reload)
2012-02-01 12:36:40 +00:00
Jeremy Ruston
6996f255ca Refactored renderer structure
This is to enable macros to be re-rendered as part of the refresh
process
2012-01-31 12:00:07 +00:00
Jeremy Ruston
6f027c3b49 Fixed problem with property names that need quoting 2012-01-31 11:58:53 +00:00
Jeremy Ruston
ddfa6732a6 Rename render function of macros 2012-01-30 20:04:47 +00:00
Jeremy Ruston
350ad5bf3b Removed extraneous debugging log 2012-01-30 20:04:20 +00:00
Jeremy Ruston
b0fc3d4668 Added ability to suppress the wrapper HTML nodes required by the refresh circuitry 2012-01-30 18:26:05 +00:00
Jeremy Ruston
6066b5cf89 Removed extraneous parameters to JSONParser constructor 2012-01-30 18:25:26 +00:00
Jeremy Ruston
56e701b326 Switched stitchElement parameter from className to classes
It's shorter, and looks better
2012-01-30 17:30:33 +00:00
Jeremy Ruston
f4d530a114 Removed erroneous blank line 2012-01-30 17:29:49 +00:00
Jeremy Ruston
205987d280 Improved the tiddler macro
Now you can transclude tiddlers as templates
2012-01-27 18:43:39 +00:00
Jeremy Ruston
6a81ed786e Documentation update for the tiddler macro
Including describing a new parameter that we'll add once the tests are
more up to date
2012-01-27 18:00:49 +00:00
Jeremy Ruston
a89acfc997 Fixed context for parameterised transclusions 2012-01-27 17:22:20 +00:00
Jeremy Ruston
1aa9b084e2 Fixed tiddler macro context for transclusions
Before this view macros in the transcluded tiddler displayed fields
from the tiddler doing the transcluding
2012-01-27 17:20:12 +00:00
Jeremy Ruston
d399a01f15 Added some judicious hasOwnProperty() checks 2012-01-27 16:49:29 +00:00
Jeremy Ruston
f29f06f3e9 Cleanups 2012-01-27 16:35:55 +00:00
Jeremy Ruston
3e62698efb Added parsing and rendering for JSON tiddlers 2012-01-25 22:35:52 +00:00
Jeremy Ruston
a04cec3723 Added a helpful comment 2012-01-25 19:15:07 +00:00
Jeremy Ruston
fdbb46afb8 Missing return value if slider click event not handled 2012-01-25 19:14:01 +00:00
Jeremy Ruston
a4600c6c16 Put the tiddler info stuff into sliders 2012-01-25 15:35:52 +00:00
Jeremy Ruston
aba830ff8c Refactored story navigator to work by modifying the story tiddlers
Currently hardwiring the name of the tiddler containing the story
2012-01-25 12:48:12 +00:00
Jeremy Ruston
0d45d76af6 Finally, selective refreshing now works
Although it's a bit hard to see which DOM nodes have been refreshed.
2012-01-25 12:05:18 +00:00
Jeremy Ruston
dad7756f65 Getting selective refresh working
A bunch of changes, and we're halfway there
2012-01-25 10:51:04 +00:00
Jeremy Ruston
81d642dd8b Fix type for transclusions 2012-01-24 18:11:59 +00:00
Jeremy Ruston
04e9376eca Refactored the story macro to invoke the tiddler macro to display tiddlers 2012-01-24 18:11:38 +00:00
Jeremy Ruston
3268c46458 Parsers now take the type parameter 2012-01-24 18:11:09 +00:00
Jeremy Ruston
889bdbc82a Added wrapper around macro invocations 2012-01-24 18:10:51 +00:00
Jeremy Ruston
527b750714 Wrap macro invocations in an information element 2012-01-24 18:10:27 +00:00
Jeremy Ruston
b92e011c66 Refactored stringily not to add the double quotes 2012-01-24 18:09:54 +00:00
Jeremy Ruston
b32826f110 Revise startup display handling
And adjust the image parser registration
2012-01-24 18:09:38 +00:00
Jeremy Ruston
bd5de61156 Replace the bitmap and SVG parsers with a single image parser 2012-01-24 18:08:59 +00:00
Jeremy Ruston
2cd0e681ea Temporarily suppressed rendering of the render step
So that the tests pass, which looks nicer
2012-01-24 16:28:26 +00:00
Jeremy Ruston
398831b0d9 Major reorganisation of wikitext rendering
Getting ready to support selective refresh of DOM elements
2012-01-24 16:26:37 +00:00
Jeremy Ruston
a96df59172 Added dump of the compile tree to info macro 2012-01-23 19:04:11 +00:00
Jeremy Ruston
32c8e69949 Use utils.stitchElement in WikiTextParseTree.compileElementHtml 2012-01-23 18:50:18 +00:00
Jeremy Ruston
33ad4461db Removed erroneous HTML encode in plain text generation 2012-01-23 18:45:50 +00:00
Jeremy Ruston
9123c32782 Corrected typos 2012-01-23 18:45:21 +00:00
Jeremy Ruston
ed87061897 Added the slider macro 2012-01-23 18:31:17 +00:00
Jeremy Ruston
c185989ca5 Fixed view macro to check whether the tiddler exists 2012-01-23 16:42:12 +00:00
Jeremy Ruston
82a37d3ab4 Fixed info macro when invoked in a missing tiddler 2012-01-23 16:41:49 +00:00
Jeremy Ruston
fd9d4973e3 Cleaned up last few diffs for building 2.6.5
Now the file is byte-for-byte identical with that produced by
TiddlyWiki itself.
2012-01-23 14:36:12 +00:00
Jeremy Ruston
3675958e30 Improvements to recipe error handling 2012-01-22 17:37:21 +00:00
Jeremy Ruston
17826a72fb More fixes for recipe directory handling
Done some variable name refactoring to make things clearer
2012-01-21 17:08:07 +00:00
Jeremy Ruston
106f287a94 Fixed problem with recipe directory handling 2012-01-21 16:54:31 +00:00
Jeremy Ruston
61adbbf83a Keeping JSHint on it's toes 2012-01-21 14:03:03 +00:00
Jeremy Ruston
b96f0c1bd6 Improvements to tree dumping 2012-01-21 14:00:09 +00:00
Jeremy Ruston
693cb67c6b Minor style tweaks 2012-01-20 12:19:13 +00:00
Jeremy Ruston
6fc3d45369 Update the info macro to display parse trees 2012-01-19 11:56:06 +00:00
Jeremy Ruston
e72fc6bc80 Added toString() method to WikiTextParseTree
For debugging and seeing what's going on behind the covers
2012-01-19 11:55:51 +00:00
Jeremy Ruston
d539286e09 New renderObject() function for displaying trees
So that we can display parse trees nicely
2012-01-19 11:55:18 +00:00
Jeremy Ruston
4bed00220e Cleaning up WikiTextRules 2012-01-17 16:44:59 +00:00
Jeremy Ruston
0f3cf24642 Added comments 2012-01-17 16:30:23 +00:00
Jeremy Ruston
ca3778f9fd Better error messages for eval'd code 2012-01-17 15:35:13 +00:00
Jeremy Ruston
a6de27b348 We shouldn't use the source of images as their text in text/plain renderings 2012-01-17 15:21:56 +00:00
Jeremy Ruston
8cfff2c2fa Refactored JavaScriptParseTree handling of output array 2012-01-17 15:20:46 +00:00
Jeremy Ruston
f10d58ed2b Refactored WikiTextParseTree to handle the output array better 2012-01-17 15:12:59 +00:00
Jeremy Ruston
73236d72f5 Note 2012-01-17 14:36:37 +00:00
Jeremy Ruston
0297de3648 Cleaning up 2012-01-17 14:36:27 +00:00
Jeremy Ruston
102724b3e8 Changed the SVG parser to use IMG tags
Embed the SVG image in an IMG tag rather than directly, to ensure that
it has it's own DOM state (otherwise things like IDs in SVG images are
visible to the hosting page)
2012-01-17 13:53:04 +00:00
Jeremy Ruston
bd17a389cb Move the cache from the Tiddler object to the WikiStore
It's not really a concern of the Tiddler object
2012-01-17 13:31:06 +00:00
Jeremy Ruston
b898afe3e5 Refactor the Tiddler object to enforce immutability
And in the process move the fields out of the fields member
2012-01-17 13:01:55 +00:00
Jeremy Ruston
2ff603da0e Added support for wildcard references in recipes 2012-01-16 19:22:10 +00:00
Jeremy Ruston
9075b8a020 Mapped wiki image markup to image macro 2012-01-16 08:58:51 +00:00
Jeremy Ruston
ac61e2d251 Rejigged the link macro to accept child elements 2012-01-15 18:39:14 +00:00
Jeremy Ruston
606374e563 Added the image macro 2012-01-15 14:37:49 +00:00
Jeremy Ruston
4df13a3e24 Refactored link classes allocation
Don't need the classesForLink() method anymore. Also avoid modifying
the argument to adjustClassesForLink().
2012-01-15 13:48:13 +00:00
Jeremy Ruston
4681d14f39 Fixed the view macro to reuse the link macro 2012-01-15 13:37:50 +00:00
Jeremy Ruston
ca6e32bd5a Refactor link handling to use a link macro
Instead of the special case handling for <a> tags
2012-01-15 13:29:16 +00:00
Jeremy Ruston
c4f9efd894 Get rid of the obsolete link refreshing circuitry
We're going to redo links as macros and take advantage of that circuitry
2012-01-15 13:27:59 +00:00
Jeremy Ruston
2c20ef6aef Beefed up the stitchElement helper 2012-01-15 13:27:30 +00:00
Jeremy Ruston
c26f197462 Fixed problem with external links 2012-01-15 13:27:15 +00:00
Jeremy Ruston
e2a0955ced Renamed 'handler' member of macros
Used to be called "code". And associated documentation changes
2012-01-15 12:16:28 +00:00
Jeremy Ruston
c3c5334795 Fixed minor problem with backtick formatting
It's confusing if it behaves differently that the existing
tripe-curly-brace format
2012-01-15 11:41:54 +00:00
Jeremy Ruston
b671ecdedd Refactored story macro to use renderTiddler instead of renderText 2012-01-14 17:24:25 +00:00
Jeremy Ruston
7c4d5b76ef Refactored parameter names for renderTiddler() 2012-01-14 17:24:07 +00:00
Jeremy Ruston
b26bf8e278 Keeping JSHint happy 2012-01-14 17:23:43 +00:00
Jeremy Ruston
b7d0942625 Added support for store events and basic refreshing
1s after loading you'll see the link to TiddlyWiki5 flip from italic to
normal text as that tiddler is created on a timer
2012-01-14 15:49:12 +00:00
Jeremy Ruston
054977c912 Add markup to capture macro details 2012-01-14 15:48:17 +00:00
Jeremy Ruston
adf4a3bae1 New utilities stitchElement and nextTick 2012-01-14 15:47:41 +00:00
Jeremy Ruston
e046fd7cbf Avoided using jQuery when bootstrapping the page 2012-01-13 18:51:39 +00:00
Jeremy Ruston
8561fb979c Added support for # comment lines in recipe files 2012-01-13 18:50:37 +00:00
Jeremy Ruston
510006d67d Added story macro
And the PageTemplate for it to go into
2012-01-13 16:50:11 +00:00
Jeremy Ruston
f5c56c066e Added support for binary ingredients over HTTP 2012-01-13 15:37:58 +00:00
Jeremy Ruston
ecfbaaa564 Added support for JPEG and PNG bitmap tiddlers 2012-01-12 21:48:24 +00:00
Jeremy Ruston
ecabcd676b Added support for SVG tiddlers
Which means adding a parser for SVG, even though it doesn't actually do
any parsing at the moment
2012-01-12 19:17:32 +00:00
Jeremy Ruston
6f247640c6 Re-enabled RSS feed generation
It was temporarily turned off while all that refactoring was going on
2012-01-08 14:07:01 +00:00
Jeremy Ruston
d01ba66305 Added backtick notation for inline code blocks
Getting bored of typing {{{ and }}}, given that  my keyboard already
devotes a key to backtick
2012-01-08 11:33:24 +00:00
Jeremy Ruston
14e252590c Minor optimisation to the list macro
By moving the compiling of the template outside of the main loop
2012-01-08 11:03:20 +00:00
Jeremy Ruston
bc16400ef2 Cleared some temporary variables after use
To reduce memory consumption
2012-01-08 10:24:09 +00:00
Jeremy Ruston
cd0ecf6e1c Implemented <<list>> macro 2012-01-07 21:54:14 +00:00