diff options
author | hwc487 | 2012-05-17 08:58:52 -0700 |
---|---|---|
committer | hwc487 | 2012-05-17 08:58:52 -0700 |
commit | a73034090b30d79a0722fc5d32e081f35d2c7f5c (patch) | |
tree | 1c7a8c519a3d2e2f52df73511281918c6c70449a /js/tools/TagTool.js | |
parent | cb37bee07085690d72e69a82e76cae9166e5f0f1 (diff) | |
parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
download | ninja-a73034090b30d79a0722fc5d32e081f35d2c7f5c.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs
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 | } |