diff options
author | Valerio Virgillito | 2012-05-16 16:06:56 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-16 16:06:56 -0700 |
commit | 92fcb770aff434e994e7a39a61d8fac4a017dca0 (patch) | |
tree | e385beee8f2694596f6305bf90eb7eb4521de2e2 /js/tools/TagTool.js | |
parent | bdd4b24c9e738c65ab8f6f9942358c59fe60edf1 (diff) | |
parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
download | ninja-92fcb770aff434e994e7a39a61d8fac4a017dca0.tar.gz |
Merge branch 'refs/heads/master' into dom-architecture
Conflicts:
js/document/templates/montage-html/package.json
js/io/system/ninjalibrary.json
node_modules/descriptor.json
Signed-off-by: Valerio Virgillito <valerio@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 | } |