From 570fbec090eadfe4173014e9151c54fdd5b0080e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Thu, 15 Mar 2018 12:23:28 +0100 Subject: [PATCH 1/3] Change default source code, as it can be seen due to latency --- src/app/webide/webide.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/webide/webide.component.ts b/src/app/webide/webide.component.ts index e9758ff..30c8cbb 100644 --- a/src/app/webide/webide.component.ts +++ b/src/app/webide/webide.component.ts @@ -19,7 +19,7 @@ import { DeploymentNotificationService } from '../services/deployment-notificati const modelist = brace.acequire('ace/ext/modelist'); -const defaultSourceCode = 'Oops! Something went wrong :('; +const defaultSourceCode = 'Loading your file...'; const autosave_interval = 2000; @Component({ From c69bac4e83ce2c7b74da15d2456a368b2613c801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Thu, 15 Mar 2018 12:30:26 +0100 Subject: [PATCH 2/3] Fix updateFileData removing code on lost read messages --- src/app/webide/webide.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/webide/webide.component.ts b/src/app/webide/webide.component.ts index 30c8cbb..f4c2246 100644 --- a/src/app/webide/webide.component.ts +++ b/src/app/webide/webide.component.ts @@ -69,7 +69,7 @@ export class WebideComponent implements OnInit { updateFileData(data: SourceCode) { this.filename = data.filename; this.directory = data.directory; - this.code = data.content; + this.code = (data.content != null) ? data.content : this.code; this.language = modelist.getModeForPath(this.filename).name; this.files = data.files; } From 496f997bb7e63db1ff3d6926738bdb34b4cf42a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Thu, 15 Mar 2018 12:40:01 +0100 Subject: [PATCH 3/3] Remove TODO I thought about --- src/app/services/websocket.service.ts | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/app/services/websocket.service.ts b/src/app/services/websocket.service.ts index b3d5e4a..e4a5fed 100644 --- a/src/app/services/websocket.service.ts +++ b/src/app/services/websocket.service.ts @@ -41,14 +41,9 @@ export class WebSocketService { } public send(key: string, data?: any, trigger?: any): void { - // TODO: do this nicer? const message = {'key': key}; - if (data) { - message['data'] = data; - } - if (trigger) { - message['trigger'] = trigger; - } + if (data) { message['data'] = data; } + if (trigger) { message['trigger'] = trigger; } this.uplink.next(message); } }