mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-30 05:19:57 +00:00
Code Issues Releases Wiki Activity
11,555 Commits 101 Branches 68 Tags 91 MiB
8e9d8d4fef
Commit Graph

2885 Commits

Author SHA1 Message Date
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
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
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
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
b19a0ac948 Add dynamic processing of stylesheets with transclusions and macros 2013-01-06 21:39:39 +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
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
95c9b7b114 Fixed bug with refreshing transclude widget 2013-01-03 20:54:34 +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
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
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
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
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
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
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
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
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
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
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
Jeremy Ruston
605a7a4124 Fixed problem with missing macros throwing an error 2012-11-18 13:43:06 +00:00
Jeremy Ruston
5c87b437ee Support for lazy loaded tiddlers 2012-11-18 13:14:28 +00:00
Jeremy Ruston
4742ab14fc Start using the server connection tiddler to store host details 2012-11-17 21:15:19 +00:00
Jeremy Ruston
e194aed449 Introduce syncer mechanism 2012-11-17 20:18:36 +00:00
Jeremy Ruston
705c88d1aa Fix TiddlyFox transfer attribute names 2012-11-17 20:17:29 +00:00
Jeremy Ruston
0dbe4c0291 Get rid of more vestiges of the old empty generation mechanism 2012-11-16 22:40:25 +00:00
Jeremy Ruston
544711fe59 Improved copy writing 
Marginally better
 2012-11-16 19:36:50 +00:00
Jeremy Ruston
a4d88769b9 Only use the download saver when the download attribute is supported 2012-11-16 19:31:32 +00:00
Jeremy Ruston
80bd198908 Introduce new manualdownload saver 
This saver pops up a modal dialogue giving the user an opportunity to
right click and save the wiki
 2012-11-16 19:31:18 +00:00
Jeremy Ruston
b96bcfdca4 Improve the modal dialogue to optionally include a download button 2012-11-16 19:30:30 +00:00
Jeremy Ruston
b74df6d1b0 Remove the old Firefox XUL saver 
It's only of historical interest now, sadly.
 2012-11-16 18:06:45 +00:00
Jeremy Ruston
bf04207350 Rename the wikitext parser 2012-11-15 12:53:10 +00:00
Jeremy Ruston
5f9b2e9d84 Turn the TiddlyWiki 2.x.x parser into a plugin 2012-11-15 12:47:09 +00:00
Jeremy Ruston
26822121be Update the dump config command 2012-11-15 12:46:53 +00:00
Jeremy Ruston
1e51f56754 JSHint obeisance 2012-11-15 12:38:25 +00:00
Jeremy Ruston
539b64b626 Refactoring module mechanism 
Changed the data structure $tw.modules.types to make it possible to
detect repeated registrations
 2012-11-14 11:23:43 +00:00
Jeremy Ruston
3b11713e88 Refactoring plugin implementation 
Including introducing the terminology "tiddler bundles"
 2012-11-12 22:16:49 +00:00
Jeremy Ruston
481b58eec9 Fixed crash when no browser-startup modules 2012-11-12 22:15:22 +00:00
Jeremy Ruston
f1089c1c92 Use temporary tiddlers for popup locations 2012-11-11 15:03:34 +00:00
Jeremy Ruston
cf15b128c1 Fixed problem with relativedate field viewer 2012-11-11 14:40:49 +00:00
Jeremy Ruston
9612aac296 New implementation for shadow tiddlers 
Now shadow tiddlers are any tiddler whose title starts with "$:/"
 2012-11-11 14:31:45 +00:00
Jeremy Ruston
d7d6e59865 Beginnings of support for syncing 2012-11-11 14:13:08 +00:00
Jeremy Ruston
030f16981a Tiddler helper method to return a block of fields 2012-11-11 14:12:10 +00:00
Jeremy Ruston
d3e6a0cdf0 Move the slowInSlowOut easing function into utils 2012-11-08 18:34:04 +00:00
Jeremy Ruston
56c8dc2226 Fixed problem with navigators that don't have a story or history 2012-11-07 16:12:03 +00:00
Jeremy Ruston
34435329e6 Added indirect transclusion 
The name of the tiddler to transclude is taken from a text reference
 2012-11-07 16:11:47 +00:00
Jeremy Ruston
6c636a671d Remove zoomer and chooser 2012-11-06 17:51:19 +00:00
Jeremy Ruston
9f6909ddc4 Appeasing the gods of JSHint 2012-11-06 17:21:56 +00:00
Jeremy Ruston
c58903f865 Added hover functionality to button and link macros 2012-11-06 14:11:49 +00:00
Jeremy Ruston
034af3b126 Added new "aboveright" position for reveal macro 2012-11-06 14:11:32 +00:00
Jeremy Ruston
083ac7a4bf Encapsulate logic for handling popups 2012-11-06 14:11:11 +00:00
Jeremy Ruston
b81b2c0c63 Fixed problem with tiddler hashmap handling 
We need to check hasOwnProperty to avoid problems with tiddlers called
eg "__proto__". There are more changes like this to come
 2012-11-06 14:10:55 +00:00
Jeremy Ruston
bb10222b8d Added fields macro and put it in the default view template 2012-11-05 19:00:54 +00:00
Jeremy Ruston
6819365dfc Fixes for sideways view 
Fixed problem with starting up with the empty message displayed, and
problem with incorrect width reading of newly inserted list elements
 2012-11-05 15:14:27 +00:00
Jeremy Ruston
c95618e42c Fix for list macro 
Hardens findListElementByTitle to work when the empty message is
displayed
 2012-11-05 15:13:51 +00:00
Jeremy Ruston
04223a3d81 Remove transform at end of classic list view insertion animation 
Leaving the transform makes a new positioning context without updating
offsetParent
 2012-11-04 17:28:51 +00:00
Jeremy Ruston
96145982d9 Fix navigation through list macro entry 2012-11-04 17:28:21 +00:00
Jeremy Ruston
c58a75f834 Fixed issue with dropbox positioning 
On webkit, applying a perspective appears to set up a new positioning
context without updating offsetParent.
 2012-11-04 17:02:01 +00:00
Jeremy Ruston
7a7f293579 Fixed typo 2012-11-03 20:34:39 +00:00
Jeremy Ruston
2ad3e10188 And use the proper form of -webkit-overflow-scrolling 2012-11-03 17:36:27 +00:00
Jeremy Ruston
80ce9f01f9 Only have scrollbars when we need them 2012-11-03 17:35:31 +00:00
Jeremy Ruston
3d747499cb More enhancements to listview animations 
Now we've got navigation scrolling back
 2012-11-03 16:14:00 +00:00
Jeremy Ruston
5443c8243a Lots of tweaks to list view animations 
There's a regression in that navigation animations are currently not
working
 2012-11-03 12:34:36 +00:00
Jeremy Ruston
4bff67007d Introduce sprite handler mechanism 
For flying things around the page
 2012-11-03 12:33:21 +00:00
Jeremy Ruston
22a2651660 Move the animation preferences to the top of the file for ease of access 2012-11-03 12:32:46 +00:00
Jeremy Ruston
072c06b412 Fixed issue #46 2012-10-28 20:51:18 +00:00
Jeremy Ruston
46a1dd662c Fixed unrendered field link view links 
Fixing #39
 2012-10-28 20:43:33 +00:00
Jeremy Ruston
77c2804684 Removed extraneous console.log 2012-10-28 18:52:14 +00:00
Jeremy Ruston
cfb3b42438 More refactoring of relativedate implementation 2012-10-28 18:41:48 +00:00
Jeremy Ruston
c0a00f856e Fixed typo 2012-10-28 18:41:31 +00:00
Jeremy Ruston
c6add09e54 Add a relative date field viewer 
With a bit of attendant refactoring
 2012-10-28 18:18:05 +00:00
Jeremy Ruston
ecd933dd25 Add support for relative dates 
Including: setting date on save tiddler and adding a date to HelloThere
 2012-10-28 14:15:07 +00:00
Jeremy Ruston
931bea1194 Fixes to classic and sideways list views 2012-10-28 14:13:38 +00:00
Jeremy Ruston
66087085e7 Whoops, accidentally left some debug commenting out 2012-10-28 09:51:59 +00:00
Jeremy Ruston
607cb49e6e Better animations for the sideways list view 2012-10-28 09:51:19 +00:00
Jeremy Ruston
d39ad8fff9 Tweak the classic view navigation animation 2012-10-28 09:30:45 +00:00
Jeremy Ruston
1bfa4ca00e Tweak Cecily startup routine 
We were making too many assumptions about the DOM layout
 2012-10-28 09:06:54 +00:00
Jeremy Ruston
c030f735a8 Keep the new tiddler positioning nozzle within the Cecily map 2012-10-28 08:54:31 +00:00
Jeremy Ruston
07c5a43404 Re-introduce the sideways view 
And further related tweaks
 2012-10-28 08:46:35 +00:00
Jeremy Ruston
f2460a3744 Added simple insertion and deletion animations to cecily view 2012-10-27 19:30:16 +01:00
Jeremy Ruston
c95cf6b4b0 Added map parameter to list macro for the listviews to use 2012-10-27 16:06:30 +01:00
Jeremy Ruston
416ab0c060 Removed startup history list processing 
Not needed anymore
 2012-10-26 22:51:54 +01:00
Jeremy Ruston
e97f778af4 Now we've got scrolling for navigation in classic view 2012-10-26 22:20:06 +01:00
Jeremy Ruston
324a87a8a2 Further refinements to the list mechanism 
Much better navigation animation for classic view
 2012-10-26 22:12:40 +01:00
Jeremy Ruston
865e26bbce Extraneous console.log 2012-10-26 22:12:23 +01:00
Jeremy Ruston
8730c76884 Saving maps in CecilyView 2012-10-26 17:57:57 +01:00
Jeremy Ruston
187b6bfa4d Make sure newly inserted classic view list elements get their height reset to auto after being animated 2012-10-26 17:43:52 +01:00
Jeremy Ruston
858fde3b59 Fixed iffy scrolling during navigation 2012-10-26 17:35:03 +01:00
Jeremy Ruston
9797c6aada Tweaks to the listviews 
Cecily gets a bit better, and we start to handle navigation events.
Scrolling seems to still be a bit iffy
 2012-10-26 17:19:34 +01:00
Jeremy Ruston
dd6e7d7e10 Cecily updates 2012-10-26 14:01:49 +01:00
Jeremy Ruston
3dcada04d4 Extraneous console.log 2012-10-26 14:01:38 +01:00
Jeremy Ruston
7027c30a32 Typo 
We don't want these macros to be executed when this comment is displayed
 2012-10-26 14:01:27 +01:00
Jeremy Ruston
b1f3d169fb Fix classic list viewer to use the new browser abstraction layer 2012-10-26 14:01:11 +01:00
Jeremy Ruston
da43887d7c Add the ability to set classes on list elements 2012-10-26 14:00:56 +01:00
Jeremy Ruston
031e3b8b80 Updates to CecilyView and browser.js 2012-10-26 10:28:32 +01:00
Jeremy Ruston
f418f5493e Bring in a demo area for the Cecily view 2012-10-25 23:05:26 +01:00
Jeremy Ruston
5a58639131 Get rid of the old story macro, and tidy up 2012-10-25 22:44:41 +01:00
Jeremy Ruston
ba4e140147 Fixed problem with retrieving non-existent list tiddlers 2012-10-25 22:44:00 +01:00
Jeremy Ruston
7c76ec02c2 Better programmatic CSS handling 2012-10-25 22:20:27 +01:00
Jeremy Ruston
950b46276e Start updating the browser prefix stuff 
The old way led to code that was too long and unreadable.
 2012-10-25 14:58:32 +01:00
Jeremy Ruston
cbfc96cabd Simplify unhyphenating CSS properties 2012-10-25 14:57:48 +01:00
Jeremy Ruston
e063ec6b1a Added new getTiddlerList() method to wiki 2012-10-25 14:57:33 +01:00
Jeremy Ruston
122c69dfc1 Tweaks to animation speed setting 2012-10-25 13:33:21 +01:00
Jeremy Ruston
723fbf12ce Minor tweaks to navigator 2012-10-25 13:04:03 +01:00
Jeremy Ruston
73bcb1c31e Rename the file, too 2012-10-25 12:57:15 +01:00
Jeremy Ruston
6d397edf30 Rename the navigationcatcher macro to navigator 2012-10-25 12:55:36 +01:00
Jeremy Ruston
7c19b9f5a3 Remove old navigator macro 
We'll rename the new one to "navigator" afterwards
 2012-10-25 12:53:32 +01:00
Jeremy Ruston
ccf93118ba Fixes for new tiddler positioning 2012-10-24 23:03:06 +01:00
Jeremy Ruston
8d67bcb718 Fixes for navigation 2012-10-24 22:50:15 +01:00
Jeremy Ruston
e88da55683 Fixes for the new tiddler button 2012-10-24 22:39:37 +01:00
Jeremy Ruston
ce4a14c68a Fixed tiddler styling issues 2012-10-24 22:28:25 +01:00
Jeremy Ruston
999d63c0f0 Add a cecily view 
Finally, the start of a proper 2D ZUI view. It's going to replace the
current "zoomin" storyview
 2012-10-24 22:15:57 +01:00
Jeremy Ruston
d1c396507b Update the PageTemplate to use the list macro instead of the story macro 
We're going to drop the story macro, which will break some things in
the short term. But it's awesome to be using the one macro for so many
different purposes (the main story, the tags listing, recent changes,
etc.)
 2012-10-24 22:15:16 +01:00
Jeremy Ruston
3647690308 Fixed typo in the list macro 
Pesky dots and dashes
 2012-10-24 22:13:44 +01:00
Jeremy Ruston
5f17e7d01b Fixed problem with list filter 
It was failing if the list tiddler was missing
 2012-10-24 22:11:23 +01:00
Jeremy Ruston
fc6e563c17 Fixed problem with the --server command 
I hadn't updated the code since using parametic substitution in the
main template
 2012-10-24 22:11:01 +01:00
Jeremy Ruston
c160c69187 Fixes to the insertion classic listview animation 2012-10-23 18:45:26 +01:00
Jeremy Ruston
e3f6a33157 First version of the "classic" listview 2012-10-23 18:19:20 +01:00
Jeremy Ruston
c087228b33 Starting to introduce list views 
These are custom modules for visualising list manipulations and
navigations
 2012-10-23 17:13:47 +01:00
Jeremy Ruston
5ced636abf Rename "viewer" modules to "fieldviewer" 2012-10-23 16:40:22 +01:00
Jeremy Ruston
91bebe7b7f Tweak the standard list filters 2012-10-23 16:28:53 +01:00
Jeremy Ruston
3a710ad9ce Fix problem with sortTiddlers 2012-10-23 16:28:38 +01:00
Jeremy Ruston
8d4be5934b Fixed problem with tags field being set to "undefined" for blank tiddlers 2012-10-21 16:50:37 +01:00
Jeremy Ruston
261ee54b5c About time we had a "new tiddler" button 2012-10-21 16:44:53 +01:00
Jeremy Ruston
4c9c74586c A function for displaying relative dates 2012-10-20 14:23:57 +01:00
Jeremy Ruston
092e495e90 Fixes the text reference parsing 2012-10-18 23:20:27 +01:00
Jeremy Ruston
f4f042d2be Fix to transclusion viewer 2012-10-18 18:59:57 +01:00
Jeremy Ruston
971bc68163 Fixed search bug 2012-10-18 18:27:58 +01:00
Jeremy Ruston
cd04fa22c6 Introduce extensible viewer modules for the view macro 2012-10-18 18:27:27 +01:00
Jeremy Ruston
7d60c8f55e Get ready to extend the view macro to use plugins for each view format 2012-10-18 15:53:01 +01:00
Jeremy Ruston
10ed746209 Seach titles as well as bodies 2012-10-18 10:51:52 +01:00
Jeremy Ruston
caaa798ced Support search terms vs. literal search 
Search terms like "one two" are searched like Google, returning
tiddlers with both terms
 2012-10-17 20:38:36 +01:00
Jeremy Ruston
1a74d8526f Temporarily disable the search popup focus handling 
Just so that search works again
 2012-10-17 19:12:05 +01:00
Jeremy Ruston
5e2c3db385 Getting ready for using RegExp for search 
So that we can do case insensitivity and partial matches
 2012-10-17 19:10:48 +01:00
Jeremy Ruston
81a565e608 Starting to get the behaviour of the search popup more correct 2012-10-17 19:10:18 +01:00
Jeremy Ruston
42d4be3f20 Search improvements 
1. Extended edit macro to allow a search-styled input to be used
2. Moved search box into nav bar
 2012-10-17 18:03:17 +01:00
Jeremy Ruston
915caf2a18 Improvements and fixes to search 2012-10-17 14:57:13 +01:00
Jeremy Ruston
0982bcbf45 Added function to search a wiki 
Crude at the moment
 2012-10-17 14:34:59 +01:00
Jeremy Ruston
89819f533f Added filter to search for text in a given tiddler 
eg [searchVia[mySearchTermTiddler]] will return all the tiddlers
containing the string in the mySearchTermTiddler.
 2012-10-17 14:34:34 +01:00
Jeremy Ruston
5ef77ae3dd Removing dead code 2012-10-16 23:06:53 +01:00
Jeremy Ruston
3e4945b033 Improving comments 2012-10-16 23:06:45 +01:00
Jeremy Ruston
541261f14d Removing dead code 2012-10-16 23:06:37 +01:00
Jeremy Ruston
dd6fddad01 Added support for the empty message to the list macro 2012-10-16 21:42:36 +01:00
Jeremy Ruston
343a2c2340 Fixed problem with sorting by missing fields 2012-10-16 21:41:12 +01:00
Jeremy Ruston
456b8f9ba8 Fixed list macro to work properly in inline mode 2012-10-16 19:14:04 +01:00
Jeremy Ruston
a832338bb6 Add a function to check whether a tiddler has a given field 2012-10-16 19:12:09 +01:00
Jeremy Ruston
f0974740db Improvements to list macro 
Allow shorthand list types, and cope with no template being specified
 2012-10-16 19:06:52 +01:00
Jeremy Ruston
bd5995b2e4 Deprecate the old transclude macro 2012-10-16 18:51:17 +01:00
Jeremy Ruston
dcac40ac31 Change the transclude wikitext rule to use the list macro 2012-10-16 18:50:44 +01:00
Jeremy Ruston
cb3741c8ee Refactored list macro 
Now does selective refreshing, improving performance in several areas.
(Classic TW always refreshed lists in their entirety). A bit more to
do, but the plan is that this can replace the story macro, too
 2012-10-16 18:50:32 +01:00
Jeremy Ruston
3a4288899d Correction to error message 2012-10-16 18:49:23 +01:00
Jeremy Ruston
35ddf7a81c Update the password macro so that it can be used on the server 2012-10-16 18:49:13 +01:00
Jeremy Ruston
03623587e1 Added list filter operator 2012-10-16 11:25:14 +01:00
Jeremy Ruston
e9f262b9df Remove the experimental template mapping system 
Unnecessarily complicated and JSONy
 2012-10-16 10:14:41 +01:00
Jeremy Ruston
242884c918 Temporary fix for the transclude macro 
Change of plan; the list macro is now going to be refactored to
incorporate the functionality of the transclude and story macros as well
 2012-10-16 10:14:11 +01:00
Jeremy Ruston
24f0a580b5 Refine macro parameter test 2012-10-16 08:46:29 +01:00
Jeremy Ruston
5a3e2ce438 Refactor story macro to use reexecuteInDom() 2012-10-15 22:02:12 +01:00
Jeremy Ruston
4530eaf24a Update transclude parser rule to use the tiddler macro for single tiddlers 2012-10-15 19:03:05 +01:00
Jeremy Ruston
62fac05411 Renamed the templateTitle parameter of the transclude macro for consistency with the tiddler macro 2012-10-15 19:02:49 +01:00
Jeremy Ruston
1c699c7118 Update the tiddler macro to have a templateText parameter 2012-10-15 18:46:47 +01:00
Jeremy Ruston
4ad8859864 Beginnings of refactoring the transclude macro 
We want to make it selectively refresh for better performance
 2012-10-15 18:46:33 +01:00
Jeremy Ruston
80cbe2a98f Refactor out the reexecuteInDom() method of macros 2012-10-15 18:46:04 +01:00
Jeremy Ruston
fd4ff10bf3 Added $tw.utils.pulse() for animating elements 
To make it easier to see things while debugging
 2012-10-15 17:18:32 +01:00
Jeremy Ruston
d4b2ab4a5f Add a serialisation for preloading a tiddler 2012-10-12 19:01:19 +01:00
Jeremy Ruston
63e486298c Fixed typo in link macro 2012-10-11 14:56:22 +01:00
Jeremy Ruston
1896063788 Added plain module serialiser 
Needed when we pack lots of modules into a single .js file
 2012-10-10 16:32:55 +01:00
Jeremy Ruston
bf75735db9 Several fixes 
1. Made crypto module optional
2. Moved hasOwnProperty into boot kernel
3. Fixed handling of modules in the browser
 2012-10-10 16:32:37 +01:00
Jeremy Ruston
6b6def8725 Fixed the view macro to fail silently if the target tiddler doesn't exist 2012-10-10 10:45:58 +01:00
Jeremy Ruston
fc19a77353 Added support for PDF images 2012-10-10 10:45:39 +01:00
Jeremy Ruston
b9e5171da6 Allow template overrides for the story 2012-09-14 17:29:30 +01:00
Jeremy Ruston
52f9e495ae Add ability for link macro to link through a given field 
This is a bit of a hack, and a more harmonious way of doing this is
planned
 2012-09-14 17:29:17 +01:00
Jeremy Ruston
238946b32b Update story macro to use rules to choose templates 
Now special mapping tiddlers are used to determine which templates are
used for a given tiddler
 2012-09-12 15:33:11 +01:00
Jeremy Ruston
7b4da4319a Allow filterTiddlers to be used on a hashmap of tiddlers 2012-09-12 15:32:26 +01:00
Jeremy Ruston
c39654917f Added support for browser startup modules 2012-09-12 10:46:28 +01:00
Jeremy Ruston
8386607092 Added feature detection for HTML5 full screen mode 2012-09-12 10:45:23 +01:00
Jeremy Ruston
e637b54f36 Add password handling to server 2012-09-02 21:00:24 +01:00
Jeremy Ruston
3070357d70 Refactor serialisers to work on an array of tiddlers 2012-09-02 20:28:32 +01:00
Jeremy Ruston
7a15b6f97a Fixed mis-renaming of tiddlywiki.files 2012-08-31 15:09:33 +01:00
Jeremy Ruston
ed3a10f043 Renamed tiddlywiki.plugin files to tiddlywiki.files 
Because we're just about to use the name `tiddlywiki.plugin` for
exploded plugin folders
 2012-08-31 15:04:08 +01:00
Jeremy Ruston
a3694d8cb3 Removed extraneous console.log 2012-08-30 08:40:00 +01:00
Jeremy Ruston
68f7072c94 TiddlyFox now saves with TiddlyWiki5 as well as TiddlyWiki Classic 2012-08-29 22:40:58 +01:00
Jeremy Ruston
389b6513b6 Fixed wiki.saveWiki to pass the correct parameters to the template 2012-08-25 17:32:43 +01:00
Jeremy Ruston
44bef260f0 Change tiddler macro to use parseTiddler parameter substitution 2012-08-25 14:16:33 +01:00
Jeremy Ruston
52a51b79aa Extraneous variable definition 2012-08-25 14:16:21 +01:00
Jeremy Ruston
1db72ea931 Add support for parameter substitutions to the savetiddler command 2012-08-25 12:07:15 +01:00
Jeremy Ruston
175d7c67fd Moved support for parameter substitution into wiki.parseText() 
We'll later refactor the same logic out of the tiddler macro
 2012-08-25 12:05:57 +01:00
Jeremy Ruston
1d6eba3071 Add "transclude" format for the view macro 
Uses the value of the field as the title of a tiddler to transclude
 2012-08-23 12:31:16 +01:00
Jeremy Ruston
8e6647b615 Initial tranche of the plugin implementation 
This first commit adds some of the code needed for the plugin
mechanism, but it isn't all fully operational yet. I'm merging the
branch so that I can get some other pre-requisites done quickly on the
main branch, and then plan to return to this branch.
 2012-08-06 22:34:16 +01:00
Jeremy Ruston
daff9c10f3 Tighten terminology for plugins vs. modules 
"Plugins" are bundles of tiddlers managed as one, "modules" are
JavaScript tiddlers with a module type identifying when and how they
should be executed.
 2012-08-03 15:09:48 +01:00
Jeremy Ruston
c11743088a Niceties for JSHint 2012-08-02 22:32:34 +01:00
Jeremy Ruston
1f52b40cb6 Added parser rule for HTML format comments 
And try it out in the PageTemplate, which is getting pretty
unintelligable
 2012-08-02 22:06:52 +01:00
Jeremy Ruston
1f64a9e758 Added node.js version check and related refactorings 2012-08-02 14:32:38 +01:00
Jeremy Ruston
377d84185a Missed off previous commit 2012-07-22 22:07:26 +01:00
Jeremy Ruston
a2caf46b1e Added new wiki methods for reading and writing a toddler as data 2012-07-22 22:03:06 +01:00
Jeremy Ruston
cc59a49b39 Improved rounder close icon 2012-07-20 22:09:34 +01:00
Jeremy Ruston
c1e33ccacb Changed default type for typed blocks to be text/plain 2012-07-18 14:28:17 +01:00
Jeremy Ruston
ec77acd6f7 Improved CSS animation technique 
Clearer and more concise now that we're forcing layout rather than
using nextTick()
 2012-07-18 11:45:17 +01:00
Jeremy Ruston
41845ba059 Animate modal message appearance 2012-07-17 18:28:47 +01:00
Jeremy Ruston
f90b127349 Add table formatting rule 2012-07-16 21:13:33 +01:00
Jeremy Ruston
8b61259973 Extend modal message handler to cope with missing subtitle or footer fields 2012-07-16 14:04:29 +01:00
Jeremy Ruston
a2da94e657 Fixed problem with wikitext macro rule selecting block mode wrongly 2012-07-16 13:58:00 +01:00
Jeremy Ruston
5cb834784a Added optional help link to modal messages 2012-07-16 13:47:28 +01:00
Jeremy Ruston
d21a70f085 Update modal message mechanism to support custom footers 2012-07-16 12:57:44 +01:00
Jeremy Ruston
a689abf0c1 Whoops, should be HTML encoding tiddler div fields 2012-07-16 12:57:19 +01:00
Jeremy Ruston
4a783d08c6 Keeping JSHint happy 2012-07-16 12:56:59 +01:00
Jeremy Ruston
0bd059c1f7 Run version of class wikitext rule 2012-07-15 23:07:25 +01:00
Jeremy Ruston
f97c6b6c25 Fixed typo 2012-07-15 23:07:07 +01:00
Jeremy Ruston
a7dd86b52a Adjust wikitext html rule to parse in block mode if the opening tag is immediate followed by a newline 2012-07-15 23:06:51 +01:00
Jeremy Ruston
ca2c790c27 Fix the reveal macro in run mode 2012-07-15 23:06:24 +01:00
Jeremy Ruston
a149510fa3 Undo the filename change of classblock 2012-07-15 22:38:34 +01:00
Jeremy Ruston
59d9e683d8 Rename classblock parse rule to "class" 2012-07-15 22:37:25 +01:00
Jeremy Ruston
401b804931 Add support for "nomatch" to the reveal macro 2012-07-15 22:34:48 +01:00
Jeremy Ruston
7346a146f0 Extend the tiddler button so that it can set a tiddler to a given value 2012-07-15 22:34:36 +01:00
Jeremy Ruston
ba2b537248 Removed extraneous console.log 2012-07-15 18:33:29 +01:00
Jeremy Ruston
87749397c0 Fixed embarrassing bug with the heading wikitext rule 2012-07-15 18:12:45 +01:00
Jeremy Ruston
507460eb4e Add warning notification when viewing a document on a data: uri 
The intent is to handhold the user through their first save+verification
 2012-07-15 17:37:03 +01:00
Jeremy Ruston
c9c26794af Moved browser feature detection out of startup.js 2012-07-15 17:36:25 +01:00
Jeremy Ruston
dde26f8103 Remove CloseTiddler message to "close" 2012-07-15 17:36:02 +01:00
Jeremy Ruston
c8d98316fa Removed extraneous class 2012-07-15 17:35:17 +01:00
Jeremy Ruston
c74d608418 Removed parser switch 2012-07-14 18:08:00 +01:00
Jeremy Ruston
6d278ea4a1 Reorganisations 
Part three
 2012-07-14 15:58:41 +01:00
Jeremy Ruston
a05adc9d53 Reorganisations 
Part two
 2012-07-14 15:57:36 +01:00
Jeremy Ruston
3d4a5e1602 A bunch more source file reorganisations 
Part one
 2012-07-14 15:56:35 +01:00
Jeremy Ruston
761ffa403d Complete renaming popupper component to popup 2012-07-14 15:52:35 +01:00
Jeremy Ruston
10b7075c7a Rename popupper component to popup 
Less confusing
 2012-07-14 15:50:07 +01:00
Jeremy Ruston
4e547a7d35 Complete renaming the include macro to serialize 2012-07-14 15:46:01 +01:00
Jeremy Ruston
a046c774d4 Rename include macro to serialize 
Because that's much more representative
 2012-07-14 15:43:21 +01:00
Jeremy Ruston
73071f18ae Replace obsolete hide macro with reveal macro 2012-07-13 23:39:20 +01:00
Jeremy Ruston
80fd563ccc Get rid of obsolete linkcatcher macro 2012-07-13 23:09:45 +01:00
Jeremy Ruston
226e3f1417 Remove obsolete download macro 2012-07-13 22:57:24 +01:00
Jeremy Ruston
e0765ec700 Allow the save template to be specified in the message parameter 2012-07-13 22:56:57 +01:00
Jeremy Ruston
4c1f818094 Extended button macro to take a message parameter 2012-07-13 22:56:30 +01:00
Jeremy Ruston
898e86db79 Use the version number from the package.json file 
Instead of the old separate version.txt file
 2012-07-13 17:38:23 +01:00
Jeremy Ruston
d910d75124 Updated to node v.0.8.2 2012-07-13 17:08:15 +01:00
Jeremy Ruston
3a24bdbaf3 Credit for BidiX 2012-07-13 16:51:35 +01:00
Jeremy Ruston
85068ab0b3 Fixes for upload saver 2012-07-13 13:53:51 +01:00
Jeremy Ruston
5e11de719c Added HTTP upload saver 
Now we can save changes to TiddlySpot
 2012-07-13 13:03:38 +01:00
Jeremy Ruston
b4a75b25fc New password macro for setting passwords 
They are stored unencrypted in localStorage
 2012-07-13 13:03:07 +01:00
Jeremy Ruston
e19552774f Simple password management 2012-07-13 13:02:34 +01:00
Jeremy Ruston
36ff53f40b Extended edit macro 
Now it accepts a default value for the field if the tiddler doesn't
exist. It also allows the forcing of a single line input control
 2012-07-13 13:02:14 +01:00
Jeremy Ruston
6e86de5652 Update edit macro to be able to edit a specified tiddler 
Previously you could only edit fields on the current tiddler
 2012-07-13 11:26:34 +01:00
Jeremy Ruston
a7c1b1896e Tell JSHint about Firefox's globals 2012-07-13 11:26:12 +01:00
Jeremy Ruston
3f1e8ee79a Removed old code 2012-07-13 11:25:57 +01:00
Jeremy Ruston
6ff361cdc2 Restored height fixer for text editor 2012-07-12 18:53:20 +01:00
Jeremy Ruston
05d9cb60fc Passed host wiki to saver constructors 2012-07-12 16:58:49 +01:00
Jeremy Ruston
9404d670d3 Added download saver, our fallback based on standard HTML 
It's clunky, and requires manual intervention to accomplish a save, but
it does work on Chrome, Safari, iOS mobile safari
 2012-07-12 13:13:48 +01:00
Jeremy Ruston
632c846ae0 Check for being on a file URI before trying to use Firefox's XUL file saving 2012-07-12 13:11:58 +01:00
Jeremy Ruston
1971f86d5e Remove blanket dependency from transclude macro 
It was a bit of a sledgehammer to crack a nut, and slowed down Firefox
terribly
 2012-07-11 16:26:58 +01:00
Jeremy Ruston
d16481c524 Refactored editor logic to handle refreshes more efficiently 2012-07-11 15:52:15 +01:00
Jeremy Ruston
6a0a4ae00d Removed extraneous console.log 2012-07-11 15:51:52 +01:00
Jeremy Ruston
c340082653 Added primitive save changes mechanism 
Works in Firefox for now
 2012-07-10 23:18:44 +01:00
Jeremy Ruston
9c26f04928 Extraneous line break 2012-07-10 23:18:17 +01:00
Jeremy Ruston
ea6d7f5c08 Fixed a long standing issue with javascript module tiddlers being truncated 
Ouch!
 2012-07-10 23:17:39 +01:00
Jeremy Ruston
9c7a6e5973 Firefox fix 
Was preventing zoomin animations working properly
 2012-07-07 18:44:27 +01:00
Jeremy Ruston
c49c4ef681 Improved animation for closing tiddlers in the zoomin view 2012-07-07 17:58:28 +01:00
Jeremy Ruston
f412dd19d9 Lots of fixes to storyview mechanism 
And a new scroller mechanism
 2012-07-07 17:14:50 +01:00
Jeremy Ruston
a21d96adc1 Fixed typo 2012-07-07 17:14:19 +01:00
Jeremy Ruston
36372f2aed Proper support for DefaultTiddlers 
Now a shadow tiddler called `$:/DefaultTiddlers`
 2012-07-07 17:14:02 +01:00
Jeremy Ruston
c509053bc1 Mending the zoomin effect 
Navigating forwards works OK
 2012-06-26 20:50:29 +01:00
Jeremy Ruston
69a0c46447 Split the story macro out into two macros 
Now the story macro manages the story element sequence, while the
navigator macro listens for the navigation events, and modifies the
story tiddler as required. Also introduces a history tiddler that
retains the history stack so that we can animate navigation properly
(as distinct from animating the addition and removal of story elements).

Note that the zoomin storyview isn't quite finished, but this is a
stable point to commit these changes.
 2012-06-26 19:54:51 +01:00
Jeremy Ruston
94c622a40f Added new storyview called "zoomin" 2012-06-22 18:02:50 +01:00
Jeremy Ruston
f718c597e3 New method for the story macro 2012-06-22 18:02:34 +01:00
Jeremy Ruston
780108c939 Adjust position of opened tiddlers 2012-06-22 13:51:38 +01:00
Jeremy Ruston
14e433a11d Reverted to classic semantics of new tiddlers opening below the one being navigated from 2012-06-22 12:25:01 +01:00
Jeremy Ruston
be6bff402d Added closure animation to sideways storyview 2012-06-22 11:28:40 +01:00
Jeremy Ruston
d9c916715b Better cross browser support for classic closure animation 2012-06-22 09:26:59 +01:00
Jeremy Ruston
7dcbefa9bc Added a rudimentary animation for closing tiddlers in classic view 2012-06-22 00:10:17 +01:00
Jeremy Ruston
d82e372569 Added close button 
And made the edit button be a graphic, too
 2012-06-21 19:44:21 +01:00
Jeremy Ruston
8b23dc3da6 Fixed positioning of view dropdown 2012-06-21 09:11:04 +01:00
Jeremy Ruston
250f9411da Smooth scrolling for the sideways storyview 2012-06-20 22:20:48 +01:00
Jeremy Ruston
c5292567dd Split the DOM utilities into their own file 2012-06-20 22:16:41 +01:00
Jeremy Ruston
d0ee6bd691 Wider sideways tiddlers 2012-06-20 22:12:14 +01:00
Jeremy Ruston
a3431c1435 JSHint! 2012-06-20 18:36:43 +01:00
Jeremy Ruston
4bbe0cd4d3 Added new storyview that shows tiddlers stacked up sideways 2012-06-20 18:35:41 +01:00
Jeremy Ruston
08e80d6e02 Completed renaming the scroller storyview to "classic" 2012-06-20 18:03:19 +01:00
Jeremy Ruston
b3c0bec838 Fixed support for storyviewTiddler parameter for story macro 2012-06-20 17:59:38 +01:00
Jeremy Ruston
ca9b68a5d3 Start to let story macro read storyview from a tiddler 
This is for getting the view dropdown working
 2012-06-20 17:43:31 +01:00
Jeremy Ruston
966b51a258 New linkcatcher macro 2012-06-20 17:40:55 +01:00
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
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
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
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
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
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
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
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
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
67b4c86c98 Refactored file layout for JavaScript parser 2012-06-08 11:48:46 +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
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
191be73507 Fixed problem with is filter operator 2012-06-06 20:51:13 +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
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
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
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
e0725bbb52 Sort out the naming and location of shadow template tiddlers 2012-06-01 20:04:51 +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
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
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
503f60f64c Comment update 2012-05-20 15:19:52 +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
bb2d65861f Remove tab mangling from JavaScript parser 2012-05-09 13:48:45 +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
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
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