1
0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-30 13:29:56 +00:00
Commit Graph

3334 Commits

Author SHA1 Message Date
Jeremy Ruston
7e2ff9e0d8 Extended the image macro to take a width and height 2012-06-10 18:09:15 +01:00
Jeremy Ruston
298b10b8f9 Fixed typo in comment 2012-06-10 18:09:00 +01:00
Jeremy Ruston
e0b630686e Refactored wikitext parser to deal better with terminated blocks 2012-06-10 17:26:54 +01:00
Jeremy Ruston
0ffa882d09 The start of better styling 2012-06-10 14:46:34 +01:00
Jeremy Ruston
4e0528e3dd Fixed typo in recipe handling 2012-06-10 13:40:35 +01:00
Jeremy Ruston
3e49513c73 Renamed class wikitext rule as a block rule 2012-06-10 13:40:19 +01:00
Jeremy Ruston
e88873e3a8 Removed mistaken suppression of trailing newlines in JS comments 2012-06-09 22:39:13 +01:00
Jeremy Ruston
ca56de0495 Add a span around the title
We can measure the dimensions of the span to get the dimensions of the
title
2012-06-09 22:25:58 +01:00
Jeremy Ruston
cde03baf24 Take newlines out of JS comments 2012-06-09 22:25:31 +01:00
Jeremy Ruston
b90688042c Set block status of link macro created by view macro 2012-06-09 22:25:13 +01:00
Jeremy Ruston
199d2acb5a Stop the view macro returning extraneous elements 2012-06-09 19:04:42 +01:00
Jeremy Ruston
9247bb0186 Tweaked mechanism so that macros can be nested directly inside other macros 2012-06-09 18:50:01 +01:00
Jeremy Ruston
1251a35375 Get rid of the Bootstrap JS files
JSHint really, really doesn't like this code....
2012-06-09 18:40:36 +01:00
Jeremy Ruston
04e91245cb Refactored macro mechanism
Now there is now longer a dummy DOM element corresponding to the macro
itself. Instead, macros must create a single element child. This allows
us to more easily fit Bootstrap's requirements for HTML layout (eg,
that problem with links in navbars not being recognised). The
refactoring isn't complete, there are still a few bugs to chase down
2012-06-09 18:36:32 +01:00
Jeremy Ruston
9274651bfd Parse HTML tag contents as a block if it is a block tag 2012-06-09 15:08:30 +01:00
Jeremy Ruston
34311e230f Wrap the title and subtitle of tiddlers in their own divs 2012-06-09 11:25:49 +01:00
Jeremy Ruston
4a8c2d46b9 Drop jQuery
We don't want it as part of the core
2012-06-09 11:25:24 +01:00
Jeremy Ruston
550fd76db1 Stop using the Twitter Bootstrap JS
Easier just to reuse the CSS
2012-06-09 11:25:07 +01:00
Jeremy Ruston
3202928c79 Added Bootstrap JavaScript modules and moved CSS into core 2012-06-08 11:49:14 +01:00
Jeremy Ruston
67b4c86c98 Refactored file layout for JavaScript parser 2012-06-08 11:48:46 +01:00
Jeremy Ruston
3c834609b8 Replaced zepto with jquery
Twitter Bootstrap doesn't work properly with Zepto
2012-06-08 11:48:25 +01:00
Jeremy Ruston
b5f8f97ccc Refactored loading of tiddlywiki.plugin files
Now we read the files raw, rather than through the deserialiser
2012-06-08 11:47:05 +01:00
Jeremy Ruston
96c5153dea We don't need to clone the children of the link macro 2012-06-08 10:51:40 +01:00
Jeremy Ruston
6264bf1bbe Include Zepto.js
It seems much nicer and smaller than jQuery
2012-06-08 10:42:17 +01:00
Jeremy Ruston
5322d3cdfd Added library modules to browser template
Now we can include things like jQuery easily
2012-06-08 10:41:58 +01:00
Jeremy Ruston
2083b7959e Reordered helper functions 2012-06-07 13:46:41 +01:00
Jeremy Ruston
adf83e71de Changes the chooser and the zoomer to use the browser prefix mechanism 2012-06-07 13:29:16 +01:00
Jeremy Ruston
e2707ae49d Updated story macro to allow for contained content
This allows us to fix the zooming chooser and zooming navigator
2012-06-07 13:10:15 +01:00
Jeremy Ruston
22b27f4251 Ensured block macros parse their content as blocks, rather than a run 2012-06-07 13:09:48 +01:00
Jeremy Ruston
698f2c39cb Updated wikitext class rule to use parseBlockTerminated() method 2012-06-07 13:09:22 +01:00
Jeremy Ruston
52f86e7b01 Added parseBlockTerminated() method to new wikitext parser 2012-06-07 13:08:50 +01:00
Jeremy Ruston
db34b346a4 Corrected default template for download macro 2012-06-07 12:28:03 +01:00
Jeremy Ruston
e8c69ae7dc Comment updates 2012-06-07 11:31:44 +01:00
Jeremy Ruston
3da70b925f Saving a shadow tiddler preserves its shadow status 2012-06-06 22:19:34 +01:00
Jeremy Ruston
2053b7c413 Moved loading of core shadow tiddlers into the boot kernel 2012-06-06 21:42:14 +01:00
Jeremy Ruston
6319a7dee5 Renamed wiki folder 2012-06-06 20:52:30 +01:00
Jeremy Ruston
191be73507 Fixed problem with is filter operator 2012-06-06 20:51:13 +01:00
Jeremy Ruston
6b56a95ca8 Added JSON extension to file info 2012-06-06 14:54:29 +01:00
Jeremy Ruston
22b836e4ac Added 'isShadow' flag for system tiddlers
Shadow tiddlers are omitted from lists by default
2012-06-06 13:21:20 +01:00
Jeremy Ruston
fa08941a75 Refactored the Tiddler.getFields() method 2012-06-06 12:20:48 +01:00
Jeremy Ruston
1e4c91d348 Renamed filters.js 2012-06-06 12:17:08 +01:00
Jeremy Ruston
91cbd027df Renamed filters.js 2012-06-06 12:16:50 +01:00
Jeremy Ruston
72de3d4206 Fixed problem with prefix filter 2012-06-06 12:13:31 +01:00
Jeremy Ruston
e2ea8ff436 Refactored shadow tiddlers to not be in a separate store
Shortly there will be a flag to mark them
2012-06-06 12:07:33 +01:00
Jeremy Ruston
7c382c5f43 Switched slider to use new syntax for inline content 2012-06-06 11:29:10 +01:00
Jeremy Ruston
31257489a7 More docs updates 2012-06-06 10:15:20 +01:00
Jeremy Ruston
a318ad77cd Removed extraneous calls to skipWhitespace
Instead we'll skip whitespace at the start of a run
2012-06-05 23:15:52 +01:00
Jeremy Ruston
b989e05d98 Improved wikitext docs 2012-06-05 22:54:36 +01:00
Jeremy Ruston
ad25ab4c1a Fixed parsing problem
We need to recheck for the next terminator after a successful run match
to cope with the situation that the run match included the previously
found terminator match
2012-06-05 22:01:06 +01:00
Jeremy Ruston
ee7fba9297 Added support for macros with embedded content 2012-06-05 17:01:17 +01:00
Jeremy Ruston
03da553c3b Added wikitext for m- and n-dashes 2012-06-05 16:33:35 +01:00
Jeremy Ruston
ca8cf1a386 Simplified wiki link CamelCase regexp
Removed rule that made `AAaaa` be a wikilink
2012-06-05 15:19:27 +01:00
Jeremy Ruston
e85ae59fd8 Added ability to suppress external links 2012-06-05 15:14:33 +01:00
Jeremy Ruston
9ab9c9cc42 Added run rule for HTML entities 2012-06-05 15:00:55 +01:00
Jeremy Ruston
d29f4fa996 Removed extraneous indicator that the external link parser is a block parser 2012-06-05 15:00:42 +01:00
Jeremy Ruston
10fb5fd11c Added run parse for external links 2012-06-05 14:43:43 +01:00
Jeremy Ruston
55dd392fe4 Added run parser for emphasis like bold and italics 2012-06-05 14:43:31 +01:00
Jeremy Ruston
f50e025f7c Refactored run parser so that it can optionally not consume the terminator 2012-06-05 14:41:30 +01:00
Jeremy Ruston
ec342ed245 Added image rule 2012-06-04 16:13:08 +01:00
Jeremy Ruston
c6a2083e26 Let's switch to the new parser 2012-06-04 16:12:46 +01:00
Jeremy Ruston
4f4fbbfd36 Added typed block support 2012-06-04 13:39:20 +01:00
Jeremy Ruston
537c0901e3 Fixed JavaScript line comments to be parsed as text runs 2012-06-04 13:39:10 +01:00
Jeremy Ruston
c2927eb032 Added support for unterminated runs 2012-06-04 13:38:33 +01:00
Jeremy Ruston
17c77fb3b8 Fixed element used for block code blocks 2012-06-04 12:25:08 +01:00
Jeremy Ruston
75f8abcf35 Added classes on the story macros wrapper elements 2012-06-04 12:11:18 +01:00
Jeremy Ruston
b5f5a742f4 Added support for classes on macros 2012-06-04 12:07:39 +01:00
Jeremy Ruston
47224e7a44 Adjust the templates so that they work with the new parser 2012-06-04 12:07:23 +01:00
Jeremy Ruston
7a62e6f1a4 Add quick switch for replacing old wikitext parser with the new 2012-06-02 13:19:46 +01:00
Jeremy Ruston
5276403e39 Make sure all tree nodes have an addClass method 2012-06-02 13:19:32 +01:00
Jeremy Ruston
ec933eb1b5 Completed code blocks and runs 2012-06-02 10:15:52 +01:00
Jeremy Ruston
80b2d9c9fe Ensured terminator matches take precedence over rule matches 2012-06-02 10:15:41 +01:00
Jeremy Ruston
d30b63f752 Reorganised file layout for new wikitext parser rules 2012-06-02 09:54:00 +01:00
Jeremy Ruston
1be4dc3cd9 Reorganised file layout for new wikitext parser 2012-06-02 09:53:45 +01:00
Jeremy Ruston
89b8e39f32 Added code blocks and runs 2012-06-02 09:41:21 +01:00
Jeremy Ruston
a169980a54 Fixed two bugs 2012-06-02 09:41:03 +01:00
Jeremy Ruston
a2958c5183 Refactored story tiddler JSON handling 2012-06-02 09:40:49 +01:00
Jeremy Ruston
599d01caa9 Renamed splash tiddler to StaticContent 2012-06-01 20:28:37 +01:00
Jeremy Ruston
9f4d5d8f18 Renamed splash tiddler to StaticContent
And removed some extraneous shadow tiddlers
2012-06-01 20:28:27 +01:00
Jeremy Ruston
e0725bbb52 Sort out the naming and location of shadow template tiddlers 2012-06-01 20:04:51 +01:00
Jeremy Ruston
9bc3dce953 Sort out the naming and location of shadow templates 2012-06-01 20:04:10 +01:00
Jeremy Ruston
1b5beefb8d Fixed default TW5 template 2012-06-01 18:26:55 +01:00
Jeremy Ruston
c355979ce5 Get tiddler div fields in the right order 2012-05-29 22:45:43 +01:00
Jeremy Ruston
9482717c94 Add block mode macros to tiddlytextparser
Which improves the whitespace handling for building TW2.6.x
2012-05-29 22:16:02 +01:00
Jeremy Ruston
d23fbe5ef1 Added support for TiddlyWiki old school .recipe files 2012-05-29 22:01:52 +01:00
Jeremy Ruston
3da810b2b3 Extended wiki.serializeTiddler to take a Tiddler() object as well as a title 2012-05-29 22:01:35 +01:00
Jeremy Ruston
b91ccb064b Added "prefix" filter
It selects tiddlers whose title starts with a given string
2012-05-29 22:01:07 +01:00
Jeremy Ruston
2a1b0cec00 Added "removePrefix" parameter to include macro 2012-05-29 21:59:14 +01:00
Jeremy Ruston
61936d4640 Restore further tiddler deserializers 2012-05-29 21:58:57 +01:00
Jeremy Ruston
2121ced4f3 Added new file types & stopped defaulting the content type of tiddlers 2012-05-29 21:58:44 +01:00
Jeremy Ruston
f95dd922cd Clarified comment in tiddlywiki5 template 2012-05-29 13:00:45 +01:00
Jeremy Ruston
49a3cb8ede Allow for macros and classes at both run level and block level
Involving a bit of a refactoring of the parameters to the
$tw.Tree.Macro constructor
2012-05-28 15:51:52 +01:00
Jeremy Ruston
aa4d435a67 Fixed wikitext rule for CSS classes to not erroneously match {{{ 2012-05-27 09:24:37 +01:00
Jeremy Ruston
506519b49a Switch to using the 'wikitextrule' moduletype for the new wiki text parser 2012-05-27 09:19:37 +01:00
Jeremy Ruston
5738d146e0 Amended macro mechanism so that the same wikitext rule can act as both a run rule and a block rule 2012-05-27 00:22:58 +01:00
Jeremy Ruston
9d90c8fd78 Ignore whitespace after the final block 2012-05-26 23:42:48 +01:00
Jeremy Ruston
4a9af461a6 Adding macros and prettylinks to new wikitext parser 2012-05-26 23:37:44 +01:00
Jeremy Ruston
6dae1ad35a Comment and whitespace tweaks 2012-05-26 23:37:24 +01:00
Jeremy Ruston
a9f34b8b00 Better error reporting for executing modules on the server 2012-05-26 23:37:03 +01:00
Jeremy Ruston
92353d37b2 First pass at a new wiki text parser
This one respects HTML paragraphs properly
2012-05-26 18:30:32 +01:00
Jeremy Ruston
85f1b33ef2 Docs updates 2012-05-20 18:47:11 +01:00
Jeremy Ruston
82f7a547fe Moved templates in the title hierarchy 2012-05-20 15:20:21 +01:00
Jeremy Ruston
503f60f64c Comment update 2012-05-20 15:19:52 +01:00
Jeremy Ruston
9ed82c09fd Introduce identifiers for tiddler subdirectories 2012-05-20 15:19:38 +01:00
Jeremy Ruston
bc022f2ebd Reverted to opening new tiddlers at the top of the story 2012-05-20 14:25:50 +01:00
Jeremy Ruston
5b3bdcc662 Refactoring some internal identifiers 2012-05-19 19:06:42 +01:00
Jeremy Ruston
34edb48784 A quick sweep for missing or inaccurate code comments 2012-05-19 18:23:14 +01:00
Jeremy Ruston
6a7a5a2591 JSHint-prompted tweaks 2012-05-19 15:13:17 +01:00
Jeremy Ruston
3e899d8daf Add a new scroller story view
This is the default story view
2012-05-19 12:59:16 +01:00
Jeremy Ruston
19d308dd9c Removed the zoomin story viewer for the moment 2012-05-19 12:58:47 +01:00
Jeremy Ruston
cbb813da9b Changed $tw.isBrowser to $tw.browser
This makes available browser-specific CSS prefixes
2012-05-19 11:29:51 +01:00
Jeremy Ruston
d8f17e9d6b Started adding support for storyviews that implement different navigation visualisations 2012-05-14 17:37:20 +01:00
Jeremy Ruston
0609670b94 Started adding support for storyviews that implement different navigation visualisations 2012-05-14 17:36:46 +01:00
Jeremy Ruston
e2c7df5574 Added HTTP server command 2012-05-11 17:36:04 +01:00
Jeremy Ruston
d402f4d9b2 parseText() now accepts file extensions as well as content types 2012-05-09 17:35:08 +01:00
Jeremy Ruston
92e3eb233a Corrected typed block wikitext rule 2012-05-09 17:34:45 +01:00
Jeremy Ruston
1741ea2df9 Added SVG file extension info 2012-05-09 17:34:27 +01:00
Jeremy Ruston
817c0f86f1 Added support for raw markup tiddlers 2012-05-09 13:49:01 +01:00
Jeremy Ruston
bb2d65861f Remove tab mangling from JavaScript parser 2012-05-09 13:48:45 +01:00
Jeremy Ruston
998bd07ef9 Fixed tiddler loading in the face of Windows style crlf line breaks 2012-05-09 13:48:34 +01:00
Jeremy Ruston
cfcb255c23 Added limit filter operator 2012-05-09 09:40:10 +01:00
Jeremy Ruston
d99b70e0b2 Got rid of some potentially dodgy hasOwnProperty() calls 2012-05-09 08:51:16 +01:00
Jeremy Ruston
557a7b0eba Restore the JavaScript parser 2012-05-08 19:33:04 +01:00
Jeremy Ruston
830359263d Corrected typo 2012-05-08 17:44:32 +01:00
Jeremy Ruston
468749159d Added sort order to tiddler div attributes
So that file comparisons work better
2012-05-08 17:42:49 +01:00
Jeremy Ruston
e281d5dc16 Whoops console.log 2012-05-08 16:45:37 +01:00
Jeremy Ruston
19e19a2f42 Added sort operator to filter syntax 2012-05-08 16:02:24 +01:00
Jeremy Ruston
c63eb4c045 Correct the content type for tiddlers loaded from application/x-tiddler containers 2012-05-08 15:19:42 +01:00
Jeremy Ruston
8b0703b694 Added properly compiled tiddler filters 2012-05-08 15:11:53 +01:00
Jeremy Ruston
d92dfa3d81 Some new utilities 2012-05-08 15:11:29 +01:00
Jeremy Ruston
3b2fcc83e7 Fixed problem in static wiki template 2012-05-06 14:20:52 +01:00
Jeremy Ruston
19deb60f8c Save and restore shadow stylesheets 2012-05-06 14:14:27 +01:00
Jeremy Ruston
bac2c0ec07 Added a download macro
This enables us to save changes by cooking a new tiddlywiki and forcing
a download of it
2012-05-06 13:23:29 +01:00
Jeremy Ruston
34bb7f72d7 Adjusting for the directory move arounds 2012-05-05 22:59:47 +01:00
Jeremy Ruston
9465da4335 Part two of turning the rabbit hole inside out 2012-05-05 22:57:21 +01:00