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 | |
| 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')
| -rwxr-xr-x | js/components/tools-properties/tag-properties.reel/tag-properties.html | 14 | ||||
| -rwxr-xr-x | js/components/tools-properties/tag-properties.reel/tag-properties.js | 6 |
2 files changed, 10 insertions, 10 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 bbac6724..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/> |
| @@ -37,11 +37,11 @@ | |||
| 37 | <body> | 37 | <body> |
| 38 | <div data-montage-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" data-montage-id="divTool" 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" data-montage-id="imageTool" 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" data-montage-id="videoTool" 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" data-montage-id="canvasTool" 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" data-montage-id="customTool" 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 | ||
| @@ -67,10 +67,10 @@ | |||
| 67 | <label class="label"> Position:</label> | 67 | <label class="label"> Position:</label> |
| 68 | 68 | ||
| 69 | <select data-montage-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: { |