Skip to content

Commit f32c73f

Browse files
BraunTomBraunTom
committed
minor changes
SQUASHED: AUTO-COMMIT-demos-tom-TraceLogParser.js,AUTO-COMMIT-src-components-tools-lively-plugin-explorer.html,AUTO-COMMIT-src-components-tools-lively-plugin-explorer.js,AUTO-COMMIT-src-components-tools-lively-plugin-explorer-playground.workspace,AUTO-COMMIT-src-components-tools-plugin-selector.js,AUTO-COMMIT-src-components-tools-trace-visualization.js,
1 parent 979404d commit f32c73f

File tree

6 files changed

+246
-141
lines changed

6 files changed

+246
-141
lines changed

‎demos/tom/TraceLogParser.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,8 @@ export default class TraceLogParser {
181181

182182
parsePlugin(sections) {
183183
const plugin = new PluginSection(...this.consume().data);
184+
plugin.position = this.peek().position;
185+
184186
sections.push(plugin);
185187
this.defaultParse(plugin, []);
186188
return plugin;

‎src/components/tools/lively-plugin-explorer-playground.workspace‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
2-
"source": "https://lively-kernel.org/lively4/lively4-tom/src/components/tools/lively-ast-explorer-example-source.js",
2+
"source": "/test.js",
33
"sources": [
4-
"https://lively-kernel.org/lively4/lively4-tom/src/components/tools/lively-ast-explorer-example-source.js"
4+
"/test.js",
5+
"/karma.conf.js"
56
],
6-
"plugin": "demos/tom/plugin-backup.js",
7+
"plugin": "src/client/reactive/babel-plugin-active-expression-rewriting/index.js",
78
"options": {
89
"autoUpdateAST": true,
910
"autoUpdateTransformation": true,
@@ -15,15 +16,10 @@
1516
"pluginSelection": [
1617
{
1718
"url": "src/client/reactive/babel-plugin-active-expression-rewriting/index.js"
18-
},
19-
{
20-
"url": "demos/tom/plugin-backup.js"
21-
},
22-
{
23-
"url": "src/external/babel-plugin-var-recorder-dev.js"
24-
},
25-
{
26-
"url": "src/external/babel-plugin-locals.js"
2719
}
20+
],
21+
"openPlugins": [
22+
"src/client/reactive/babel-plugin-active-expression-rewriting/index.js",
23+
"demos/tom/playground.js"
2824
]
2925
}

‎src/components/tools/lively-plugin-explorer.html‎

Lines changed: 86 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<template id="lively-plugin-explorer">
2-
<style data-src="/src/external/font-awesome/css/font-awesome.css"></style>
3-
<style data-src="/templates/livelystyle.css"></style>
4-
<style>
5-
:host {
2+
<style data-src="/src/external/font-awesome/css/font-awesome.css"></style>
3+
<style data-src="/templates/livelystyle.css"></style>
4+
<style>
5+
:host {
66
display: flex;
77
}
88

@@ -119,7 +119,7 @@
119119

120120
.tab {
121121
padding: 5px;
122-
cursor: pointer;
122+
cursor: pointer;
123123
}
124124

125125
.active {
@@ -132,87 +132,95 @@
132132

133133
</style>
134134

135-
<div id="content" class="pane layout-column">
136-
<div id="workspaceToolbar" class="toolbar">
137-
<input type="text" id="workspace-path" value="">
138-
<button id="newWorkspace" title="Opens a filechooser where you can create a new workspace file."><i class="fa fa-plus-square"></i></button>
139-
<button id="saveDevToMaster" class="attention hidden"><i class="fa fa-refresh fa-fw"></i></button>
140-
<button class="toggle" id="saveWorkspace" title="Save Workspace to file (right-click to toggle auto-mode).">
141-
<i class="fa fa-floppy-o"></i>
142-
</button>
143-
<button class="toggle" id="updateAST" title="Update AST (right-click to toggle auto-mode).">
144-
<i class="fa fa-refresh fa-fw"></i>
145-
</button>
146-
<button class="toggle" id="updateTransformation" title="Update transformation (right-click to toggle auto-mode).">
147-
<i class="fa fa-refresh fa-fw"></i>
148-
</button>
149-
<button class="toggle" id="execute" title="Execute transformed code (right-click to toggle auto-mode).">
150-
<i class="fa fa-cog fa-fw"></i>
151-
</button>
152-
<button class="toggle" id="runTests" title="Run tests in all opened test runners (right-click to toggle auto-mode).">
153-
<i class="fa fa-shield"></i>
154-
</button>
155-
<button class="toggle" id="toggleSystemJS" title="Toggle: SystemJS.">
156-
<i class="fa fa-cloud"></i>
157-
</button>
158-
<button id="selectPlugins" title="Opens settings for plugins that should get applied while transformation">
159-
<i class="fa fa-cog"></i>
160-
</button>
161-
<button id="debug" title="Opens a trace visualization">
162-
<i class="fa fa-search"></i>
163-
</button>
164-
</div>
135+
<div id="content" class="pane layout-column">
136+
<div id="workspaceToolbar" class="toolbar">
137+
<input type="text" id="workspace-path" value="">
138+
<button id="newWorkspace" title="Opens a filechooser where you can create a new workspace file."><i class="fa fa-plus-square"></i></button>
139+
<button id="saveDevToMaster" class="attention hidden"><i class="fa fa-refresh fa-fw"></i></button>
140+
<button class="toggle" id="saveWorkspace" title="Save Workspace to file (right-click to toggle auto-mode).">
141+
<i class="fa fa-floppy-o"></i>
142+
</button>
143+
<button class="toggle" id="updateAST" title="Update AST (right-click to toggle auto-mode).">
144+
<i class="fa fa-refresh fa-fw"></i>
145+
</button>
146+
<button class="toggle" id="updateTransformation" title="Update transformation (right-click to toggle auto-mode).">
147+
<i class="fa fa-refresh fa-fw"></i>
148+
</button>
149+
<button class="toggle" id="execute" title="Execute transformed code (right-click to toggle auto-mode).">
150+
<i class="fa fa-cog fa-fw"></i>
151+
</button>
152+
<button class="toggle" id="runTests" title="Run tests in all opened test runners (right-click to toggle auto-mode).">
153+
<i class="fa fa-shield"></i>
154+
</button>
155+
<button class="toggle" id="toggleSystemJS" title="Toggle: SystemJS.">
156+
<i class="fa fa-cloud"></i>
157+
</button>
158+
<button id="debug" title="Opens a trace visualization">
159+
<i class="fa fa-search"></i>
160+
</button>
161+
</div>
162+
163+
<div id="main" class="pane layout-row">
164+
<div id="pluginPane" class="pane tool layout-column">
165+
166+
<div style="display: flex; align-items: center; justify-content: space-between">
167+
<b>Plugin</b>
168+
<button id="selectPlugins" style="float: right;" title="Opens settings for plugins that should get applied while transformation">
169+
<i class="fa fa-cog"></i>
170+
</button>
171+
172+
</div>
165173

166-
<div id="main" class="pane layout-row">
167-
<div id="pluginPane" class="pane tool layout-column">
168-
<b>Plugin</b>
169-
<div id="plugin-tabs" class="tablist"></div>
170-
<lively-editor class="pane" id="plugin"></lively-editor>
171-
</div>
172-
173-
<lively-separator reverse=true></lively-separator>
174-
175-
<div id="toolPane" class="pane layout-column">
176-
<div id="sourceAndAst" class="pane layout-row">
177-
<div class="pane tool layout-column">
178-
<div id="source-tabs" class="tablist"></div>
179-
<lively-editor class="pane" id="source"></lively-editor>
180-
</div>
181-
<lively-separator reverse=true></lively-separator>
182-
183-
<div class="pane layout-column">
184-
<div class="pane tool layout-column">
185-
<b>Source AST</b>
186-
<lively-ast-inspector class="pane" id="sourceAst"></lively-ast-inspector>
174+
175+
176+
<div id="plugin-tabs" class="tablist"></div>
177+
<lively-editor class="pane" id="plugin"></lively-editor>
187178
</div>
179+
188180
<lively-separator reverse=true></lively-separator>
189-
<div class="pane tool layout-column">
190-
<b>Transformed AST</b>
191-
<lively-ast-inspector class="pane" id="transformedAst"></lively-ast-inspector>
192-
</div>
193-
</div>
194-
</div>
195-
<lively-separator></lively-separator>
196-
<div id="transformedPane" class="pane tool layout-column">
197-
<b>Transformed Source</b>
198-
<lively-code-mirror class="pane" id="transformedSource"></lively-code-mirror>
199-
</div>
200181

201-
<lively-separator reverse=true></lively-separator>
182+
<div id="toolPane" class="pane layout-column">
183+
<div id="sourceAndAst" class="pane layout-row">
184+
<div class="pane tool layout-column">
185+
<b>Source</b>
186+
<div id="source-tabs" class="tablist"></div>
187+
<lively-editor class="pane" id="source"></lively-editor>
188+
</div>
189+
<lively-separator reverse=true></lively-separator>
190+
191+
<div class="pane layout-column">
192+
<div class="pane tool layout-column">
193+
<b>Source AST</b>
194+
<lively-ast-inspector class="pane" id="sourceAst"></lively-ast-inspector>
195+
</div>
196+
<lively-separator reverse=true></lively-separator>
197+
<div class="pane tool layout-column">
198+
<b>Transformed AST</b>
199+
<lively-ast-inspector class="pane" id="transformedAst"></lively-ast-inspector>
200+
</div>
201+
</div>
202+
</div>
203+
<lively-separator></lively-separator>
204+
<div id="transformedPane" class="pane tool layout-column">
205+
<b>Transformed Source</b>
206+
<lively-code-mirror class="pane" id="transformedSource"></lively-code-mirror>
207+
</div>
208+
209+
<lively-separator reverse=true></lively-separator>
210+
211+
<div id="bottom" class="pane layout-row">
212+
<div id="console" class="pane tool layout-column">
213+
<b>Execution Console</b>
214+
<div class="pane" style="overflow: scroll">
215+
<pre id="executionConsole"></pre>
216+
</div>
217+
</div>
218+
</div>
202219

203-
<div id="bottom" class="pane layout-row">
204-
<div id="console" class="pane tool layout-column" >
205-
<b>Execution Console</b>
206-
<div class="pane" style="overflow: scroll">
207-
<pre id="executionConsole"></pre>
208220
</div>
209-
</div>
210221
</div>
211222

212-
</div>
213-
</div>
214-
215223

216-
</div>
224+
</div>
217225

218226
</template>

0 commit comments

Comments
 (0)