diff options
author | hwc487 | 2012-05-17 11:06:20 -0700 |
---|---|---|
committer | hwc487 | 2012-05-17 11:06:20 -0700 |
commit | 0a3c703ce285941da20167a6d04b13b7eced23be (patch) | |
tree | e87019bcc3356c58dc93d982af2cfe16b582974b /js/tools/TagTool.js | |
parent | 1e649405d66f17d6acddb9055b181bba7ad70566 (diff) | |
parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
download | ninja-0a3c703ce285941da20167a6d04b13b7eced23be.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
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 43a774e1..1339898a 100755 --- a/js/tools/TagTool.js +++ b/js/tools/TagTool.js | |||
@@ -94,6 +94,11 @@ exports.TagTool = Montage.create(DrawingTool, { | |||
94 | // Create the styles | 94 | // Create the styles |
95 | styles = document.application.njUtils.stylesFromDraw(element, ~~drawData.width, ~~drawData.height, drawData); | 95 | styles = document.application.njUtils.stylesFromDraw(element, ~~drawData.width, ~~drawData.height, drawData); |
96 | 96 | ||
97 | // Add color | ||
98 | if(this.options.getProperty("fill.colorMode") !== "nocolor") { | ||
99 | styles['background-color'] = this.options.getProperty("fill.color.css"); | ||
100 | } | ||
101 | |||
97 | // Add the element and styles | 102 | // Add the element and styles |
98 | this.application.ninja.elementMediator.addElements(element, styles); | 103 | this.application.ninja.elementMediator.addElements(element, styles); |
99 | } | 104 | } |