From bc3c2156df22090e8be360b6a907ccc873a98a3a Mon Sep 17 00:00:00 2001 From: Blackbaud-SteveBrush Date: Thu, 15 Mar 2018 10:55:43 -0400 Subject: [PATCH 1/6] Added button to error demo --- src/demos/error/error-demo.component.html | 113 +++++++++++----------- 1 file changed, 59 insertions(+), 54 deletions(-) diff --git a/src/demos/error/error-demo.component.html b/src/demos/error/error-demo.component.html index b2d8ad256..6e015903c 100644 --- a/src/demos/error/error-demo.component.html +++ b/src/demos/error/error-demo.component.html @@ -1,58 +1,63 @@ -
- - - - - -
+

+ Embed errors within the page markup +

-
- - - - - -
+ + + + + -
- - - - - -
+ + + + + -
- - - - - -
+ + + + + -
- - - - - - custom title - - - custom description - - - - - -
+ + + + + + + + + + + + custom title + + + custom description + + + + + + +

+ Display an error message programmatically +

+ + From 767474bbf4818e5dc2d69b84dbb083d4352e4a7a Mon Sep 17 00:00:00 2001 From: Blackbaud-SteveBrush Date: Thu, 15 Mar 2018 11:02:19 -0400 Subject: [PATCH 2/6] Adjusted markup --- src/demos/demo.service.ts | 4 ++++ src/demos/error/error-demo.component.html | 4 ++-- src/demos/error/error-demo.component.scss | 3 +++ src/demos/error/error-demo.component.ts | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 src/demos/error/error-demo.component.scss diff --git a/src/demos/demo.service.ts b/src/demos/demo.service.ts index f52e3266c..5d2829c3e 100644 --- a/src/demos/demo.service.ts +++ b/src/demos/demo.service.ts @@ -278,6 +278,10 @@ export class SkyDemoService { name: 'error-demo.component.html', fileContents: require('!!raw-loader!./error/error-demo.component.html') }, + { + name: 'error-demo.component.scss', + fileContents: require('!!raw-loader!./error/error-demo.component.scss') + }, { name: 'error-demo.component.ts', fileContents: require('!!raw-loader!./error/error-demo.component.ts'), diff --git a/src/demos/error/error-demo.component.html b/src/demos/error/error-demo.component.html index 6e015903c..16144bf43 100644 --- a/src/demos/error/error-demo.component.html +++ b/src/demos/error/error-demo.component.html @@ -52,12 +52,12 @@

- Display an error message programmatically + Display an error message in a modal

diff --git a/src/demos/error/error-demo.component.scss b/src/demos/error/error-demo.component.scss new file mode 100644 index 000000000..799cf3bff --- /dev/null +++ b/src/demos/error/error-demo.component.scss @@ -0,0 +1,3 @@ +::ng-deep .sky-error { + margin: 40px 0; +} diff --git a/src/demos/error/error-demo.component.ts b/src/demos/error/error-demo.component.ts index a04f369fc..3489fadce 100644 --- a/src/demos/error/error-demo.component.ts +++ b/src/demos/error/error-demo.component.ts @@ -8,6 +8,7 @@ import { @Component({ selector: 'sky-error-demo', templateUrl: './error-demo.component.html', + styleUrls: ['./error-demo.component.scss'], providers: [SkyErrorModalService] }) export class SkyErrorDemoComponent { From 58b0e9db631937a46260202367407db0d7d7bc61 Mon Sep 17 00:00:00 2001 From: Blackbaud-SteveBrush Date: Thu, 15 Mar 2018 12:00:27 -0400 Subject: [PATCH 3/6] Template cleanup --- src/demos/error/error-demo.component.html | 33 ++++++++++++++++------- src/demos/error/error-demo.component.ts | 7 +---- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/demos/error/error-demo.component.html b/src/demos/error/error-demo.component.html index 16144bf43..c18daa8aa 100644 --- a/src/demos/error/error-demo.component.html +++ b/src/demos/error/error-demo.component.html @@ -4,7 +4,10 @@

- @@ -12,7 +15,10 @@

- @@ -20,7 +26,10 @@

- @@ -28,7 +37,10 @@

- @@ -36,17 +48,20 @@

- + - custom title + Custom title - custom description + Custom description - diff --git a/src/demos/error/error-demo.component.ts b/src/demos/error/error-demo.component.ts index 3489fadce..fd93ba841 100644 --- a/src/demos/error/error-demo.component.ts +++ b/src/demos/error/error-demo.component.ts @@ -12,11 +12,6 @@ import { providers: [SkyErrorModalService] }) export class SkyErrorDemoComponent { - public errorType: string = 'broken'; - public customTitle: string = 'Custom error title'; - public customDescription: string = 'Custom error description'; - public customActionText: string = 'Custom action'; - constructor( private errorService: SkyErrorModalService ) { } @@ -27,7 +22,7 @@ export class SkyErrorDemoComponent { public openErrorModal() { const config: ErrorModalConfig = { - errorTitle: 'A title thing.', + errorTitle: 'Something bad happened!', errorDescription: 'Try to refresh this page, or come back later.', errorCloseText: 'OK' }; From dc9fb4aa3fd566f10d8a5369b6688ae27c820797 Mon Sep 17 00:00:00 2001 From: Steve Brush Date: Fri, 16 Mar 2018 13:12:18 -0400 Subject: [PATCH 4/6] Update ci.karma.conf.js --- config/karma/ci.karma.conf.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/karma/ci.karma.conf.js b/config/karma/ci.karma.conf.js index 1d01ce4b3..bd5ca69ea 100644 --- a/config/karma/ci.karma.conf.js +++ b/config/karma/ci.karma.conf.js @@ -9,7 +9,8 @@ module.exports = function (config) { browser: 'ie', browser_version: '11.0', os: 'Windows', - os_version: '10' + os_version: '10', + 'browserstack.ie.noFlash': 'true' }, bs_windows_edge: { base: 'BrowserStack', From a86097b20667eb4552f5f3492817e5c62c169ac9 Mon Sep 17 00:00:00 2001 From: Steve Brush Date: Fri, 16 Mar 2018 13:33:18 -0400 Subject: [PATCH 5/6] Update ci.karma.conf.js --- config/karma/ci.karma.conf.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/config/karma/ci.karma.conf.js b/config/karma/ci.karma.conf.js index bd5ca69ea..dfe816bcd 100644 --- a/config/karma/ci.karma.conf.js +++ b/config/karma/ci.karma.conf.js @@ -9,8 +9,7 @@ module.exports = function (config) { browser: 'ie', browser_version: '11.0', os: 'Windows', - os_version: '10', - 'browserstack.ie.noFlash': 'true' + os_version: '10' }, bs_windows_edge: { base: 'BrowserStack', @@ -59,7 +58,10 @@ module.exports = function (config) { captureTimeout: 3e5, browserStack: { port: 9876, - pollingTimeout: 10000 + pollingTimeout: 10000, + ie: { + noFlash: 'true' + } } }); From 6dce18b4e0769a043fc2a2d49d329bc69011dea1 Mon Sep 17 00:00:00 2001 From: Steve Brush Date: Mon, 26 Mar 2018 10:01:42 -0400 Subject: [PATCH 6/6] Update ci.karma.conf.js --- config/karma/ci.karma.conf.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/config/karma/ci.karma.conf.js b/config/karma/ci.karma.conf.js index 63f0edef1..cb60627d7 100644 --- a/config/karma/ci.karma.conf.js +++ b/config/karma/ci.karma.conf.js @@ -47,10 +47,7 @@ module.exports = function (config) { customLaunchers, browserStack: { port: 9876, - pollingTimeout: 10000, - ie: { - noFlash: 'true' - } + pollingTimeout: 10000 } }); };