diff options
author | Jon Reid | 2012-05-15 11:24:53 -0700 |
---|---|---|
committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/tools-properties/tag-properties.reel | |
parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components/tools-properties/tag-properties.reel')
-rwxr-xr-x | js/components/tools-properties/tag-properties.reel/tag-properties.html | 25 | ||||
-rwxr-xr-x | js/components/tools-properties/tag-properties.reel/tag-properties.js | 6 |
2 files changed, 15 insertions, 16 deletions
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.html b/js/components/tools-properties/tag-properties.reel/tag-properties.html index 2b81bb71..edc2d47f 100755 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.html +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE HTML> | 1 | <!DOCTYPE HTML> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
@@ -13,8 +13,7 @@ | |||
13 | { | 13 | { |
14 | 14 | ||
15 | "owner": { | 15 | "owner": { |
16 | "module": "js/components/tools-properties/tag-properties.reel", | 16 | "prototype": "js/components/tools-properties/tag-properties.reel", |
17 | "name": "TagProperties", | ||
18 | "properties": { | 17 | "properties": { |
19 | "element": {"#": "tagProperties"}, | 18 | "element": {"#": "tagProperties"}, |
20 | 19 | ||
@@ -36,26 +35,26 @@ | |||
36 | </head> | 35 | </head> |
37 | 36 | ||
38 | <body> | 37 | <body> |
39 | <div id="tagProperties" class="subToolHolderPanel"> | 38 | <div data-montage-id="tagProperties" class="subToolHolderPanel"> |
40 | <div id="tagToolContainer" class="tagRadioButtons"> | 39 | <div id="tagToolContainer" class="tagRadioButtons"> |
41 | <input type="radio" id="divTool" class="tag-type" title="Div Element" name="TagRadios" checked/> | 40 | <input type="radio" id="divTool" data-montage-id="divTool" class="tag-type" title="Div Element" name="TagRadios" value="div" checked/> |
42 | <input type="radio" id="imageTool" class="tag-type" title="Image Element" name="TagRadios"/> | 41 | <input type="radio" id="imageTool" data-montage-id="imageTool" class="tag-type" title="Image Element" value="image" name="TagRadios"/> |
43 | <input type="radio" id="videoTool" class="tag-type" title="Video Element" name="TagRadios"/> | 42 | <input type="radio" id="videoTool" data-montage-id="videoTool" class="tag-type" title="Video Element" value="video" name="TagRadios"/> |
44 | <input type="radio" id="canvasTool" class="tag-type" title="Canvas Element" name="TagRadios"/> | 43 | <input type="radio" id="canvasTool" data-montage-id="canvasTool" class="tag-type" title="Canvas Element" value="canvas" name="TagRadios"/> |
45 | <input type="radio" id="customTool" class="tag-type" title="Custom Element" name="TagRadios"/> | 44 | <input type="radio" id="customTool" data-montage-id="customTool" class="tag-type" title="Custom Element" value="custom" name="TagRadios"/> |
46 | 45 | ||
47 | <div class="nj-divider divider-vertical"> </div> | 46 | <div class="nj-divider divider-vertical"> </div> |
48 | 47 | ||
49 | <div id="classNameContainer" class="leftLabel"> | 48 | <div id="classNameContainer" class="leftLabel"> |
50 | <label class="label"> Class: | 49 | <label class="label"> Class: |
51 | <input id="className" type="text" name="ClassNameTextBox" class="textBox nj-skinned"> | 50 | <input data-montage-id="className" type="text" name="ClassNameTextBox" class="textBox nj-skinned"> |
52 | </label> | 51 | </label> |
53 | </div> | 52 | </div> |
54 | 53 | ||
55 | <div id="customContainer" class="leftLabel" style="padding-top: 3px;"> | 54 | <div id="customContainer" class="leftLabel" style="padding-top: 3px;"> |
56 | <label class="label"> Tag Name:</label> | 55 | <label class="label"> Tag Name:</label> |
57 | 56 | ||
58 | <select id="customTagCB" class="nj-skinned"> | 57 | <select data-montage-id="customTagCB" class="nj-skinned"> |
59 | <option>article</option> | 58 | <option>article</option> |
60 | <option>aside</option> | 59 | <option>aside</option> |
61 | <option>section</option> | 60 | <option>section</option> |
@@ -67,11 +66,11 @@ | |||
67 | <div id="positionContainer" class="leftLabel" style="padding-top: 3px;"> | 66 | <div id="positionContainer" class="leftLabel" style="padding-top: 3px;"> |
68 | <label class="label"> Position:</label> | 67 | <label class="label"> Position:</label> |
69 | 68 | ||
70 | <select id="positionCB" class="nj-skinned"> | 69 | <select data-montage-id="positionCB" class="nj-skinned"> |
70 | <option>Static</option> | ||
71 | <option>Absolute</option> | 71 | <option>Absolute</option> |
72 | <option>Relative</option> | 72 | <option>Relative</option> |
73 | <option>Fixed</option> | 73 | <option>Fixed</option> |
74 | <option>Static</option> | ||
75 | <option>Inherit</option> | 74 | <option>Inherit</option> |
76 | </select> | 75 | </select> |
77 | 76 | ||
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: { |