aboutsummaryrefslogtreecommitdiff
path: root/js/tools/TagTool.js
diff options
context:
space:
mode:
authorJonathan Duran2012-05-22 10:32:03 -0700
committerJonathan Duran2012-05-22 10:32:03 -0700
commit7b76e4664b35f044e9f24c060f1e092cb5e5c4b0 (patch)
treef0f6168b083aa929d34f37edca6c87ce7c3743bd /js/tools/TagTool.js
parent0dc43f8b6d7db6d9ed698e8c4568e942d8e3d8eb (diff)
parentc37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff)
downloadninja-7b76e4664b35f044e9f24c060f1e092cb5e5c4b0.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/tools/TagTool.js')
-rwxr-xr-xjs/tools/TagTool.js5
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 }