diff options
author | Valerio Virgillito | 2012-03-28 22:44:35 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-03-28 22:44:35 -0700 |
commit | 7542f62ee7a4845c2472834d0dbe91bf669634da (patch) | |
tree | 657e63dfec155ba18dc8c170d1b8f8179a936603 /js/components | |
parent | f09921e6085f4b16c6e69ac8bfd67eef644fc04e (diff) | |
parent | 3fd2cdb59027b3f973b9165db9db4fdd22026941 (diff) | |
download | ninja-7542f62ee7a4845c2472834d0dbe91bf669634da.tar.gz |
Merge branch 'refs/heads/master' into components
Diffstat (limited to 'js/components')
8 files changed, 40 insertions, 17 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.css b/js/components/layout/bread-crumb.reel/bread-crumb.css index dcfd471c..26a56b45 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.css +++ b/js/components/layout/bread-crumb.reel/bread-crumb.css | |||
@@ -4,14 +4,20 @@ | |||
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 | .breadcrumbTrail{ | 7 | .breadcrumbTrail { |
8 | |||
8 | background-color: #282828; | 9 | background-color: #282828; |
9 | border-style: double; | ||
10 | height: 26px; | 10 | height: 26px; |
11 | position:relative; | 11 | position:relative; |
12 | -webkit-box-flex: 0; | 12 | -webkit-box-flex: 0; |
13 | } | 13 | } |
14 | 14 | ||
15 | .mainContentContainer > section.breadcrumbTrail { | ||
16 | border:0; | ||
17 | margin:0; | ||
18 | border-bottom:1px solid #000; | ||
19 | margin-bottom:1px; | ||
20 | } | ||
15 | .breadcrumbTrail button.nj-skinned { | 21 | .breadcrumbTrail button.nj-skinned { |
16 | float: left; | 22 | float: left; |
17 | width: 60px; | 23 | width: 60px; |
diff --git a/js/components/layout/document-entry.reel/document-entry.css b/js/components/layout/document-entry.reel/document-entry.css index 52d08d72..4601974f 100755 --- a/js/components/layout/document-entry.reel/document-entry.css +++ b/js/components/layout/document-entry.reel/document-entry.css | |||
@@ -4,19 +4,26 @@ | |||
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 | .documentEntry{ | ||
8 | white-space: nowrap; | ||
9 | } | ||
10 | |||
7 | .documentEntry span | 11 | .documentEntry span |
8 | { | 12 | { |
9 | /*display: inline-block;*/ | 13 | display: inline-block; |
10 | white-space: nowrap; | 14 | white-space: pre; |
11 | overflow: hidden; | 15 | overflow: hidden; |
12 | text-overflow: ellipsis; /* Causes ... to appear ?? */ | 16 | text-overflow: ellipsis; |
13 | max-width:100px; | 17 | max-width:100px; |
18 | width:85%; | ||
19 | min-width:0px; | ||
14 | } | 20 | } |
15 | 21 | ||
16 | .documentEntry img { | 22 | .documentEntry img { |
17 | opacity: 0.5; /* 50% */ | 23 | opacity: 0.5; /* 50% */ |
18 | padding-left: 5px; | ||
19 | width: 12px; | 24 | width: 12px; |
25 | max-width:12px; | ||
26 | min-width:5px; | ||
20 | height: 12px; | 27 | height: 12px; |
21 | -webkit-transition: opacity 0.2s ease; | 28 | -webkit-transition: opacity 0.2s ease; |
22 | transition: opacity 0.2s ease; | 29 | transition: opacity 0.2s ease; |
diff --git a/js/components/layout/documents-tab.reel/documents-tab.css b/js/components/layout/documents-tab.reel/documents-tab.css index 689eb777..da00f727 100755 --- a/js/components/layout/documents-tab.reel/documents-tab.css +++ b/js/components/layout/documents-tab.reel/documents-tab.css | |||
@@ -12,7 +12,6 @@ | |||
12 | } | 12 | } |
13 | 13 | ||
14 | .openDocuments { | 14 | .openDocuments { |
15 | float: left; | ||
16 | height: 25px; | 15 | height: 25px; |
17 | width: 100%; | 16 | width: 100%; |
18 | font-size: 12px; | 17 | font-size: 12px; |
@@ -21,16 +20,20 @@ | |||
21 | padding: 0; | 20 | padding: 0; |
22 | position: relative; | 21 | position: relative; |
23 | text-decoration: none; | 22 | text-decoration: none; |
23 | display: -webkit-box; | ||
24 | -webkit-box-orient: horizontal; | ||
25 | -webkit-box-pack:start; | ||
26 | -webkit-box-align:start; | ||
24 | } | 27 | } |
25 | 28 | ||
26 | .openDocuments li { | 29 | .openDocuments li { |
27 | border-right: 1px solid black; | 30 | border-right: 1px solid black; |
28 | cursor: pointer; | 31 | cursor: pointer; |
29 | display: inline; | ||
30 | float: left; | ||
31 | padding: 0.5em 1em; | 32 | padding: 0.5em 1em; |
32 | text-shadow: 1px 1px 1px #000000; | ||
33 | vertical-align: middle; | 33 | vertical-align: middle; |
34 | text-shadow: 1px 1px 1px #000000; | ||
35 | -webkit-box-flex: 1; | ||
36 | max-width: 115px; | ||
34 | } | 37 | } |
35 | 38 | ||
36 | .openDocuments li:hover, | 39 | .openDocuments li:hover, |
diff --git a/js/components/menu/menu-item.reel/menu-item.js b/js/components/menu/menu-item.reel/menu-item.js index 64a89a6a..26fc7573 100755 --- a/js/components/menu/menu-item.reel/menu-item.js +++ b/js/components/menu/menu-item.reel/menu-item.js | |||
@@ -61,6 +61,8 @@ exports.MenuItem = Montage.create(Component, { | |||
61 | 61 | ||
62 | prepareForDraw: { | 62 | prepareForDraw: { |
63 | value: function() { | 63 | value: function() { |
64 | var boundObject = this.application.ninja, strArr = null, i=0; | ||
65 | |||
64 | if(!this.data) return; | 66 | if(!this.data) return; |
65 | 67 | ||
66 | if(this.data.separator) { | 68 | if(this.data.separator) { |
@@ -82,9 +84,14 @@ exports.MenuItem = Montage.create(Component, { | |||
82 | } | 84 | } |
83 | 85 | ||
84 | if(this.data.enabled.boundProperty) { | 86 | if(this.data.enabled.boundProperty) { |
87 | |||
88 | boundObject = this.application.ninja[this.data.enabled.boundObj]; | ||
89 | |||
85 | Object.defineBinding(this, "enabled", { | 90 | Object.defineBinding(this, "enabled", { |
86 | boundObject: this.application.ninja[this.data.enabled.boundObj], | 91 | boundObject: boundObject, |
87 | boundObjectPropertyPath: this.data.enabled.boundProperty | 92 | boundObjectPropertyPath: this.data.enabled.boundProperty, |
93 | boundValueMutator: this.data.enabled.boundValueMutator, | ||
94 | oneway : this.data.enabled.oneway | ||
88 | }); | 95 | }); |
89 | 96 | ||
90 | } else { | 97 | } else { |
@@ -134,7 +141,7 @@ exports.MenuItem = Montage.create(Component, { | |||
134 | 141 | ||
135 | if(this.data.radio && this.checked) return; | 142 | if(this.data.radio && this.checked) return; |
136 | 143 | ||
137 | if(this.enabled || !this.submenu) { | 144 | if((this.enabled === true) && (this.submenu === false) ) { |
138 | if(this.data.action) { | 145 | if(this.data.action) { |
139 | NJevent ( this.data.action ); | 146 | NJevent ( this.data.action ); |
140 | } else if(this.checked !== null) { | 147 | } else if(this.checked !== null) { |
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.css b/js/components/ui/icon-list-basic/icon.reel/icon.css index 9fb180d2..203db65c 100644 --- a/js/components/ui/icon-list-basic/icon.reel/icon.css +++ b/js/components/ui/icon-list-basic/icon.reel/icon.css | |||
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | .icon .iconLabel{ | 36 | .icon .iconLabel{ |
37 | margin-top:8px; | 37 | margin-top:8px; |
38 | white-space: nowrap; | 38 | white-space: pre; |
39 | text-overflow: ellipsis; | 39 | text-overflow: ellipsis; |
40 | line-height:15px; | 40 | line-height:15px; |
41 | overflow: hidden; | 41 | overflow: hidden; |
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.js b/js/components/ui/icon-list-basic/icon.reel/icon.js index 1ef6e277..7d36bc59 100755 --- a/js/components/ui/icon-list-basic/icon.reel/icon.js +++ b/js/components/ui/icon-list-basic/icon.reel/icon.js | |||
@@ -86,7 +86,7 @@ var Icon = exports.Icon = Montage.create(Component, { | |||
86 | this.metadata = "Name: "+this.icondata.name; | 86 | this.metadata = "Name: "+this.icondata.name; |
87 | } | 87 | } |
88 | this.metadata = this.metadata + "<br />" + "Type: "+this.icondata.type; | 88 | this.metadata = this.metadata + "<br />" + "Type: "+this.icondata.type; |
89 | if(this.icondata.size){this.metadata = this.metadata + "<br />" + "Size: "+this.icondata.size;} | 89 | if(this.icondata.size){this.metadata = this.metadata + "<br />" + "Size: "+this.icondata.size+ " bytes";} |
90 | if(this.icondata.creationDate){this.metadata = this.metadata + "<br />" + "Creation date: "+ this.formatTimestamp(this.icondata.creationDate);} | 90 | if(this.icondata.creationDate){this.metadata = this.metadata + "<br />" + "Creation date: "+ this.formatTimestamp(this.icondata.creationDate);} |
91 | if(this.icondata.modifiedDate){this.metadata = this.metadata + "<br />" + "Modified date: "+ this.formatTimestamp(this.icondata.modifiedDate);} | 91 | if(this.icondata.modifiedDate){this.metadata = this.metadata + "<br />" + "Modified date: "+ this.formatTimestamp(this.icondata.modifiedDate);} |
92 | 92 | ||
diff --git a/js/components/ui/tree-basic/treeItem.reel/treeItem.css b/js/components/ui/tree-basic/treeItem.reel/treeItem.css index f8e67541..d33404e7 100755 --- a/js/components/ui/tree-basic/treeItem.reel/treeItem.css +++ b/js/components/ui/tree-basic/treeItem.reel/treeItem.css | |||
@@ -29,7 +29,7 @@ | |||
29 | } | 29 | } |
30 | 30 | ||
31 | .atreeItem .name{ | 31 | .atreeItem .name{ |
32 | white-space: nowrap; | 32 | white-space: pre; |
33 | text-overflow:ellipsis; | 33 | text-overflow:ellipsis; |
34 | line-height:15px; | 34 | line-height:15px; |
35 | overflow: hidden; | 35 | overflow: hidden; |
diff --git a/js/components/ui/tree-basic/treeItem.reel/treeItem.js b/js/components/ui/tree-basic/treeItem.reel/treeItem.js index 13e278e9..e9e5c1fb 100755 --- a/js/components/ui/tree-basic/treeItem.reel/treeItem.js +++ b/js/components/ui/tree-basic/treeItem.reel/treeItem.js | |||
@@ -118,7 +118,7 @@ exports.TreeItem = Montage.create(Component, { | |||
118 | this.metadata = "Name: "+this.treeItemData.name; | 118 | this.metadata = "Name: "+this.treeItemData.name; |
119 | } | 119 | } |
120 |