Prepaing merge with GT 0.8.690
This commit is contained in:
parent
2839a79e04
commit
79fe418dd8
@ -8,11 +8,22 @@ Class {
|
|||||||
#name : #TiddlyWiki,
|
#name : #TiddlyWiki,
|
||||||
#superclass : #Object,
|
#superclass : #Object,
|
||||||
#instVars : [
|
#instVars : [
|
||||||
'tiddlers'
|
'tiddlers',
|
||||||
|
'file'
|
||||||
],
|
],
|
||||||
#category : #'TiddlyWiki-Model'
|
#category : #'TiddlyWiki-Model'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{ #category : #accessing }
|
||||||
|
TiddlyWiki >> file [
|
||||||
|
^ file
|
||||||
|
]
|
||||||
|
|
||||||
|
{ #category : #accessing }
|
||||||
|
TiddlyWiki >> file: anObject [
|
||||||
|
file := anObject
|
||||||
|
]
|
||||||
|
|
||||||
{ #category : #'instance creation' }
|
{ #category : #'instance creation' }
|
||||||
TiddlyWiki >> fromJSONString: aString [
|
TiddlyWiki >> fromJSONString: aString [
|
||||||
| rawData |
|
| rawData |
|
||||||
@ -43,3 +54,10 @@ TiddlyWiki >> tiddlers: anOrderedCollection [
|
|||||||
|
|
||||||
tiddlers := anOrderedCollection
|
tiddlers := anOrderedCollection
|
||||||
]
|
]
|
||||||
|
|
||||||
|
{ #category : #accessing }
|
||||||
|
TiddlyWiki >> tiddlersJSONFile [
|
||||||
|
file ifNil: [ self inform: 'You need to export tiddlers as JSON from TiddlyWiki'.
|
||||||
|
^ nil ].
|
||||||
|
^ file parent / 'tiddlers.json'.
|
||||||
|
]
|
||||||
|
Loading…
Reference in New Issue
Block a user