From 058c414ae3068a6a9dcd88d1e46a910228e74e9b Mon Sep 17 00:00:00 2001 From: dm Date: Thu, 21 Jan 2021 09:09:17 +0100 Subject: [PATCH] fix --- public/javascripts/spacedeck_sections.js | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/public/javascripts/spacedeck_sections.js b/public/javascripts/spacedeck_sections.js index b21b601..11c4b3c 100644 --- a/public/javascripts/spacedeck_sections.js +++ b/public/javascripts/spacedeck_sections.js @@ -68,9 +68,9 @@ var SpacedeckSections = { line_height: 1.5, letter_spacing: 0, - stroke_color: "#000000", - fill_color: "#000000", - text_color: "#000000", + stroke_color: ENV.options.default_stroke_color ? ENV.options.default_stroke_color : "#000000", + fill_color: ENV.options.default_fill_color ? ENV.options.default_fill_color : "#000000", + text_color: ENV.options.default_text_color ? ENV.options.default_text_color : "#000000", background_color: "#ffffff", padding: 0, @@ -109,10 +109,6 @@ var SpacedeckSections = { color_picker_hue: 127, color_picker_opacity: 255, - default_text_color: ENV.options.default_text_color ? ENV.options.default_text_color : "#000000", - default_stroke_color: ENV.options.default_stroke_color ? ENV.options.default_stroke_color : "#000000", - default_fill_color: ENV.options.default_fill_color ? ENV.options.default_fill_color : "#000000", - swatches: ENV.options.swatches ? ENV.options.swatches : [ {id:1, hex:"#ff00ff"}, {id:2, hex:"#ffff00"}, @@ -926,10 +922,6 @@ var SpacedeckSections = { } this.hide_toolbar_props(); - // reset active_style to defaults for new creation of artifacts - this.active_style.text_color = this.default_text_color; - this.active_style.stroke_color = this.default_stroke_color; - this.active_style.fill_color = this.default_fill_color; document.getSelection().removeAllRanges();