diff options
| author | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
| commit | 01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch) | |
| tree | ceb527713554f506c537168e36a10452cd09ad10 /js/components/tools-properties/subselection-properties.reel | |
| parent | b9262c831952e77135b79c2de7c455d5e7ff0589 (diff) | |
| parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
| download | ninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz | |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/components/tools-properties/subselection-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/subselection-properties.reel/subselection-properties.html | 32 | ||||
| -rwxr-xr-x | js/components/tools-properties/subselection-properties.reel/subselection-properties.js | 14 |
2 files changed, 0 insertions, 46 deletions
diff --git a/js/components/tools-properties/subselection-properties.reel/subselection-properties.html b/js/components/tools-properties/subselection-properties.reel/subselection-properties.html deleted file mode 100755 index 79460f93..00000000 --- a/js/components/tools-properties/subselection-properties.reel/subselection-properties.html +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | <!DOCTYPE HTML> | ||
| 2 | <!-- <copyright> | ||
| 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/> | ||
| 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 6 | </copyright> --> | ||
| 7 | <html> | ||
| 8 | <head> | ||
| 9 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
| 10 | |||
| 11 | <!--<link rel="stylesheet" type="text/css" href="tools-properties.css">--> | ||
| 12 | <script type="text/montage-serialization"> | ||
| 13 | { | ||
| 14 | |||
| 15 | "owner": { | ||
| 16 | "prototype": "js/components/tools-properties/subselection-properties.reel[SubSelectionProperties]", | ||
| 17 | "properties": { | ||
| 18 | "element": {"#": "subSelectionProperties"} | ||
| 19 | } | ||
| 20 | } | ||
| 21 | } | ||
| 22 | </script> | ||
| 23 | |||
| 24 | </head> | ||
| 25 | |||
| 26 | <body> | ||
| 27 | <div id="subSelectionProperties"> | ||
| 28 | <div></div> | ||
| 29 | </div> | ||
| 30 | </body> | ||
| 31 | |||
| 32 | </html> \ No newline at end of file | ||
diff --git a/js/components/tools-properties/subselection-properties.reel/subselection-properties.js b/js/components/tools-properties/subselection-properties.reel/subselection-properties.js deleted file mode 100755 index bcd13642..00000000 --- a/js/components/tools-properties/subselection-properties.reel/subselection-properties.js +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | /* <copyright> | ||
| 2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 5 | </copyright> */ | ||
| 6 | |||
| 7 | var Montage = require("montage/core/core").Montage; | ||
| 8 | var Component = require("montage/ui/component").Component; | ||
| 9 | var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties; | ||
| 10 | |||
| 11 | exports.SubSelectionProperties = Montage.create(ToolProperties, { | ||
| 12 | |||
| 13 | |||
| 14 | }); \ No newline at end of file | ||