[Pkg-javascript-commits] [rainloop] 02/02: Fixed ckeditor skin.

[Daniel Ring]

This is an automated email from the git hooks/post-receive script.

techwolf-guest pushed a commit to branch master
in repository rainloop.

commit 5dceb872a58e3d7578524509b4c470a1e590ac49
Author: Daniel Ring <dring at wolfishly.me>
Date:   Thu Jan 11 19:47:21 2018 -0800

    Fixed ckeditor skin.
---
 debian/Makefile                      | 1 +
 debian/patches/debian-ckeditor.patch | 4 +++-
 debian/source/lintian-overrides      | 3 +--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/Makefile b/debian/Makefile
index c723ea4..c931855 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -183,6 +183,7 @@ fontastic: | clean
 ckeditorPlugins:
 	cp -r vendors/ckeditor-plugins/plain rainloop/v/0.0.0/static/ckeditor-plugins/
 	cp -r vendors/ckeditor-plugins/signature rainloop/v/0.0.0/static/ckeditor-plugins/
+	cp -r vendors/ckeditor/skins/moono-lisa rainloop/v/0.0.0/static/ckeditor-plugins/
 
 .PHONY: vendors
 vendors: | moment ckeditorPlugins fontastic lightgallery
diff --git a/debian/patches/debian-ckeditor.patch b/debian/patches/debian-ckeditor.patch
index b78a31a..6d80f10 100644
--- a/debian/patches/debian-ckeditor.patch
+++ b/debian/patches/debian-ckeditor.patch
@@ -1,10 +1,12 @@
 Add Debian paths for upstream's ckeditor plugins to the load process.
 --- a/dev/Common/HtmlEditor.js
 +++ b/dev/Common/HtmlEditor.js
-@@ -258,6 +258,9 @@
+@@ -258,6 +258,11 @@
  						allowSource = !!Settings.appSettingsGet('allowHtmlEditorSourceButton'),
  						biti = !!Settings.appSettingsGet('allowHtmlEditorBitiButtons');
  
++					config.skin = 'moono-lisa,'+window.location.href.split('#')[0]+'static/ckeditor-plugins/moono-lisa/';
++					window.CKEDITOR.skin.name = 'moono-lisa';
 +					window.CKEDITOR.plugins.addExternal('plain', window.location.href.split('#')[0]+'static/ckeditor-plugins/plain/');
 +					window.CKEDITOR.plugins.addExternal('signature', window.location.href.split('#')[0]+'static/ckeditor-plugins/signature/');
 +
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index ac6bae0..ef7aa5f 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -2,8 +2,7 @@
 rainloop source: source-is-missing dev/Common/Consts.js *
 rainloop source: source-is-missing vendors/jua/jua.js *
 
-#Amalgamated and minified copy of package "ckeditor" bundled by upstream,
-#unused in build
+#Amalgamated and minified copy of package "ckeditor" bundled by upstream
 rainloop source: source-is-missing vendors/ckeditor/*
 
 #Source provided as vendors/bootstrap/js/bootstrap.orig.js

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/rainloop.git