From c15fee6eb6ce7f2944b5e5ccb53411b76e2abf82 Mon Sep 17 00:00:00 2001
From: Alexander Zhukov <a.zhukov@akveo.com>
Date: Sat, 21 Jan 2017 16:13:08 +0300
Subject: [PATCH] fix(ckeditor): fix ckeditor loader

---
 .../editors/components/ckeditor/ckeditor.component.ts | 11 ++++++-----
 .../editors/components/ckeditor/ckeditor.loader.ts    |  3 +--
 .../pages/editors/components/ckeditor/ckeditor.scss   |  5 +++--
 src/app/theme/sass/conf/colorSchemes/_ng2.scss        |  1 +
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/app/pages/editors/components/ckeditor/ckeditor.component.ts b/src/app/pages/editors/components/ckeditor/ckeditor.component.ts
index 15d5d392..615d4077 100644
--- a/src/app/pages/editors/components/ckeditor/ckeditor.component.ts
+++ b/src/app/pages/editors/components/ckeditor/ckeditor.component.ts
@@ -1,19 +1,20 @@
-import { Component, ViewEncapsulation } from '@angular/core';
+import { Component } from '@angular/core';
 
-import './ckeditor.loader.ts';
+import './ckeditor.loader';
+import 'ckeditor';
+import 'style-loader!./ckeditor.scss';
 
 @Component({
   selector: 'ckeditor-component',
-  // encapsulation: ViewEncapsulation.None,
   templateUrl: './ckeditor.html',
-  styleUrls: ['./ckeditor.scss']
 })
 
 export class Ckeditor {
   public ckeditorContent:string = '<p>Hello CKEditor</p>';
   public config = {
     uiColor: '#F0F3F4',
-    height: '600'
+    height: '600',
+    extraPlugins: 'divarea',
   };
 
   constructor() {
diff --git a/src/app/pages/editors/components/ckeditor/ckeditor.loader.ts b/src/app/pages/editors/components/ckeditor/ckeditor.loader.ts
index c272f9c9..78c3e43e 100644
--- a/src/app/pages/editors/components/ckeditor/ckeditor.loader.ts
+++ b/src/app/pages/editors/components/ckeditor/ckeditor.loader.ts
@@ -1,2 +1 @@
-window['CKEDITOR_BASEPATH'] = '//cdn.ckeditor.com/4.6.0/standard/';
-import 'ckeditor';
+window['CKEDITOR_BASEPATH'] = '/ckeditor/';
diff --git a/src/app/pages/editors/components/ckeditor/ckeditor.scss b/src/app/pages/editors/components/ckeditor/ckeditor.scss
index 54c1e628..93917a78 100644
--- a/src/app/pages/editors/components/ckeditor/ckeditor.scss
+++ b/src/app/pages/editors/components/ckeditor/ckeditor.scss
@@ -1,5 +1,6 @@
 @import '../../../../theme/sass/conf/conf';
 
-.cke_source {
-  color: $dropdown-text!important;
+.cke_wysiwyg_div {
+  padding: 20px !important;
+  color: $ckeditor-text !important;
 }
diff --git a/src/app/theme/sass/conf/colorSchemes/_ng2.scss b/src/app/theme/sass/conf/colorSchemes/_ng2.scss
index 1d895829..43d1a69a 100644
--- a/src/app/theme/sass/conf/colorSchemes/_ng2.scss
+++ b/src/app/theme/sass/conf/colorSchemes/_ng2.scss
@@ -13,6 +13,7 @@ $border-light: rgba(255, 255, 255, 0.3); // lighter version of border color (for
 $input-border: rgba(255, 255, 255, 0.6); // input border color
 $input-background: rgba(255, 255, 255, 0.1); // input border color for hover
 $dropdown-text: #7d7d7d; // dropdown text color
+$ckeditor-text: #333;
 
 // sidebar colors
 $sidebar: #282828;