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

1829 Commits

Author SHA1 Message Date
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
121d491af2 Added experimental navbar
Notice that if you open this tiddler the links are not currently
rendered correctly because Bootstrap doesn't like the extra `<span>`
that is inserted around the links for the macro shenanigans
2012-06-09 15:09:35 +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
4afcd60b8a Fixed CSS for navigator and zoomer 2012-06-07 12:28:22 +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
fc182b5257 Update old wiki tests with correct content type 2012-06-06 20:51:49 +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
11a563dfc6 Simplified link styling 2012-06-06 11:28:45 +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
0944e5476d Docs update 2012-06-05 23:00:26 +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