Jeremy Ruston
829909bffa
New hide macro
...
Used for selectively hiding blocks of content
2012-06-20 17:40:41 +01:00
Jeremy Ruston
f5a9df1ae3
Fixed event handler
2012-06-20 17:40:08 +01:00
Jeremy Ruston
2881b138a3
Fixed the transclude macro so that it is marked dependent all
2012-06-19 18:22:27 +01:00
Jeremy Ruston
16dc26b6e8
Fixed the reveal macro so that is marked dependentAll
2012-06-19 18:21:58 +01:00
Jeremy Ruston
5627e731b1
Comment update
2012-06-19 18:01:39 +01:00
Jeremy Ruston
9d39e9a5f1
A better fix for refreshing nested macros
2012-06-19 16:56:55 +01:00
Jeremy Ruston
2282a825ec
Extraneous var
2012-06-19 16:56:40 +01:00
Jeremy Ruston
14f4465b30
Semi-colon
2012-06-19 16:56:29 +01:00
Jeremy Ruston
84b6020f2a
Ensured we remove the popup click handler
2012-06-19 16:50:10 +01:00
Jeremy Ruston
5103f1585b
New popup cancelling mechanism
2012-06-19 16:47:35 +01:00
Jeremy Ruston
08d7a12d04
Finishing off the text reference support
2012-06-19 16:47:25 +01:00
Jeremy Ruston
8b17874db4
Fixed automatic refreshing for macro nodes
2012-06-19 16:47:10 +01:00
Jeremy Ruston
b17a43707d
Ensure that the view macro doesn't generate a pair of nested macros
...
Because that will stop the refresh mechanism from working
2012-06-19 16:46:50 +01:00
Jeremy Ruston
1963c56fa9
Adjust the parent stack for transclusion
...
This enables the dropdowns to work a bit better
2012-06-19 10:59:58 +01:00
Jeremy Ruston
cabc11d517
Use the transclude macro instead of list tagging in the tag popup
2012-06-19 10:40:30 +01:00
Jeremy Ruston
ec3f16f50f
Enabled sorting by title of tiddlers that don't exist
2012-06-19 10:40:05 +01:00
Jeremy Ruston
642703986a
Changed filter logic to allow selection of non-existent tiddlers
2012-06-19 10:39:44 +01:00
Jeremy Ruston
83eb368f40
Temporarily removed the popup zapper
...
This implementation is too slow and cumbersome; we'll replace it with
something else soon
2012-06-19 10:39:13 +01:00
Jeremy Ruston
0d928c05a5
Added new transclude wikitext rule and macro
...
Which allows us to get rid of the tags macro
2012-06-19 08:57:29 +01:00
Jeremy Ruston
381d0715e9
The beginnings of support for text references
2012-06-19 08:56:15 +01:00
Jeremy Ruston
f4e36e9539
Improved filter support
...
Now there is a "current tiddler" that can be referenced as
`[is[current]]`, and a new `[tags[]]` operator.
2012-06-19 08:55:56 +01:00
Jeremy Ruston
04989a5ceb
Made the chooser slightly less broken
2012-06-16 19:02:56 +01:00
Jeremy Ruston
49cc644293
Whitespace
2012-06-16 19:02:44 +01:00
Jeremy Ruston
6745c7fbf7
Better to use terminating semicolons after each style specifier
...
More compatible with TW2 too
2012-06-14 19:03:51 +01:00
Jeremy Ruston
b41a1cb4de
Fixed problem with styled block wikitext rule
2012-06-14 18:49:51 +01:00
Jeremy Ruston
11c9031873
Added support for style blocks
2012-06-14 18:18:32 +01:00
Jeremy Ruston
fa279514c7
Made the class block rule do it's own class assignment
2012-06-14 17:40:27 +01:00
Jeremy Ruston
abd510442a
Typo
2012-06-14 17:28:14 +01:00
Jeremy Ruston
52f59a4eb4
Medium-sized refactoring of macro architecture
...
Now event handlers are attached to element nodes, not to macro nodes.
2012-06-14 17:15:38 +01:00
Jeremy Ruston
6765d3c04d
Tidying up
2012-06-14 15:05:16 +01:00
Jeremy Ruston
27f77f729f
Clearer name for the state tiddler
2012-06-14 11:36:41 +01:00
Jeremy Ruston
3584d854aa
Add case sensitive sorting
2012-06-14 11:36:26 +01:00
Jeremy Ruston
6c285b04de
Update the recipe handling to use the right wiki object
2012-06-14 11:36:10 +01:00
Jeremy Ruston
acad64a933
Added a case insensitive sort to the filters
...
Hoping to come up with a better syntax for this
2012-06-14 11:35:54 +01:00
Jeremy Ruston
513fa6f756
Fixed problem with tag dropdowns in Firefox
2012-06-13 16:43:08 +01:00
Jeremy Ruston
474212dade
And now the tag popups hide themselves after being used
2012-06-13 16:21:08 +01:00
Jeremy Ruston
ccfa7e1322
Fixed the appearance of tag dropdowns
2012-06-13 16:09:07 +01:00
Jeremy Ruston
161ddcb473
Made it so clicking outside a popup cancels the popup
...
Clicking inside still doesn't cancel it, though
2012-06-13 15:37:07 +01:00
Jeremy Ruston
c168ec0ad4
Allow macros to specify capturing event handlers
2012-06-13 15:36:16 +01:00
Jeremy Ruston
28fd037c47
Got the tag dropdowns working
...
They don't get dismissed correctly, though
2012-06-13 13:19:55 +01:00
Jeremy Ruston
a160fb07e4
Sort tagged tiddlers
2012-06-13 13:19:32 +01:00
Jeremy Ruston
558aaf338f
Fixed issue with textnodes ignoring insertBefore parameter
2012-06-13 10:41:36 +01:00
Jeremy Ruston
0830cdac73
Mo' comments
2012-06-13 10:41:10 +01:00
Jeremy Ruston
caf32d9598
Instituted minimum height for edit textareas
2012-06-13 09:27:58 +01:00
Jeremy Ruston
e5b6d9a722
Adjusted tag dropdown
...
Slowly getting the tag dropdowns working properly
2012-06-13 09:12:41 +01:00
Jeremy Ruston
c3c0abd864
Add reveal macro that shows or hides content depending on the value of a tiddler
2012-06-13 09:12:09 +01:00
Jeremy Ruston
797544c1f9
Adapted button macro so that it can also toggle the value of a tiddler
...
We're splitting the slider macro up into its two constituent parts
2012-06-13 09:11:50 +01:00
Jeremy Ruston
fb5d7793ab
Added tagging option to list macro
2012-06-13 09:11:19 +01:00
Jeremy Ruston
0641685fc8
Fixes for tags macro
2012-06-13 09:10:50 +01:00
Jeremy Ruston
84a352b804
Added wiki.getTiddlersWithTag()
...
We should probably use the filter mechanism for this...
2012-06-13 09:10:03 +01:00
Jeremy Ruston
d2b62eabbe
Further tweaks to the still broken zooming chooser
2012-06-11 22:04:21 +01:00
Jeremy Ruston
f59c24f053
Change chooser macro to use embedded content
...
Not quite done with this yet.
2012-06-11 17:37:34 +01:00
Jeremy Ruston
a4a2b27749
Whitespace!
2012-06-11 17:36:40 +01:00
Jeremy Ruston
e5ba101ebe
Fixed problem with view macro generating null content
...
Avoids errors better to generate empty content
2012-06-11 17:36:28 +01:00
Jeremy Ruston
901b212a66
Fixed zooming chooser
2012-06-11 13:08:16 +01:00
Jeremy Ruston
ed70b4a34b
Removed unnecessary class from PageTemplate
2012-06-11 13:07:51 +01:00
Jeremy Ruston
bf85908d5e
Fixed problem with setting classes on list and story macros
2012-06-11 13:06:22 +01:00
Jeremy Ruston
6448c70984
Refactor zoomer macro to take into account CSS classes
2012-06-11 13:05:57 +01:00
Jeremy Ruston
00050c3c21
Keep JSHint happy
2012-06-11 12:46:58 +01:00
Jeremy Ruston
9f86f98cb1
Got the zooming navigator working again
...
Albeit, it doesn't play well with the fixed navbar
2012-06-11 12:44:10 +01:00
Jeremy Ruston
086feb31dc
Make scroller work on Firefox
2012-06-11 12:01:49 +01:00
Jeremy Ruston
d0a9bfd0f0
Unhyphenate CSS property names when rendering to the DOM
...
Annoyingly, Chrome will happily accept `background-color` and
`backgroundColor` interchangeably, so I hadn't noticed that this was
broken...
2012-06-11 10:41:13 +01:00
Jeremy Ruston
45cf175b8b
Made sorting be case insensitive
2012-06-10 22:53:29 +01:00
Jeremy Ruston
ef8b9d81de
Added navbar to PageTemplate
2012-06-10 22:02:16 +01:00
Jeremy Ruston
006efb0d44
Add div around body in ViewTemplate
2012-06-10 22:01:53 +01:00
Jeremy Ruston
fc49d7dffd
Added tags and color macros
...
Which enables us to do nice colour coded tags. Soon they'll have a drop
down on them too
2012-06-10 19:47:24 +01:00
Jeremy Ruston
2d94e466ae
Bump up the version number
...
As we're going so fast now
2012-06-10 18:12:33 +01:00
Jeremy Ruston
18ae0c5922
Adjustments to default tiddler templates
2012-06-10 18:09:34 +01:00
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
