Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Commit eb66761

Browse files
Merge pull request #370 from MicrosoftDX/dev
Merge for v0.3
2 parents 9bc8a08 + 0f01f11 commit eb66761

File tree

72 files changed

+4914
-683
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+4914
-683
lines changed

.gitignore

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
npm-debug.log
22
*.log
3-
tsconfig.json
43
/Plugins/obj
54
**/node_modules
65
sync.bat
@@ -15,4 +14,8 @@ sync.bat
1514
Server/public/stylesheets/style.css
1615
/Server/public/stylesheets/style.css
1716
/DeploymentTools/deployment-package.zip
18-
DeploymentTools/deployment-package.zip
17+
DeploymentTools/deployment-package.zip
18+
!/Plugins/Vorlon/plugins/domtimeline/**
19+
!/Plugins/Vorlon/plugins/domtimeline/**/*.css
20+
!/Plugins/Vorlon/plugins/domtimeline/**/*.js
21+
!/Plugins/Vorlon/plugins/domtimeline/dom-timeline.js

.vscode/launch.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,14 @@
5252
"env": {}
5353
},
5454
{
55-
// not working since latest vs code and electron versions :-(
5655
"name": "Launch node.js sample",
5756
"type": "node",
5857
"program": "${workspaceRoot}/client samples/nodejs/app.js",
5958
"stopOnEntry": false,
6059
"args": [
6160
"--nolazy"
6261
],
63-
"cwd": "${workspaceRoot}",
62+
"cwd": "${workspaceRoot}/client samples/nodejs",
6463
"runtimeExecutable": null,
6564
"env": {}
6665
},

Plugins/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 35 deletions
This file was deleted.

Plugins/Properties/PublishProfiles/toto.pubxml

Lines changed: 0 additions & 23 deletions
This file was deleted.

Plugins/Vorlon/.gitignore

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
*.js.map
22
*.min.js
33
!verge.min.js
4-
!res.min.js
4+
!res.min.js
5+
!plugins/domtimeline/**
6+
!plugins/domtimeline/**/*.css
7+
!plugins/domtimeline/**/*.js
8+
!plugins/domtimeline/dom-timeline.js
9+
!plugins/express/**
10+
!plugins/express/**/*.css
11+
!plugins/express/**/*.js
12+
!plugins/express/dom-timeline.js
13+
!plugins/nodejs/**
14+
!plugins/nodejs/**/*.css
15+
!plugins/nodejs/**/*.js
16+
!plugins/nodejs/dom-timeline.js

Plugins/Vorlon/plugins/domExplorer/vorlon.domExplorer.client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@
206206
var styles = winObject.getComputedStyle(element);
207207
var l = [];
208208
for (var style in styles) {
209-
if (isNaN(style) && style !== "parentRule" && style !== "length" && style !== "cssText" && typeof styles[style] !== 'function' && styles[style]) {
209+
if (isNaN(Number(style)) && style !== "parentRule" && style !== "length" && style !== "cssText" && typeof styles[style] !== 'function' && styles[style]) {
210210

211211
l.push({ name: style, value: styles[style] });
212212
}

Plugins/Vorlon/plugins/domExplorer/vorlon.domExplorer.dashboard.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,6 @@
867867
case "mousemove": $(node).addClass("link-hovered");
868868
default: return true;
869869
}
870-
return true;
871870
}
872871
}
873872
else{
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Sample plugin
2+
3+
This is an example additional plugin for vorlon. It renders an input field into the Vorlon dashboard. If you type a message, it sends it to your client, which reverses it, and sends it back to be rendered into the dashboard.
4+
5+
You can use this as a starting point for your own plugins.
6+
7+
## Enabling the sample plugin
8+
9+
To enable the sample plugin:
10+
11+
1. Clone this github repo if you haven't already (`git clone git@github.com/MicrosoftDX/Vorlonjs`)
12+
2. Modify `Server/config.json` to add the plugin, so it looks like this:
13+
14+
```json
15+
{
16+
"includeSocketIO": true,
17+
"plugins": [
18+
{ "id": "CONSOLE", "name": "Interactive Console", "panel": "bottom", "foldername" : "interactiveConsole", "enabled": true},
19+
{ "id": "DOM", "name": "Dom Explorer", "panel": "top", "foldername" : "domExplorer", "enabled": true },
20+
{ "id": "MODERNIZR", "name": "Modernizr","panel": "bottom", "foldername" : "modernizrReport", "enabled": true },
21+
{ "id": "OBJEXPLORER", "name" : "Obj. Explorer","panel": "top", "foldername" : "objectExplorer", "enabled": true },
22+
{ "id": "SAMPLE", "name" : "Sample","panel": "top", "foldername" : "sample", "enabled": true }
23+
]
24+
}
25+
```
26+
27+
3. From the root directory of the repository, install dependencies with `npm install`, build vorlon with `npm run build` and start the server with `npm start` (make sure you kill any existing vorlon servers running on your machine. You can now navigate to the vorlon dashboard as normal, and you'll see an additional tab in the list.
28+
29+
## Modifying the plugin
30+
31+
The plugin is based on two files (one for the client and one for the dashboard) who respectively extend from VORLON.ClientPlugin and VORLON.DashboardPlugin, as defined in `Plugins/Vorlon/vorlon.clientPlugin.ts` and `Plugins/Vorlon/vorlon.dashboardPlugin.ts` so you can see what methods are available for your plugin from there. You may also wish to look at the other existing plugins in `Plugins/Vorlon/plugins` for ideas.
32+
33+
`control.html` will be inserted into the dashboard, as will `dashboard.css`.

0 commit comments

Comments
 (0)