diff options
Diffstat (limited to 'js')
-rwxr-xr-x | js/components/tools-properties/tag-properties.reel/tag-properties.js | 2 | ||||
-rwxr-xr-x | js/tools/TagTool.js | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.js b/js/components/tools-properties/tag-properties.reel/tag-properties.js index 1357ba67..52c6f44c 100755 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.js +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.js | |||
@@ -72,7 +72,7 @@ var TagProperties = exports.TagProperties = Montage.create(ToolProperties, { | |||
72 | handleFillColorChange: { | 72 | handleFillColorChange: { |
73 | value: function (e) { | 73 | value: function (e) { |
74 | this.fill = e._event; | 74 | this.fill = e._event; |
75 | this.fill.webGlColor = this.application.ninja.colorController.colorModel.colorToWebGl(e._event.color); | 75 | // this.fill.webGlColor = this.application.ninja.colorController.colorModel.colorToWebGl(e._event.color); |
76 | } | 76 | } |
77 | }, | 77 | }, |
78 | 78 | ||
diff --git a/js/tools/TagTool.js b/js/tools/TagTool.js index 5e9c792b..5520fa89 100755 --- a/js/tools/TagTool.js +++ b/js/tools/TagTool.js | |||
@@ -92,6 +92,11 @@ exports.TagTool = Montage.create(DrawingTool, { | |||
92 | // Create the styles | 92 | // Create the styles |
93 | styles = document.application.njUtils.stylesFromDraw(element, ~~drawData.width, ~~drawData.height, drawData); | 93 | styles = document.application.njUtils.stylesFromDraw(element, ~~drawData.width, ~~drawData.height, drawData); |
94 | 94 | ||
95 | // Add color | ||
96 | if(this.options.getProperty("fill.colorMode") !== "nocolor") { | ||
97 | styles['background-color'] = this.options.getProperty("fill.color.css"); | ||
98 | } | ||
99 | |||
95 | // Add the element and styles | 100 | // Add the element and styles |
96 | this.application.ninja.elementMediator.addElements(element, styles); | 101 | this.application.ninja.elementMediator.addElements(element, styles); |
97 | } | 102 | } |