diff options
author | hwc487 | 2012-05-11 13:52:55 -0700 |
---|---|---|
committer | hwc487 | 2012-05-11 13:52:55 -0700 |
commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /js/components/tools-properties/tag-properties.reel/tag-properties.js | |
parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
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: { |