Skip to content

Commit c63e93e

Browse files
committed
misc fixes on Lively and Webly
1 parent 9f62376 commit c63e93e

21 files changed

+533
-219
lines changed

repository/ViennaTalk-LivelyWalkThrough-Core/LWTCut.class.st

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ Class {
55
'frames',
66
'remark'
77
],
8-
#category : 'ViennaTalk-LivelyWalkThrough-Core',
9-
#package : 'ViennaTalk-LivelyWalkThrough-Core'
8+
#category : 'ViennaTalk-LivelyWalkThrough-Core-Models',
9+
#package : 'ViennaTalk-LivelyWalkThrough-Core',
10+
#tag : 'Models'
1011
}
1112

1213
{ #category : 'instance creation' }

repository/ViennaTalk-LivelyWalkThrough-Core/LWTDirector.class.st

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ Class {
1616
#classVars : [
1717
'Server'
1818
],
19-
#category : 'ViennaTalk-LivelyWalkThrough-Core',
20-
#package : 'ViennaTalk-LivelyWalkThrough-Core'
19+
#category : 'ViennaTalk-LivelyWalkThrough-Core-UI',
20+
#package : 'ViennaTalk-LivelyWalkThrough-Core',
21+
#tag : 'UI'
2122
}
2223

2324
{ #category : 'instance creation' }

repository/ViennaTalk-LivelyWalkThrough-Core/LWTEventFrame.class.st

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ Class {
55
'morphName',
66
'event'
77
],
8-
#category : 'ViennaTalk-LivelyWalkThrough-Core',
9-
#package : 'ViennaTalk-LivelyWalkThrough-Core'
8+
#category : 'ViennaTalk-LivelyWalkThrough-Core-Models',
9+
#package : 'ViennaTalk-LivelyWalkThrough-Core',
10+
#tag : 'Models'
1011
}
1112

1213
{ #category : 'instance creation' }

repository/ViennaTalk-LivelyWalkThrough-Core/LWTFieldWidget.class.st

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ Class {
88
'showsDiagram',
99
'type'
1010
],
11-
#category : 'ViennaTalk-LivelyWalkThrough-Core',
12-
#package : 'ViennaTalk-LivelyWalkThrough-Core'
11+
#category : 'ViennaTalk-LivelyWalkThrough-Core-Widgets',
12+
#package : 'ViennaTalk-LivelyWalkThrough-Core',
13+
#tag : 'Widgets'
1314
}
1415

1516
{ #category : 'menu declaration' }

repository/ViennaTalk-LivelyWalkThrough-Core/LWTFrame.class.st

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ Class {
44
#instVars : [
55
'timestamp'
66
],
7-
#category : 'ViennaTalk-LivelyWalkThrough-Core',
8-
#package : 'ViennaTalk-LivelyWalkThrough-Core'
7+
#category : 'ViennaTalk-LivelyWalkThrough-Core-Models',
8+
#package : 'ViennaTalk-LivelyWalkThrough-Core',
9+
#tag : 'Models'
910
}
1011

1112
{ #category : 'menu' }

repository/ViennaTalk-LivelyWalkThrough-Core/LWTImageWidget.class.st

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ Class {
55
'form',
66
'value'
77
],
8-
#category : 'ViennaTalk-LivelyWalkThrough-Core',
9-
#package : 'ViennaTalk-LivelyWalkThrough-Core'
8+
#category : 'ViennaTalk-LivelyWalkThrough-Core-Widgets',
9+
#package : 'ViennaTalk-LivelyWalkThrough-Core',
10+
#tag : 'Widgets'
1011
}
1112

1213
{ #category : 'json' }
@@ -45,13 +46,15 @@ LWTImageWidget >> basename [
4546

4647
{ #category : 'operations' }
4748
LWTImageWidget >> changeImage [
49+
4850
(LivelyWalkThrough
49-
fileOpen: 'Select an image file'
50-
extensions: #('png' 'jpg' 'jpeg')
51-
path: nil
52-
preview: #image)
53-
ifNotNil: [ :filename |
54-
[ form := Form fromFileNamed: filename fullName ]
51+
fileOpen: 'Select an image file'
52+
extensions: #( 'png' 'jpg' 'jpeg' )
53+
path: nil
54+
preview: #image) ifNotNil: [ :filename |
55+
[
56+
form := Form fromFileNamed: filename fullName.
57+
self changed ]
5558
on: Error
5659
do: [ :ex | ] ]
5760
]

repository/ViennaTalk-LivelyWalkThrough-Core/LWTLivetalkBrowser.class.st

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ Class {
77
'codeSelection',
88
'selectedScriptSelector'
99
],
10-
#category : 'ViennaTalk-LivelyWalkThrough-Core',
11-
#package : 'ViennaTalk-LivelyWalkThrough-Core'
10+
#category : 'ViennaTalk-LivelyWalkThrough-Core-UI',
11+
#package : 'ViennaTalk-LivelyWalkThrough-Core',
12+
#tag : 'UI'
1213
}
1314

1415
{ #category : 'instance creation' }

repository/ViennaTalk-LivelyWalkThrough-Core/LWTLivetalkCompiler.class.st

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ Class {
1414
'dialog',
1515
'step'
1616
],
17-
#category : 'ViennaTalk-LivelyWalkThrough-Core',
18-
#package : 'ViennaTalk-LivelyWalkThrough-Core'
17+
#category : 'ViennaTalk-LivelyWalkThrough-Core-Models',
18+
#package : 'ViennaTalk-LivelyWalkThrough-Core',
19+
#tag : 'Models'
1920
}
2021

2122
{ #category : 'compiling' }

repository/ViennaTalk-LivelyWalkThrough-Core/LWTLivetalkScript.class.st

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ Class {
88
'performer',
99
'compiledMethod'
1010
],
11-
#category : 'ViennaTalk-LivelyWalkThrough-Core',
12-
#package : 'ViennaTalk-LivelyWalkThrough-Core'
11+
#category : 'ViennaTalk-LivelyWalkThrough-Core-Models',
12+
#package : 'ViennaTalk-LivelyWalkThrough-Core',
13+
#tag : 'Models'
1314
}
1415

1516
{ #category : 'instance creation' }
@@ -58,21 +59,22 @@ LWTLivetalkScript >> name [
5859

5960
{ #category : 'private' }
6061
LWTLivetalkScript >> setWidgetName: nameString event: eventString performer: anObject source: sourceString ifFail: errorBlock [
62+
6163
(self class scriptCompilerClass new
62-
compileToSmalltalk: sourceString
63-
ifError: [ :msg :pos | ^ errorBlock cull: msg cull: pos ])
64-
ifNotNil: [ :smalltalkSource |
65-
| compiler |
66-
widgetName := nameString.
67-
event := eventString asSymbol.
68-
performer := anObject.
69-
compiler := OpalCompiler new
70-
source: smalltalkSource;
71-
class: performer class;
72-
noPattern: true;
73-
failBlock: [ ^ errorBlock value ].
74-
compiledMethod := compiler compile.
75-
source := sourceString ]
64+
compileToSmalltalk: sourceString
65+
ifError: [ :msg :pos | ^ errorBlock cull: msg cull: pos ])
66+
ifNotNil: [ :smalltalkSource |
67+
| compiler |
68+
widgetName := nameString.
69+
event := eventString asSymbol.
70+
performer := anObject.
71+
compiler := OpalCompiler new
72+
source: smalltalkSource;
73+
class: performer class;
74+
isScripting: true;
75+
failBlock: [ ^ errorBlock value ].
76+
compiledMethod := compiler compile.
77+
source := sourceString ]
7678
]
7779

7880
{ #category : 'accessing' }

repository/ViennaTalk-LivelyWalkThrough-Core/LWTMouseSensor.class.st

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ Class {
77
'borderColor',
88
'borderWidth'
99
],
10-
#category : 'ViennaTalk-LivelyWalkThrough-Core',
11-
#package : 'ViennaTalk-LivelyWalkThrough-Core'
10+
#category : 'ViennaTalk-LivelyWalkThrough-Core-Widgets',
11+
#package : 'ViennaTalk-LivelyWalkThrough-Core',
12+
#tag : 'Widgets'
1213
}
1314

1415
{ #category : 'instance creation' }

0 commit comments

Comments
 (0)