diff options
| author | Kruti Shah | 2012-05-31 10:44:45 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-05-31 10:44:45 -0700 |
| commit | c350cc1c060fdf17357ddadce024267943784593 (patch) | |
| tree | 453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/components/tools-properties/pencil-properties.reel | |
| parent | fdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff) | |
| parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
| download | ninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz | |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/components/tools-properties/pencil-properties.reel')
3 files changed, 0 insertions, 62 deletions
diff --git a/js/components/tools-properties/pencil-properties.reel/pencil-properties.css b/js/components/tools-properties/pencil-properties.reel/pencil-properties.css deleted file mode 100755 index 7f1b0f7f..00000000 --- a/js/components/tools-properties/pencil-properties.reel/pencil-properties.css +++ /dev/null | |||
| @@ -1,6 +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 | |||
diff --git a/js/components/tools-properties/pencil-properties.reel/pencil-properties.html b/js/components/tools-properties/pencil-properties.reel/pencil-properties.html deleted file mode 100755 index cbe626b2..00000000 --- a/js/components/tools-properties/pencil-properties.reel/pencil-properties.html +++ /dev/null | |||
| @@ -1,31 +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 | <link rel="stylesheet" type="text/css" href="pencil-properties.css"> | ||
| 11 | |||
| 12 | <script type="text/montage-serialization"> | ||
| 13 | { | ||
| 14 | |||
| 15 | "owner": { | ||
| 16 | "prototype": "js/components/tools-properties/pencil-properties.reel", | ||
| 17 | "properties": { | ||
| 18 | "element": {"#": "pencilProperties"} | ||
| 19 | } | ||
| 20 | } | ||
| 21 | } | ||
| 22 | </script> | ||
| 23 | |||
| 24 | </head> | ||
| 25 | |||
| 26 | <body> | ||
| 27 | <div data-montage-id="pencilProperties" class="subToolHolderPanel"> | ||
| 28 | </div> | ||
| 29 | </body> | ||
| 30 | |||
| 31 | </html> \ No newline at end of file | ||
diff --git a/js/components/tools-properties/pencil-properties.reel/pencil-properties.js b/js/components/tools-properties/pencil-properties.reel/pencil-properties.js deleted file mode 100755 index e1be4b5e..00000000 --- a/js/components/tools-properties/pencil-properties.reel/pencil-properties.js +++ /dev/null | |||
| @@ -1,25 +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.PencilProperties = Montage.create(ToolProperties, { | ||
| 12 | |||
| 13 | |||
| 14 | _subPrepare: { | ||
| 15 | value: function() { | ||
| 16 | //this.divElement.addEventListener("click", this, false); | ||
| 17 | } | ||
| 18 | }, | ||
| 19 | |||
| 20 | handleClick: { | ||
| 21 | value: function(event) { | ||
| 22 | // this.selectedElement = event._event.target.id; | ||
| 23 | } | ||
| 24 | } | ||
| 25 | }); \ No newline at end of file | ||