mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-12-24 00:50:28 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Bram Chen 2014-02-21 22:41:08 +08:00
commit 747ec243ff
8 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/language/en-GB/Misc.multids Normal file
View File

@ -0,0 +1,4 @@
title: $:/language/
RecentChanges/DateFormat: DDth MMM YYYY
CloseAll/Button: close all

8
core/modules/widgets/edit-bitmap.js
View File

@ -16,6 +16,10 @@ Edit-bitmap widget
var DEFAULT_IMAGE_WIDTH = 300,
DEFAULT_IMAGE_HEIGHT = 185;
// Configuration tiddlers
var LINE_WIDTH_TITLE = "$:/config/BitmapEditor/LineWidth",
LINE_COLOUR_TITLE = "$:/config/BitmapEditor/Colour";
var Widget = require("$:/core/modules/widgets/widget.js").widget;
var EditBitmapWidget = function(parseTreeNode,options) {
@ -258,8 +262,8 @@ EditBitmapWidget.prototype.strokeMove = function(x,y) {
// Redraw the previous image
ctx.drawImage(this.currCanvas,0,0);
// Render the stroke
ctx.strokeStyle = "#ff0";
ctx.lineWidth = 3;
ctx.strokeStyle = this.wiki.getTiddlerText(LINE_COLOUR_TITLE,"#ff0");
ctx.lineWidth = parseInt(this.wiki.getTiddlerText(LINE_WIDTH_TITLE,"3"),10);
ctx.lineCap = "round";
ctx.lineJoin = "round";
ctx.beginPath();

2
core/ui/EditTemplate/fields.tid
View File

@ -10,6 +10,6 @@ tags: $:/tags/EditTemplate
</table>
</div>
<div class="tw-edit-field-add"><em class="tw-edit"><<lingo Fields/Add/Prompt>></em> <span class="tw-edit-field-add-name"><$edit-text tiddler="$:/temp/NewFieldName" tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Name/Placeholder}} class="tw-edit-texteditor"/></span> <span class="tw-edit-field-add-button"><$button message="tw-add-field" param={{$:/temp/NewFieldName}} set="$:/temp/NewFieldName" setTo="" class="">add</$button></span></div>
<div class="tw-edit-field-add"><em class="tw-edit"><<lingo Fields/Add/Prompt>></em> <span class="tw-edit-field-add-name"><$edit-text tiddler="$:/temp/NewFieldName" tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Name/Placeholder}} class="tw-edit-texteditor"/></span> <span class="tw-edit-field-add-button"><$button message="tw-add-field" param={{$:/temp/NewFieldName}} set="$:/temp/NewFieldName" setTo="" class=""><<lingo Fields/Add/Button>></$button></span></div>
</$fieldmangler>

3
core/ui/SideBar/Open.tid
View File

@ -2,10 +2,11 @@ title: $:/core/ui/SideBar/Open
tags: $:/tags/SideBar
caption: {{$:/language/SideBar/Open/Caption}}
\define lingo-base() $:/language/CloseAll/
<$list filter="[list[$:/StoryList]]" history="$:/HistoryList" storyview="pop">
<$button message="tw-close-tiddler" class="btn-invisible btn-mini">&times;</$button> <$link to={{!!title}}><$view field="title"/></$link>
</$list>
<$button message="tw-close-all-tiddlers" class="btn-invisible btn-mini">close all</$button>
<$button message="tw-close-all-tiddlers" class="btn-invisible btn-mini"><<lingo Button>></$button>

3
core/wiki/config/BitmapEditorColour.tid Normal file
View File

@ -0,0 +1,3 @@
title: $:/config/BitmapEditor/Colour
#ff0

3
core/wiki/config/BitmapEditorLineWidth.tid Normal file
View File

@ -0,0 +1,3 @@
title: $:/config/BitmapEditor/LineWidth
3

2
core/wiki/recentchanges.tid
View File

@ -2,7 +2,7 @@ title: $:/snippets/recentchanges
<$list filter="[!is[system]has[modified]!sort[modified]limit[100]eachday[modified]]">
<div class="tw-menu-list-item">
<$view field="modified" format="date" template="DDth MMM YYYY"/>
<$view field="modified" format="date" template={{$:/language/RecentChanges/DateFormat}}/>
<$list filter="[sameday{!!modified}!is[system]!sort[modified]]">
<div class="tw-menu-list-subitem">
<$link to={{!!title}}>

14
editions/tw5.com/tiddlers/widgets/EditBitmapWidget.tid
View File

@ -1,7 +1,8 @@
title: EditBitmapWidget
created: 201310241419
modified: 201310300837
created: 20131024141900000
modified: 20140221140151790
tags: widget
title: EditBitmapWidget
type: text/vnd.tiddlywiki
! Introduction
@ -13,3 +14,10 @@ The content of the `<$edit-bitmap>` widget is ignored.
|!Attribute |!Description |
|tiddler |The tiddler to edit (defaults to the [[WidgetVariable: currentTiddler]]) |
! Configuration
The edit bitmap widget can be configured with these system tiddlers:
* [[$:/config/BitmapEditor/LineWidth]] determines the line width: <$edit-text tiddler="$:/config/BitmapEditor/LineWidth" tag="input"/>
* [[$:/config/BitmapEditor/Colour]] determines the line width: <$edit-text tiddler="$:/config/BitmapEditor/Colour" tag="input" type="color"/>