diff options
author | Ananya Sen | 2012-02-29 15:21:31 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-29 15:21:31 -0800 |
commit | 8fee7d6bdb55ba18f396c3523081b18499fa1e30 (patch) | |
tree | dbd17232983247a38bb6b2cea480242bdf3f2422 /js | |
parent | 5d4f1aad01737695238582c704e6d4f2c3a2f317 (diff) | |
parent | b09956e4a9a35c5588cc7cd1f01efb617cbe0884 (diff) | |
download | ninja-8fee7d6bdb55ba18f396c3523081b18499fa1e30.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into FileIO
Conflicts:
js/controllers/selection-controller.js
js/document/html-document.js
js/panels/properties/content.reel/content.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js')
40 files changed, 1048 insertions, 593 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() { | ||
22 | this.element.addEventListener("mousedown", this, false); | ||
23 | } | ||
24 | }, | ||
25 | |||
26 | draw: { | ||
27 | value: function() { | ||
28 | if(this.data.element.id === "UserContent") { | ||
29 | this.button.innerHTML = "Body"; | ||
30 | } else { | ||
31 | this.button.innerHTML = this.data.element.nodeName; | ||
32 | } | ||
33 | } | ||
34 | }, | ||
35 | |||
36 | handleMousedown: { | ||
37 | value: function(event) { | ||
38 | |||
39 | //this.data.selected=true; | ||
40 | NJevent('breadCrumbTrail',this.data); | ||
41 | //this.data.selected=false; | ||
42 | |||
43 | } | ||
44 | } | ||
45 | |||
46 | |||
47 | |||
48 | |||
49 | |||
50 | |||
51 | }); \ No newline at end of file | ||
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.css b/js/components/layout/bread-crumb.reel/bread-crumb.css index cc984609..67497e10 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.css +++ b/js/components/layout/bread-crumb.reel/bread-crumb.css | |||
@@ -4,25 +4,17 @@ | |||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | </copyright> */ | 5 | </copyright> */ |
6 | 6 | ||
7 | .bread_crumb{ | 7 | .breadcrumbTrail{ |
8 | background-color: #282828; | 8 | background-color: #282828; |
9 | border-style: double; | 9 | border-style: double; |
10 | height: 26px; | 10 | height: 26px; |
11 | } | 11 | |
12 | .breadcrumbtrail{ | ||
13 | -webkit-box-flex: 0; | 12 | -webkit-box-flex: 0; |
14 | } | 13 | } |
15 | .bread_crumb_button{ | ||
16 | background-color: #575757; | ||
17 | float: left; | ||
18 | width: 40px; | ||
19 | height: 20px; | ||
20 | margin-left: 5px; | ||
21 | margin-top: 3px; | ||