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

Commit

Permalink
Preparation of v 0.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
etiennemargraff committed Oct 23, 2015
2 parents 6ac6e91 + 8170e54 commit f23bbdc
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
this._loadNewScriptAsync("qunit.js",() => {
var self = this;
this._ready = true;
QUnit.testDone(function (details) {
QUnit.testDone((details) => {
//console.log("QUnit.testDone");
//console.log(details);
var message: any = {};
Expand All @@ -29,9 +29,9 @@
message.passed = details.passed;
message.total = details.total;
message.runtime = details.runtime;
this.sendCommandToDashboard(message);
this.sendToDashboard(message);
});
QUnit.done(function (details) {
QUnit.done((details) => {
//console.log("QUnit.done");
//console.log(details);
var message: any = {};
Expand All @@ -40,25 +40,29 @@
message.passed = details.passed;
message.total = details.total;
message.runtime = details.runtime;
this.sendCommandToDashboard("done", self.getID(), message);
this.sendToDashboard(message);
});
});
}

public refresh(): void {

}

public runTest(testContent: any): void {
eval(testContent);
}

public onRealtimeMessageReceivedFromDashboardSide(receivedObject: any): void {
//console.log("onRealtimeMessageReceivedFromDashboardSide");
//console.log(receivedObject);
switch (receivedObject.commandType) {
case "runTest":
eval(receivedObject.testContent);
break;
}

}
}

UnitTestRunnerClient.prototype.ClientCommands = {
runTest: function (data) {
var plugin = <UnitTestRunnerClient>this;
plugin.runTest(data);
}

}

//Register the plugin with vorlon core
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,8 @@
self._dropPanel.classList.remove("droppable");
};
this._txtRunTest = <HTMLTextAreaElement>Tools.QuerySelectorById(div, "txtRunTest");
this._btnRunTest.addEventListener("run",() => {
var message: any = {};
message.commandType = "runTest";
message.testContent = this._txtRunTest.value;
//console.log("runTest");
//console.log(message);
this.sendCommandToClient(message);
this._btnRunTest.addEventListener("run", () => {
this.sendCommandToClient("runTest", this._txtRunTest.value);
});

this._containerList = Tools.QuerySelectorById(div, "testResultsList");
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ $ vorlon
With the server is running, open http://localhost:1337 in your browser to see the Vorlon.JS dashboard.
```

**You may notice errors from Python, node-gyp and socket.io. This is a known issue already reported to socket.io team. This is not a blocking issue though as socket.io still works well even with this error :)**

### Custom port

[Linux]
Expand Down
2 changes: 1 addition & 1 deletion Server/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{ "id": "NETWORK", "name": "Network Monitor", "panel": "top", "foldername": "networkMonitor", "enabled": true },
{ "id": "RESOURCES", "name": "Resources Explorer", "panel": "top", "foldername": "resourcesExplorer", "enabled": true },
{ "id": "DEVICE", "name": "My Device", "panel": "top", "foldername": "device", "enabled": true },
{ "id": "UNITTEST", "name": "Unit Test", "panel": "top", "foldername": "unitTestRunner", "enabled": false },
{ "id": "UNITTEST", "name": "Unit Test", "panel": "top", "foldername": "unitTestRunner", "enabled": true },
{ "id": "BABYLONINSPECTOR", "name": "Babylon Inspector", "panel": "top", "foldername": "babylonInspector", "enabled": false },
{ "id": "WEBSTANDARDS", "name": "Best practices", "panel": "top", "foldername": "webstandards", "enabled": true }
],
Expand Down
4 changes: 2 additions & 2 deletions Server/public/stylesheets/components/base.styl
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ a
color: $blue
text-decoration: none

.loader
.waitLoader
transform: scale(1.5)

.loader.hidden
.waitLoader.hidden
display: none

// Clearfix
Expand Down
2 changes: 1 addition & 1 deletion Server/public/vorlon.dashboardManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ module VORLON {
//Hide waiting page and let's not bounce the logo !
var elt = <HTMLElement>document.querySelector('.dashboard-plugins-overlay');
VORLON.Tools.RemoveClass(elt, 'hidden');
elt = <HTMLElement>document.querySelector('.loader');
elt = <HTMLElement>document.querySelector('.waitLoader');
VORLON.Tools.RemoveClass(elt, 'hidden');
}

Expand Down
2 changes: 1 addition & 1 deletion Server/views/includes/dashboard-plugins.jade
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ section.dashboard-plugins-container
h3 Once your page is loaded, the client will appear in the sidebar on the left.
h3 Click on it to start inspecting your website.
br
div.loader.hidden
div.waitLoader.hidden
span.fa.fa-spin.fa-spinner

0 comments on commit f23bbdc

Please sign in to comment.