From e01e3591e9db353e3564e9311af249e331fee911 Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Tue, 15 Dec 2015 09:43:03 -0400 Subject: [PATCH 1/3] Use ngBind instead of curly braces interpolation --- lib/index.html | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/index.html b/lib/index.html index ea505e7d..2059e2e1 100644 --- a/lib/index.html +++ b/lib/index.html @@ -31,7 +31,7 @@ Select image
- {{ app.selection.getImage() | basename }} +
@@ -58,8 +58,10 @@ - Drive {{ drive.mountpoint }}\ - {{ drive.size }} - {{ drive.device }} - {{ drive.size }} + + @@ -73,7 +75,7 @@
- {{ app.selection.getDrive().device }} +
@@ -91,7 +93,8 @@ Finishing... Burn! Starting... - {{ app.writer.progress }}% + From 2cb79090d1beb07017c0641da46953354d49cfb8 Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Tue, 15 Dec 2015 09:51:58 -0400 Subject: [PATCH 2/3] Implement poor man's ngCloak based on app controller ngCloak is removed by angular when parsing the template, however this doesn't seem to be enough to keep the content hidden until the application is completely ready. We accomplish this by setting `display: none` to the `body` element and maing it display again when our main controller starts, at which point we know everything is up and running. --- build/browser/app.js | 3 +++ lib/browser/app.js | 3 +++ lib/index.html | 3 +-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/build/browser/app.js b/build/browser/app.js index 0db9cba5..41df4096 100644 --- a/build/browser/app.js +++ b/build/browser/app.js @@ -64,6 +64,9 @@ app.controller('AppController', function($q, DriveScannerService, SelectionState this.restart(); + // We're ready to unhide the application now + document.querySelector('body').style.display = 'initial'; + this.selectImage = function() { return $q.when(dialog.selectImage()).then(function(image) { self.selection.setImage(image); diff --git a/lib/browser/app.js b/lib/browser/app.js index 1842a87b..3ce6ef54 100644 --- a/lib/browser/app.js +++ b/lib/browser/app.js @@ -63,6 +63,9 @@ app.controller('AppController', function($q, DriveScannerService, SelectionState this.restart(); + // We're ready to unhide the application now + document.querySelector('body').style.display = 'initial'; + this.selectImage = function() { return $q.when(dialog.selectImage()).then(function(image) { self.selection.setImage(image); diff --git a/lib/index.html b/lib/index.html index 2059e2e1..3ab86b32 100644 --- a/lib/index.html +++ b/lib/index.html @@ -3,7 +3,6 @@ Herostratus - @@ -15,7 +14,7 @@ - +
From 186d3847fef3a73c26ccb11a9289827668026190 Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Tue, 15 Dec 2015 09:57:44 -0400 Subject: [PATCH 3/3] Prevent white flash when running application We accomplish this by setting the background color of the `html` element to match the greyish background color of the application. --- build/css/main.css | 3 +++ lib/scss/main.scss | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/build/css/main.css b/build/css/main.css index a09fad4f..6795da1a 100644 --- a/build/css/main.css +++ b/build/css/main.css @@ -5938,6 +5938,9 @@ body { .space-right-tiny { margin-right: 5px; } +html { + background-color: #535760; } + hero-badge .badge { background-color: #535760; } diff --git a/lib/scss/main.scss b/lib/scss/main.scss index 9f0ed846..cd735e09 100644 --- a/lib/scss/main.scss +++ b/lib/scss/main.scss @@ -39,6 +39,11 @@ $btn-padding: 10px; @import "./modules/space"; +// Prevent white flash when running application +html { + background-color: $body-bg; +} + hero-badge .badge { background-color: $body-bg; }