web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

define better color palette

Browse Source
This commit is contained in:
ansuz
2017-04-06 18:45:40 +02:00
parent 84029ac2d7
commit 6e1ffcc18d
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
customize.dist/application_config.js
View File

@@ -12,5 +12,22 @@ define(function() {
*/ */
config.notificationTimeout = 5000; config.notificationTimeout = 5000;
config.whiteboardPalette = [
'#000000', // black
'#FFFFFF', // white
'#848484', // grey
'#FF0000', // red
'#FF8080', // peach?
'#FF8000', // orange
'#FFFF00', // yellow
'#80FF80', // light green
'#00FF00', // green
'#00FFFF', // cyan
'#008B8B', // dark cyan
'#0000FF', // blue
'#FF00FF', // fuschia
'#800080', // purple
];
return config; return config;
}); });

14
www/whiteboard/main.js
View File

@@ -13,10 +13,11 @@ define([
'/common/cryptpad-common.js', '/common/cryptpad-common.js',
'/common/visible.js', '/common/visible.js',
'/common/notify.js', '/common/notify.js',
'/customize/application_config.js',
'/bower_components/secure-fabric.js/dist/fabric.min.js', '/bower_components/secure-fabric.js/dist/fabric.min.js',
'/bower_components/jquery/dist/jquery.min.js', '/bower_components/jquery/dist/jquery.min.js',
'/bower_components/file-saver/FileSaver.min.js', '/bower_components/file-saver/FileSaver.min.js',
], function (Config, Realtime, Crypto, Toolbar, TextPatcher, JSONSortify, JsonOT, Cryptpad, Visible, Notify) { ], function (Config, Realtime, Crypto, Toolbar, TextPatcher, JSONSortify, JsonOT, Cryptpad, Visible, Notify, AppConfig) {
var saveAs = window.saveAs; var saveAs = window.saveAs;
var Messages = Cryptpad.Messages; var Messages = Cryptpad.Messages;
@@ -96,16 +97,12 @@ define([
$width.on('change', updateBrushWidth); $width.on('change', updateBrushWidth);
var pickColor = function (current, cb) { var pickColor = function (current, cb) {
// TODO find out why initial color is not being set
// http://jsfiddle.net/j3hZB/
console.log(current);
var $picker = $('<input>', { var $picker = $('<input>', {
type: 'color', type: 'color',
value: '#FFFFFF', value: '#FFFFFF',
}) })
.css({ .css({
visibility: 'hidden' visibility: 'hidden'
//display: 'none',
}) })
.on('change', function () { .on('change', function () {
var color = this.value; var color = this.value;
@@ -134,9 +131,10 @@ define([
return "#" + hex(rgb[1]) + hex(rgb[2]) + hex(rgb[3]); return "#" + hex(rgb[1]) + hex(rgb[2]) + hex(rgb[3]);
}; };
// TODO add a better color palette var palette = AppConfig.whiteboardPalette || [
var palette = ['red', 'blue', 'green', 'white', 'black', 'purple', 'red', 'blue', 'green', 'white', 'black', 'purple',
'gray', 'beige', 'brown', 'cyan', 'darkcyan', 'gold', 'yellow', 'pink']; 'gray', 'beige', 'brown', 'cyan', 'darkcyan', 'gold', 'yellow', 'pink'
];
$('.palette-color').on('click', function () { $('.palette-color').on('click', function () {
var color = $(this).css('background-color'); var color = $(this).css('background-color');