Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html

Signed-off-by: Jonathan Duran <jduran@motorola.com>

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, {
 
     handleClick: {
         value: function(event) {
-            this.selectedElement = event._event.target.id;
+            this.selectedElement = event._event.target.value;
 
-            if(this.selectedElement === "customTool") {
+            if(this.selectedElement === "custom") {
                 this.customName.style["display"] = "";
                 this.customLabel.style["display"] = "";
             } else {
@@ -46,7 +46,7 @@ exports.TagProperties = Montage.create(ToolProperties, {
     },
 
     _selectedElement: {
-        value: "divTool", enumerable: false
+        value: "div", enumerable: false
     },
 
     selectedElement: {