From 81f34e224c0e28ebc37ecd9bd7ea7e607fb98486 Mon Sep 17 00:00:00 2001
From: Abijeet <abijeetpatro@gmail.com>
Date: Sun, 3 Dec 2017 18:26:54 +0530
Subject: Allows adding of hex color to the theme-color

Fixes #7158. Adds a # on the color if missing.

Increased maxlength, added hash:true for jscolor, and adding a # if not present on the change event.

Since the input element now allows a hex code, changed values to hexcode.

In addition, added a function to get RGB array from hex or rgb values. Calling it in both methods and using it to perform comparison.

Also changed the way we were determining whether the jscolor component had loaded.

Changed the control to use data-jscolor rather than defining opts in the class.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
---
 apps/theming/js/settings-admin.js         | 6 +++++-
 apps/theming/templates/settings-admin.php | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'apps/theming')

diff --git a/apps/theming/js/settings-admin.js b/apps/theming/js/settings-admin.js
index 44a799a19b4..7df1bbf1125 100644
--- a/apps/theming/js/settings-admin.js
+++ b/apps/theming/js/settings-admin.js
@@ -206,7 +206,11 @@ $(document).ready(function () {
 	});
 
 	$('#theming-color').change(function (e) {
-		setThemingValue('color', '#' + $(this).val());
+		var color = $(this).val();
+		if (color.indexOf('#') !== 0) {
+			color = '#' + color;
+		}
+		setThemingValue('color', color);
 	});
 
 	$('.theme-undo').click(function (e) {
diff --git a/apps/theming/templates/settings-admin.php b/apps/theming/templates/settings-admin.php
index c7451e595d7..1b8ed87bb0d 100644
--- a/apps/theming/templates/settings-admin.php
+++ b/apps/theming/templates/settings-admin.php
@@ -62,7 +62,7 @@ style('theming', 'settings-admin');
 	<div>
 		<label>
 			<span><?php p($l->t('Color')) ?></span>
-			<input id="theming-color" type="text" class="jscolor" maxlength="6" value="<?php p($_['color']) ?>" />
+			<input id="theming-color" type="text" class="jscolor" data-jscolor="{hash:true}" maxlength="7" value="<?php p($_['color']) ?>" />
 			<div data-setting="color" data-toggle="tooltip" data-original-title="<?php p($l->t('Reset to default')); ?>" class="theme-undo icon icon-history"></div>
 		</label>
 	</div>
-- 
cgit v1.2.3