diff options
author | Kruti Shah | 2012-05-31 10:44:45 -0700 |
---|---|---|
committer | Kruti Shah | 2012-05-31 10:44:45 -0700 |
commit | c350cc1c060fdf17357ddadce024267943784593 (patch) | |
tree | 453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/tools/TagTool.js | |
parent | fdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff) | |
parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
download | ninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
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 | } |