1
0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-07-03 10:43:16 +00:00
Commit Graph

809 Commits

Author SHA1 Message Date
Jeremy Ruston
5df60aaa3c Don't render content or closing tag for void elements 2013-02-03 17:44:40 +00:00
Jeremy Ruston
c85acd71fe Move the void element list into the main config file 2013-02-03 17:44:28 +00:00
Jeremy Ruston
4289a027d4 Add newlines after opening and closing tags
Which also fixes the problem with the PRE tag eating it's first newline
2013-02-03 17:11:03 +00:00
Jeremy Ruston
440608bfae Remove files associated with Bootstrap 2013-02-03 16:03:22 +00:00
Jeremy Ruston
5028da3953 Better wording and button colours for password UI 2013-02-02 12:06:59 +00:00
Jeremy Ruston
47b42ac149 The special encrypted template isn't needed anymore 2013-01-31 10:23:08 +00:00
Jeremy Ruston
a9de17bd55 Restore encrypted TiddlyWiki support 2013-01-31 10:20:13 +00:00
Jeremy Ruston
def41c688f Add the "save changes" button back
And remove the not-yet-implemented "edit" button
2013-01-30 21:10:34 +00:00
Jeremy Ruston
9a71117853 Prettify JSON 2013-01-28 19:27:22 +00:00
Jeremy Ruston
07541cbd9f Correct package.json "engines" entry 2013-01-28 19:26:26 +00:00
Jeremy Ruston
32331a8764 Process DefaultTiddlers on the server as well as the browser
Thus fixing the baking of static.html
2013-01-23 12:36:42 +00:00
Jeremy Ruston
83900b0230 Fixed problem with erroneous rendering of empty HTML tags
We were doing things like `<div />`, which HTML doesn't like
2013-01-23 12:36:08 +00:00
Jeremy Ruston
bae48d5526 Stop base64 encoding context scope IDs
The base64 encoding wasn't working on node.js, and is a bit messy
2013-01-23 12:35:21 +00:00
Jeremy Ruston
d91f12f30a Turn the recipe deserialiser into a plugin in the tw2 edition 2013-01-22 08:56:21 +00:00
Jeremy Ruston
f37e99d1fb Extend fields widget to allow stripping of prefixes from tiddler titles
This functionality is a bit specific to the production of TW2, and so
might be refactored elsewise in the future.
2013-01-21 17:26:43 +00:00
Jeremy Ruston
d3fefa8b16 Fixed regexp for filtered transclusion
Previously we couldn't use filter expressions that included curly braces
2013-01-21 17:24:47 +00:00
Jeremy Ruston
7642f2182c Restored tag template 2013-01-19 17:01:17 +00:00
Jeremy Ruston
dd3433f39f Fixed problem with closing all tiddlers in a story 2013-01-18 15:36:49 +00:00
Jeremy Ruston
5e7e1fa93d Re-introduce the checkbox widget 2013-01-18 09:33:16 +00:00
Jeremy Ruston
71f6194f01 Introduce a simple listview that scrolls to newly inserted entries 2013-01-17 13:52:46 +00:00
Jeremy Ruston
94744843b6 Added new tiddler button 2013-01-17 11:38:02 +00:00
Jeremy Ruston
aba120befc Added text and bitmap editors 2013-01-17 11:30:35 +00:00
Jeremy Ruston
556473fb21 Try to get dropdown menus working again
Bootstrap doesn't like the div/span elements left behind by the view
widget
2013-01-17 11:30:14 +00:00
Jeremy Ruston
106099d991 Removed obsolete code 2013-01-17 11:29:35 +00:00
Jeremy Ruston
e024440ca8 Fixed transclude widget to only refresh when the template changes
Not when the tiddler being viewed changes; any such changes will be
picked up by embedded view widgets.
2013-01-17 11:29:21 +00:00
Jeremy Ruston
df59dee188 Removed ability for widgets to not generate any elements
It interfered with the refresh mechanism
2013-01-17 11:28:24 +00:00
Jeremy Ruston
6044995df2 Adjust copyright date 2013-01-17 11:27:08 +00:00
Jeremy Ruston
d28ee0b82a Change module type for parsers to "parser" 2013-01-16 13:56:11 +00:00
Jeremy Ruston
0e2a0068e5 Remove obsolete wikitest command 2013-01-16 13:44:27 +00:00
Jeremy Ruston
84b633acd3 Subtler shade of blue 2013-01-16 11:41:23 +00:00
Jeremy Ruston
baff901685 Added ability to transclude fields of data tiddlers
This allows us to transclude colours into CSS
2013-01-15 17:50:47 +00:00
Jeremy Ruston
965cebf195 Start using TiddlyWiki5 native styles 2013-01-06 21:40:21 +00:00
Jeremy Ruston
b19a0ac948 Add dynamic processing of stylesheets with transclusions and macros 2013-01-06 21:39:39 +00:00
Jeremy Ruston
f6b66cfad6 Simplify the page template by getting rid of the nav bar 2013-01-06 21:39:10 +00:00
Jeremy Ruston
41e8942b0c Add error message when trying to dump a non-existent tiddler 2013-01-06 21:38:38 +00:00
Jeremy Ruston
698f8dd602 Added version widget 2013-01-03 22:55:23 +00:00
Jeremy Ruston
b7b1b0a693 Improved the ViewTemplate
Including bringing back the SVG close icon
2013-01-03 22:46:47 +00:00
Jeremy Ruston
a43d7aed95 Added setstyle widget and use it to colour the tag buttons 2013-01-03 22:36:51 +00:00
Jeremy Ruston
975711e22e Fixed missing parameter 2013-01-03 22:36:33 +00:00
Jeremy Ruston
c09522fbaf Removed extraneous <p> tag from tag dropdown
…by making the <li> element be in block mode
2013-01-03 22:03:56 +00:00
Jeremy Ruston
95c9b7b114 Fixed bug with refreshing transclude widget 2013-01-03 20:54:34 +00:00
Jeremy Ruston
38782ab60c Improve tag template
We have to include fake <li> tags to keep Bootstrap's specificity rules
happy
2013-01-03 20:52:02 +00:00
Jeremy Ruston
a2dfaec054 Get rid of the extraneous <span> around link widgets 2013-01-03 20:51:28 +00:00
Jeremy Ruston
89d44e27df Refactor things so that widgets can opt not to generate an element
They have to have a single child renderer instead
2013-01-03 20:51:13 +00:00
Jeremy Ruston
1c559660d9 Fixed problem with tag dropdown list being inline rather than block 2013-01-03 18:22:52 +00:00
Jeremy Ruston
5755cd5d3f Make modal wizards work again 2013-01-03 17:06:14 +00:00
Jeremy Ruston
6d24cedbcc Refactored widget renderers to be hosted within HTML element renderers
This arrangement takes better advantage of the similarities between the
now deleted widget renderer and the element renderer. It also obviates
the need for wrapper elements around every widget.
2013-01-03 16:27:55 +00:00
Jeremy Ruston
2124dd1ac1 Add a better error message for unknown widgets 2013-01-01 18:00:02 +00:00
Jeremy Ruston
d96e0073ac Refactored widgets not to use a base class 2013-01-01 17:51:02 +00:00
Jeremy Ruston
f8340bc4dc Improvements to reveal widget popup handling 2013-01-01 16:14:42 +00:00
Jeremy Ruston
8fdeefd7d1 Added reveal macro 2012-12-31 18:36:39 +00:00
Jeremy Ruston
61eb585640 Fixed problem with HTML inline parse rule
We were incorrectly eating line breaks after self-closing inline HTML
tags
2012-12-31 18:36:13 +00:00
Jeremy Ruston
5b7cdc20ba Added beginnings of popup widget 2012-12-30 17:23:44 +00:00
Jeremy Ruston
7d5c355d9e Make the html parser rule work in block mode as well as inline mode 2012-12-30 17:21:38 +00:00
Jeremy Ruston
300b6cc485 Change widget syntax to $ instead of underscore
eg `<$list>`
2012-12-30 13:55:19 +00:00
Jeremy Ruston
dbd123675a Fixed typo 2012-12-30 13:39:07 +00:00
Jeremy Ruston
b649bebad0 Starting to add the tag popups back 2012-12-30 13:37:48 +00:00
Jeremy Ruston
f496cd540e Store macros in the render context so that they scope in the expected way 2012-12-29 23:17:09 +00:00
Jeremy Ruston
ea13652a64 Fixed subtle little typo 2012-12-29 23:16:34 +00:00
Jeremy Ruston
b9a7f0ed39 Added typed blocks 2012-12-29 22:29:24 +00:00
Jeremy Ruston
27ccb581be Don't trim macro definition bodies 2012-12-29 22:27:51 +00:00
Jeremy Ruston
12683c7d5f Removed dead code
Left over from the big parser refactoring
2012-12-29 22:27:36 +00:00
Jeremy Ruston
db0b82d4ef Fix typo in list filter type for shadow tiddlers 2012-12-28 22:57:18 +00:00
Jeremy Ruston
b006cf163f Remove the old parser code
Thus introducing a few functional regressions, but it's going to be
easier to fix things up without the old code knocking around and
getting in the way.
2012-12-28 22:08:32 +00:00
Jeremy Ruston
d6e531e87c Extend new parser mechanism to determine parser based on content type
And add an image parser and a plain text parser
2012-12-27 17:08:29 +00:00
Jeremy Ruston
c078edf468 Rename the old image parser to make room for the new one 2012-12-27 17:07:35 +00:00
Jeremy Ruston
c703fb1267 Get rid of the wikivocabulary object 2012-12-26 22:02:59 +00:00
Jeremy Ruston
cbc08fcc1c Reorganise the old parsers preparatory to replacing them 2012-12-26 20:03:33 +00:00
Jeremy Ruston
8684c375b8 Rename horizontal rule parser rule for less "rule"-based confusion 2012-12-26 19:49:01 +00:00
Jeremy Ruston
90a09c0a42 Added templates and temporary command for building TiddlyWiki with the new parser 2012-12-26 19:38:39 +00:00
Jeremy Ruston
750389bf6f New wiki syntax for the title tiddler 2012-12-26 19:37:53 +00:00
Jeremy Ruston
8d185399de Some new viewers we'll need for cooking TiddlyWiki files
This is all part of getting the new parser able to cook TiddlyWiki files
2012-12-26 19:37:33 +00:00
Jeremy Ruston
ac96b13b47 Added "fields" widget
Outputs tiddler fields through a text template.
2012-12-26 19:36:54 +00:00
Jeremy Ruston
03e46ad8f5 Add "rules" pragma for specifiying parser rules to be used for a tiddler 2012-12-26 19:35:54 +00:00
Jeremy Ruston
27c21a5edb Added trim string utility function 2012-12-26 19:35:12 +00:00
Jeremy Ruston
4953fd6c80 Adjusting test content 2012-12-26 19:34:54 +00:00
Jeremy Ruston
d0d0b53a75 Fixed typo in view template 2012-12-26 19:34:25 +00:00
Jeremy Ruston
2635b62a73 Fix bug in styleblock regexp 2012-12-26 19:33:22 +00:00
Jeremy Ruston
0e418f6e8d Fix the macro definition regexp 2012-12-26 19:33:11 +00:00
Jeremy Ruston
c1ec1578ec Make sure the parser rules have unique names 2012-12-26 19:32:54 +00:00
Jeremy Ruston
4cf1c9ed1e Fix problem with the regexp for the "dash" parser 2012-12-26 19:32:06 +00:00
Jeremy Ruston
11d001ad80 Added inline variant of filtered transclusion syntax 2012-12-23 10:47:14 +00:00
Jeremy Ruston
c3a2a24b76 Introduce filtered transclusion syntax 2012-12-23 10:37:18 +00:00
Jeremy Ruston
05ccb85759 Add template syntax for transclusion 2012-12-23 10:36:55 +00:00
Jeremy Ruston
8ef3e59416 Improved whitespace handling in classes 2012-12-23 10:36:37 +00:00
Jeremy Ruston
c31c12d698 Fix bug with extraneous dot in classed blocks 2012-12-23 10:36:25 +00:00
Jeremy Ruston
6fae946bda Replace classed blocks and runs with styled blocks and runs 2012-12-22 23:10:06 +00:00
Jeremy Ruston
982b6a8773 Switch code block syntax 2012-12-22 23:09:44 +00:00
Jeremy Ruston
8f85ef94a6 Stop using triple curly braces for code
We'll use triple curly braces for filtered transclusions, and require
backtick for code.
2012-12-22 23:09:10 +00:00
Jeremy Ruston
fa17eb1b96 Fixed support for custom attributes, classes and tooltips on transclusions 2012-12-20 17:19:28 +00:00
Jeremy Ruston
015145952d Added support for block macro calls 2012-12-20 17:03:41 +00:00
Jeremy Ruston
b0893956bc Start introducing both inline and block variants of macro calls 2012-12-20 16:55:08 +00:00
Jeremy Ruston
0cb76f6fc0 Mark each rule with its type as it is instantiated 2012-12-20 16:49:04 +00:00
Jeremy Ruston
094f8c32ca Finishing moving the parser rules about 2012-12-20 16:41:06 +00:00
Jeremy Ruston
54423e599c Moving the wikiparser rules around 2012-12-20 16:38:33 +00:00
Jeremy Ruston
42945789e9 Refactor parser rule architecture to allow individual parsers to function as both block and inline parsers 2012-12-20 16:02:03 +00:00
Jeremy Ruston
2f091fefda Removed erroneous cruft 2012-12-20 15:43:12 +00:00
Jeremy Ruston
055bdd8d8f Added inline transclusion as well as block transclusion 2012-12-20 15:07:38 +00:00
Jeremy Ruston
360e188e49 Continuing renaming run rules to inline rules 2012-12-20 12:18:38 +00:00
Jeremy Ruston
fc28ed0bbb Renaming parser "run rules" to "inline rules" 2012-12-20 12:02:35 +00:00
Jeremy Ruston
6ccf13e624 Widgets and macro calls should be spans not divs
Although it does mean that we'll end up creating divs inside spans,
which isn't strictly legal but works in all browsers
2012-12-20 10:37:51 +00:00
Jeremy Ruston
2689f6b1e5 Loosened dash formatting rule
It no longer has to be followed by whitespace, instead it must be
followed by anything other than a dash.
2012-12-20 09:26:59 +00:00
Jeremy Ruston
5c2f698842 Add parse tree helper for styling elements 2012-12-20 09:21:58 +00:00
Jeremy Ruston
36290c14fa Fix for multiple macro parameters
This is one situation where the assignment to undefined matters
2012-12-20 09:21:44 +00:00
Jeremy Ruston
bede162896 Stop using custom elements to mark widgets 2012-12-20 09:21:08 +00:00
Jeremy Ruston
a4d16488f0 Fix for .tid files that are missing a double line break 2012-12-20 09:20:44 +00:00
Jeremy Ruston
a0155763ed More demo text in the new parser page template 2012-12-15 17:35:45 +00:00
Jeremy Ruston
a63c7a8822 More parser rules 2012-12-15 17:35:35 +00:00
Jeremy Ruston
0c3c2eeec6 Improve implementation of classed runs 2012-12-15 17:35:16 +00:00
Jeremy Ruston
6ac1b7b9dc Fixed problem with renderer tree nodes that don't have children 2012-12-15 17:34:48 +00:00
Jeremy Ruston
e3462e5606 Added more parse rules 2012-12-15 11:39:58 +00:00
Jeremy Ruston
817e6f5471 Added some test content to the new wiki parser page template 2012-12-15 11:39:42 +00:00
Jeremy Ruston
60dca0f38a Added parse tree utility functions 2012-12-15 11:38:59 +00:00
Jeremy Ruston
c0e36f1129 Removed extraneous code
This was left over from before the refactoring
2012-12-15 11:38:47 +00:00
Jeremy Ruston
228ee92e95 Enhanced wiki text parser to selectively eat terminator regexp matches 2012-12-15 11:38:28 +00:00
Jeremy Ruston
7593cf1075 Cleaning up the widget refresh mechanism 2012-12-14 19:31:37 +00:00
Jeremy Ruston
966684cb13 Improved event handling for widgets 2012-12-14 17:57:53 +00:00
Jeremy Ruston
5c1caa672b Moved render() and renderInDom() into widget base class 2012-12-14 17:51:14 +00:00
Jeremy Ruston
94d1c20846 Introduced widget base class
And renamed the wiki rule base class
2012-12-14 17:38:46 +00:00
Jeremy Ruston
2522529aac Repaired accidental damage during debugging 2012-12-14 17:38:13 +00:00
Jeremy Ruston
3e06bca347 Refactor widget implementation 2012-12-14 16:01:37 +00:00
Jeremy Ruston
ac4b3ecef9 Further refactoring of createSubclassesFromModules 2012-12-14 15:51:23 +00:00
Jeremy Ruston
2bef7c2c5c Further improvements to parser rule implementation 2012-12-14 15:44:19 +00:00
Jeremy Ruston
31b283ef36 Refactoring implementation of wiki parse rules
And some documentation.
2012-12-14 13:31:47 +00:00
Jeremy Ruston
28f96de225 Added extend() utility function 2012-12-14 13:30:10 +00:00
Jeremy Ruston
d338a54370 Introduce refactored wiki parser and renderer
This is a half-way through a big refactoring of the parsing and
rendering infrastructure. The main change is to separate the parse and
render trees, which makes the code a lot cleaner. The new parser isn't
yet functional enough to replace the existing parser so for the moment
you have to manually invoke it with `$tw.testNewParser()` in your
browser console. I really ought to use branches for this kind of
thing...
2012-12-13 21:34:31 +00:00
Jeremy Ruston
916ca8eecf More utilities 2012-12-13 21:31:57 +00:00
Jeremy Ruston
ce273a22f1 More DOM utilities 2012-12-13 21:31:41 +00:00
Jeremy Ruston
7c712c4e03 Improve $tw.each() and $tw.modules.applyMethods() 2012-12-13 21:31:19 +00:00
Jeremy Ruston
a4930b7e68 Added checkbox macro 2012-11-30 09:22:17 +00:00
Jeremy Ruston
91e1a38db1 Switched to use double curly braces for transclusion
For compatbility with MediaWiki and other engines
2012-11-29 18:34:27 +00:00
Jeremy Ruston
6d09b2fb9c Improve syntax for classed runs 2012-11-29 17:23:46 +00:00
Jeremy Ruston
97f6314dbb Update the tiddler and list macros to allow the template to be specified in the body of the macro 2012-11-29 16:40:06 +00:00
Jeremy Ruston
5fd3000838 Allowed zooming in to any element with the data-tw-zoom attribute 2012-11-27 22:27:53 +00:00
Jeremy Ruston
a3c6cfdd78 Fixed width for cecily view 2012-11-27 22:27:36 +00:00
Jeremy Ruston
598c069dd6 Fixed typo 2012-11-27 22:26:35 +00:00
Jeremy Ruston
99275b5425 Improvements to zoomable pan and zoom 2012-11-27 18:30:21 +00:00
Jeremy Ruston
e4fb532ecd Introduce zoomable macro
Used with Cecily to give us pan and zoom across the Cecily canvas.
2012-11-27 16:55:17 +00:00
Jeremy Ruston
3161e8d8ce Fix problem with CecilyView that is initialised with an empty message 2012-11-26 16:24:31 +00:00
Jeremy Ruston
0154b2a54e Revised implementation of scrolling behaviour
Now we use a "tw-scroll" event to request scrolling
2012-11-26 16:08:52 +00:00
Jeremy Ruston
515e0d9bf1 Fixed bug with table parser 2012-11-26 14:19:54 +00:00
Jeremy Ruston
739b641f39 Temporary hack to the list macro
Working around our imperfect inline vs. block detection.
2012-11-26 14:19:15 +00:00
Jeremy Ruston
580bd6438e Fixed issues with blank tiddler text
The empty string is falsy in JavaScript, to keep us on our toes.
2012-11-23 13:08:10 +00:00
Jeremy Ruston
3d38d4add3 Use text/x-tiddlywiki for old format TiddlyWiki text for compatibility 2012-11-19 16:58:16 +00:00
Jeremy Ruston
17e67a5bf9 Add a simple log wrapper
We'll make it more sophisticated at some point
2012-11-19 16:55:10 +00:00
Jeremy Ruston
0d175d3eeb New utility method
Surprising that this seems to be the recommended approach
2012-11-19 12:55:04 +00:00
Jeremy Ruston
f07bc18204 More MIME type shenanigans 2012-11-18 15:25:40 +00:00
Jeremy Ruston
84650b9a54 Swap over to the new mime type conventions
Discussed in
https://groups.google.com/forum/#!topic/tiddlywikidev/re8xfLqZNCE
2012-11-18 15:22:13 +00:00
Jeremy Ruston
41db3d89ae Use the plain text parser to display HTML files
We could display the HTML in an IFRAME but I think that's often not
what people want
2012-11-18 14:57:10 +00:00
Jeremy Ruston
addef09d1c Fix problem with JS parser crashing on skinny tiddlers 2012-11-18 14:56:33 +00:00