diff options
author | Valerio Virgillito | 2012-05-03 23:08:31 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-03 23:08:31 -0700 |
commit | 3542dab96689a54f97fff6fc654838c07c724517 (patch) | |
tree | 1c8a8a53985bb72a34ad302e402ffe24aec2f242 /js/components/tools-properties/tag-properties.reel/tag-properties.js | |
parent | 24b483db367291b72170f969de78efcb1a9b95bd (diff) | |
parent | 60388a7d01d9e34b5cd15bd5cb190a610e4f9a0e (diff) | |
download | ninja-3542dab96689a54f97fff6fc654838c07c724517.tar.gz |
Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-id
Conflicts:
js/components/tools-properties/tag-properties.reel/tag-properties.html
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
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 1caabc35..6519d5b8 100755 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.js +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.js | |||
@@ -33,9 +33,9 @@ exports.TagProperties = Montage.create(ToolProperties, { | |||
33 | 33 | ||
34 | handleClick: { | 34 | handleClick: { |
35 | value: function(event) { | 35 | value: function(event) { |
36 | this.selectedElement = event._event.target.id; | 36 | this.selectedElement = event._event.target.value; |
37 | 37 | ||
38 | if(this.selectedElement === "customTool") { | 38 | if(this.selectedElement === "custom") { |
39 | this.customName.style["display"] = ""; | 39 | this.customName.style["display"] = ""; |
40 | this.customLabel.style["display"] = ""; | 40 | this.customLabel.style["display"] = ""; |
41 | } else { | 41 | } else { |
@@ -46,7 +46,7 @@ exports.TagProperties = Montage.create(ToolProperties, { | |||
46 | }, | 46 | }, |
47 | 47 | ||
48 | _selectedElement: { | 48 | _selectedElement: { |
49 | value: "divTool", enumerable: false | 49 | value: "div", enumerable: false |
50 | }, | 50 | }, |
51 | 51 | ||
52 | selectedElement: { | 52 | selectedElement: { |