diff options
author | John Mayhew | 2012-05-07 16:30:19 -0700 |
---|---|---|
committer | John Mayhew | 2012-05-07 16:30:19 -0700 |
commit | db4ba95f50148198759dde503ec1c778184d9dbe (patch) | |
tree | 8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/components/tools-properties/tag-properties.reel/tag-properties.js | |
parent | 843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff) | |
parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
download | ninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/components/tools-properties/brush-properties.reel/brush-properties.html
js/components/tools-properties/fill-properties.reel/fill-properties.html
js/components/tools-properties/pen-properties.reel/pen-properties.html
js/components/tools-properties/pencil-properties.reel/pencil-properties.html
js/components/tools-properties/selection-properties.reel/selection-properties.html
js/components/tools-properties/shape-properties.reel/shape-properties.html
js/components/tools-properties/tag-properties.reel/tag-properties.html
js/components/tools-properties/text-properties.reel/text-properties.html
Diffstat (limited to 'js/components/tools-properties/tag-properties.reel/tag-properties.js')
-rwxr-xr-x | js/components/tools-properties/tag-properties.reel/tag-properties.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.js b/js/components/tools-properties/tag-properties.reel/tag-properties.js index 32063d9a..1357ba67 100755 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.js +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.js | |||
@@ -78,9 +78,9 @@ var TagProperties = exports.TagProperties = Montage.create(ToolProperties, { | |||
78 | 78 | ||
79 | handleClick: { | 79 | handleClick: { |
80 | value: function(event) { | 80 | value: function(event) { |
81 | this.selectedElement = event._event.target.id; | 81 | this.selectedElement = event._event.target.value; |
82 | 82 | ||
83 | if(this.selectedElement === "customTool") { | 83 | if(this.selectedElement === "custom") { |
84 | this.customName.style["display"] = ""; | 84 | this.customName.style["display"] = ""; |
85 | this.customLabel.style["display"] = ""; | 85 | this.customLabel.style["display"] = ""; |
86 | } else { | 86 | } else { |
@@ -91,7 +91,7 @@ var TagProperties = exports.TagProperties = Montage.create(ToolProperties, { | |||
91 | }, | 91 | }, |
92 | 92 | ||
93 | _selectedElement: { | 93 | _selectedElement: { |
94 | value: "divTool", enumerable: false | 94 | value: "div", enumerable: false |
95 | }, | 95 | }, |
96 | 96 | ||
97 | selectedElement: { | 97 | selectedElement: { |