diff options
author | Jon Reid | 2012-05-22 10:40:40 -0700 |
---|---|---|
committer | Jon Reid | 2012-05-22 10:40:40 -0700 |
commit | d43a3179171a9f82c7a17425ec69ff0a4d571f10 (patch) | |
tree | 1c78ccc588f04bac9bff4de82e527a128162cf4f /js/tools/TagTool.js | |
parent | 1324301feea23f9d66c9ca2f52e004b552e9ed96 (diff) | |
parent | 0b6dfbbc7f6c0a67bd415ee8d64685b3f209edfa (diff) | |
download | ninja-d43a3179171a9f82c7a17425ec69ff0a4d571f10.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/tools/TagTool.js')
-rwxr-xr-x | js/tools/TagTool.js | 5 |
1 files changed, 5 insertions, 0 deletions
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 | } |