diff options
author | Valerio Virgillito | 2012-05-04 15:31:40 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-04 15:31:40 -0700 |
commit | 3ebed34665fa73b0ce613b400f3029ebf4476439 (patch) | |
tree | 09a3c592035030bda7bb62d1f908ce263377d74c /js/components/tools-properties/tag-properties.reel | |
parent | 8dcbac5d4c30e9dfbc543a5f997939111e9c9f89 (diff) | |
parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
download | ninja-3ebed34665fa73b0ce613b400f3029ebf4476439.tar.gz |
Merge branch 'refs/heads/master' into dom-architecture
Diffstat (limited to 'js/components/tools-properties/tag-properties.reel')
-rwxr-xr-x | js/components/tools-properties/tag-properties.reel/tag-properties.html | 22 | ||||
-rwxr-xr-x | js/components/tools-properties/tag-properties.reel/tag-properties.js | 6 |
2 files changed, 14 insertions, 14 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 c80ba36e..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/> |
@@ -35,26 +35,26 @@ | |||
35 | </head> | 35 | </head> |
36 | 36 | ||
37 | <body> | 37 | <body> |
38 | <div id="tagProperties" class="subToolHolderPanel"> | 38 | <div data-montage-id="tagProperties" class="subToolHolderPanel"> |
39 | <div id="tagToolContainer" class="tagRadioButtons"> | 39 | <div id="tagToolContainer" class="tagRadioButtons"> |
40 | <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/> |
41 | <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"/> |
42 | <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"/> |
43 | <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"/> |
44 | <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"/> |
45 | 45 | ||
46 | <div class="nj-divider divider-vertical"> </div> | 46 | <div class="nj-divider divider-vertical"> </div> |
47 | 47 | ||
48 | <div id="classNameContainer" class="leftLabel"> | 48 | <div id="classNameContainer" class="leftLabel"> |
49 | <label class="label"> Class: | 49 | <label class="label"> Class: |
50 | <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"> |
51 | </label> | 51 | </label> |
52 | </div> | 52 | </div> |
53 | 53 | ||
54 | <div id="customContainer" class="leftLabel" style="padding-top: 3px;"> | 54 | <div id="customContainer" class="leftLabel" style="padding-top: 3px;"> |
55 | <label class="label"> Tag Name:</label> | 55 | <label class="label"> Tag Name:</label> |
56 | 56 | ||
57 | <select id="customTagCB" class="nj-skinned"> | 57 | <select data-montage-id="customTagCB" class="nj-skinned"> |
58 | <option>article</option> | 58 | <option>article</option> |
59 | <option>aside</option> | 59 | <option>aside</option> |
60 | <option>section</option> | 60 | <option>section</option> |
@@ -66,11 +66,11 @@ | |||
66 | <div id="positionContainer" class="leftLabel" style="padding-top: 3px;"> | 66 | <div id="positionContainer" class="leftLabel" style="padding-top: 3px;"> |
67 | <label class="label"> Position:</label> | 67 | <label class="label"> Position:</label> |
68 | 68 | ||
69 | <select id="positionCB" class="nj-skinned"> | 69 | <select data-montage-id="positionCB" class="nj-skinned"> |
70 | <option>Static</option> | ||
70 | <option>Absolute</option> | 71 | <option>Absolute</option> |
71 | <option>Relative</option> | 72 | <option>Relative</option> |
72 | <option>Fixed</option> | 73 | <option>Fixed</option> |
73 | <option>Static</option> | ||
74 | <option>Inherit</option> | 74 | <option>Inherit</option> |
75 | </select> | 75 | </select> |
76 | 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: { |