diff options
| author | Pushkar Joshi | 2012-03-02 12:36:34 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-02 12:36:34 -0800 |
| commit | dc3c813320c8d3fb837d5d18e70ab35a53b116c1 (patch) | |
| tree | da417684de5e302d302ea617854015bd9a8ca17a /js | |
| parent | d7d78d4a4e8cf82c56379d25efbe679b3b823abc (diff) | |
| parent | 4419209a1fd850ab468209b562b66b0242b42a9c (diff) | |
| download | ninja-dc3c813320c8d3fb837d5d18e70ab35a53b116c1.tar.gz | |
Merge branch 'brushtool' into pentool
Diffstat (limited to 'js')
67 files changed, 1742 insertions, 1064 deletions
diff --git a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.css b/js/components/layout/bread-crumb-button.reel/bread-crumb-button.css deleted file mode 100755 index 9d0a1eb4..00000000 --- a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.css +++ /dev/null | |||
| @@ -1,32 +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 | .breadcrumbbuttonBackground { | ||
| 8 | height: 20px; | ||
| 9 | min-width: 50px; | ||
| 10 | margin: auto; | ||
| 11 | border:1px solid black; | ||
| 12 | float:left; | ||
| 13 | margin-left:10px; | ||
| 14 | background:#474747; | ||
| 15 | margin-top:3px; | ||
| 16 | } | ||
| 17 | |||
| 18 | |||
| 19 | .breadcrumbtoolBarButton { | ||
| 20 | border: 1px; | ||
| 21 | color: white; | ||
| 22 | text-align:-webkit-center; | ||
| 23 | margin-top : 4px; | ||
| 24 | cursor :default; | ||
| 25 | font-family: 'Droid Sans'; | ||
| 26 | font-size: 12px; | ||
| 27 | text-shadow: 1px 1px 1px black; | ||
| 28 | |||
| 29 | } | ||
| 30 | |||
| 31 | |||
| 32 | |||
diff --git a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.html b/js/components/layout/bread-crumb-button.reel/bread-crumb-button.html deleted file mode 100755 index b3fdb0b6..00000000 --- a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.html +++ /dev/null | |||
| @@ -1,36 +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="bread-crumb-button.css"> | ||
| 12 | |||
| 13 | <script type="text/montage-serialization"> | ||
| 14 | { | ||
| 15 | "owner": { | ||
| 16 | "module": "js/components/layout/bread-crumb-button.reel", | ||
| 17 | "name": "BreadcrumbButton", | ||
| 18 | "properties": { | ||
| 19 | "element": {"#": "breadcrumbbuttonBackground"}, | ||
| 20 | "button": {"#": "breadCrumbButton"} | ||
| 21 | } | ||
| 22 | } | ||
| 23 | } | ||
| 24 | </script> | ||
| 25 | |||
| 26 | |||
| 27 | </head> | ||
| 28 | |||
| 29 | <body> | ||
| 30 | <div id="breadcrumbbuttonBackground" class="breadcrumbbuttonBackground"> | ||
| 31 | <div id="breadCrumbButton" class="breadcrumbtoolBarButton"></div> | ||
| 32 | </div> | ||
| 33 | </body> | ||
| 34 | |||
| 35 | </html> | ||
| 36 | |||
diff --git a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.js b/js/components/layout/bread-crumb-button.reel/bread-crumb-button.js deleted file mode 100755 index 3f5b87e1..00000000 --- a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.js +++ /dev/null | |||
| @@ -1,51 +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 | |||
| 10 | exports.BreadcrumbButton = Montage.create(Component, { | ||
| 11 | |||
| 12 | button: { | ||
| 13 | value: null | ||
| 14 | }, | ||
| 15 | |||
| 16 | data: { | ||
| 17 | value: null | ||
| 18 | }, | ||
| 19 | |||
| 20 | prepareForDraw: { | ||
| 21 | value: function() { | ||