Merge pull request #370 from MicrosoftDX/dev

Merge for v0.3

.gitignore

@@ -1,6 +1,5 @@
 npm-debug.log
 *.log
-tsconfig.json
 /Plugins/obj
 **/node_modules
 sync.bat
@@ -15,4 +14,8 @@ sync.bat
 Server/public/stylesheets/style.css
 /Server/public/stylesheets/style.css
 /DeploymentTools/deployment-package.zip
-DeploymentTools/deployment-package.zip
+DeploymentTools/deployment-package.zip
+!/Plugins/Vorlon/plugins/domtimeline/**
+!/Plugins/Vorlon/plugins/domtimeline/**/*.css
+!/Plugins/Vorlon/plugins/domtimeline/**/*.js
+!/Plugins/Vorlon/plugins/domtimeline/dom-timeline.js

.vscode/launch.json

@@ -52,15 +52,14 @@
 			"env": {}
 		},
         {
-			// not working since latest vs code and electron versions :-(
 			"name": "Launch node.js sample",
 			"type": "node",
 			"program": "${workspaceRoot}/client samples/nodejs/app.js",
 			"stopOnEntry": false,
 			"args": [
 				"--nolazy"
 			],
-			"cwd": "${workspaceRoot}",
+			"cwd": "${workspaceRoot}/client samples/nodejs",
 			"runtimeExecutable": null,
 			"env": {}
 		},

Plugins/Vorlon/.gitignore

@@ -1,4 +1,16 @@
 *.js.map
 *.min.js
 !verge.min.js
-!res.min.js
+!res.min.js
+!plugins/domtimeline/**
+!plugins/domtimeline/**/*.css
+!plugins/domtimeline/**/*.js
+!plugins/domtimeline/dom-timeline.js
+!plugins/express/**
+!plugins/express/**/*.css
+!plugins/express/**/*.js
+!plugins/express/dom-timeline.js
+!plugins/nodejs/**
+!plugins/nodejs/**/*.css
+!plugins/nodejs/**/*.js
+!plugins/nodejs/dom-timeline.js

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

@@ -206,7 +206,7 @@
                     var styles = winObject.getComputedStyle(element);
                     var l = [];
                     for (var style in styles) {
-                        if (isNaN(style) && style !== "parentRule" && style !== "length" && style !== "cssText" && typeof styles[style] !== 'function' && styles[style]) {
+                        if (isNaN(Number(style)) && style !== "parentRule" && style !== "length" && style !== "cssText" && typeof styles[style] !== 'function' && styles[style]) {
 
                             l.push({ name: style, value: styles[style] });
                         }

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

@@ -867,7 +867,6 @@
                         case "mousemove": $(node).addClass("link-hovered");
                         default: return true;
                     }  
-                    return true;
                 } 
             }
             else{ 

Plugins/Vorlon/plugins/express/README.md

@@ -0,0 +1,33 @@
+# Sample plugin
+
+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.
+
+You can use this as a starting point for your own plugins.
+
+## Enabling the sample plugin
+
+To enable the sample plugin:
+
+1. Clone this github repo if you haven't already (`git clone [email protected]/MicrosoftDX/Vorlonjs`)
+2. Modify `Server/config.json` to add the plugin, so it looks like this:
+
+```json
+{
+    "includeSocketIO": true,
+    "plugins": [
+        { "id": "CONSOLE", "name": "Interactive Console", "panel": "bottom", "foldername" :  "interactiveConsole", "enabled": true},
+        { "id": "DOM", "name": "Dom Explorer", "panel": "top", "foldername" : "domExplorer", "enabled": true },
+        { "id": "MODERNIZR", "name": "Modernizr","panel": "bottom", "foldername" : "modernizrReport", "enabled": true },
+        { "id": "OBJEXPLORER", "name" : "Obj. Explorer","panel": "top", "foldername" :  "objectExplorer", "enabled": true },
+        { "id": "SAMPLE", "name" : "Sample","panel": "top", "foldername" : "sample", "enabled": true }
+    ]
+}
+```
+
+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.
+
+## Modifying the plugin
+
+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.
+
+`control.html` will be inserted into the dashboard, as will `dashboard.css`.