alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Search] mct-control textfield breaks focus

Browse Source 
Set up bundle.json so that the search bar could
be a mct-control, but left the control itself
commented out because then CSS styling would not
work due to lack of access to parent elements.
This commit is contained in:
slhale
2015-08-17 11:47:35 -07:00
parent 6d660d48ca
commit e159b7a15d
4 changed files with 56 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
platform/commonUI/general/res/css/tree.css
View File

@@ -296,7 +296,10 @@ ul.tree {
height: 19px; height: 19px;
padding-right: 16px; padding-right: 16px;
padding-right: 28px; } padding-right: 28px; }
/* line 63, ../sass/search/_search.scss */ /* line 63, ../sass/search/_search.scss */
.search-holder .search .search-bar .search-input input {
width: 100%; }
/* line 68, ../sass/search/_search.scss */
.search-holder .search .search-bar .search-icon { .search-holder .search .search-bar .search-icon {
color: #737373; color: #737373;
font-size: 12px; font-size: 12px;
@@ -305,18 +308,18 @@ ul.tree {
height: 0; height: 0;
margin-top: -19px; margin-top: -19px;
transition: visibility .15s, opacity .15s, color .2s; } transition: visibility .15s, opacity .15s, color .2s; }
/* line 77, ../sass/search/_search.scss */ /* line 82, ../sass/search/_search.scss */
.search-holder .search .search-bar .search-icon.content { .search-holder .search .search-bar .search-icon.content {
visibility: hidden; visibility: hidden;
opacity: 0; } opacity: 0; }
/* line 85, ../sass/search/_search.scss */ /* line 90, ../sass/search/_search.scss */
.search-holder .search .search-bar .search-input:focus + div.search-icon { .search-holder .search .search-bar .search-input:focus + div.search-icon {
visibility: hidden; visibility: hidden;
opacity: 0; } opacity: 0; }
/* line 91, ../sass/search/_search.scss */ /* line 96, ../sass/search/_search.scss */
.search-holder .search .search-bar .search-input:hover + div.search-icon { .search-holder .search .search-bar .search-input:hover + div.search-icon {
color: #a6a6a6; } color: #a6a6a6; }
/* line 95, ../sass/search/_search.scss */ /* line 100, ../sass/search/_search.scss */
.search-holder .search .search-bar .clear-icon { .search-holder .search .search-bar .clear-icon {
position: absolute; position: absolute;
display: block; display: block;
@@ -332,14 +335,14 @@ ul.tree {
transition: visibility .15s, opacity .15s, color .2s; transition: visibility .15s, opacity .15s, color .2s;
right: 15px; right: 15px;
padding-right: 4px; } padding-right: 4px; }
/* line 115, ../sass/search/_search.scss */ /* line 120, ../sass/search/_search.scss */
.search-holder .search .search-bar .clear-icon.content { .search-holder .search .search-bar .clear-icon.content {
visibility: visible; visibility: visible;
opacity: 1; } opacity: 1; }
/* line 120, ../sass/search/_search.scss */ /* line 125, ../sass/search/_search.scss */
.search-holder .search .search-bar .clear-icon:hover { .search-holder .search .search-bar .clear-icon:hover {
color: #a6a6a6; } color: #a6a6a6; }
/* line 129, ../sass/search/_search.scss */ /* line 134, ../sass/search/_search.scss */
.search-holder .search .search-bar .menu-icon { .search-holder .search .search-bar .menu-icon {
position: absolute; position: absolute;
display: block; display: block;
@@ -351,24 +354,24 @@ ul.tree {
right: 0px; right: 0px;
top: -3px; top: -3px;
transition: color .2s; } transition: color .2s; }
/* line 145, ../sass/search/_search.scss */ /* line 150, ../sass/search/_search.scss */
.search-holder .search .search-bar .menu-icon:hover { .search-holder .search .search-bar .menu-icon:hover {
color: #a6a6a6; } color: #a6a6a6; }
/* line 150, ../sass/search/_search.scss */ /* line 155, ../sass/search/_search.scss */
.search-holder .search .search-bar .search-menu-holder { .search-holder .search .search-bar .search-menu-holder {
float: right; float: right;
margin-top: 17px; margin-top: 17px;
left: -50px; left: -50px;
z-index: 9; z-index: 9;
transition: visibility .05s, opacity .05s; } transition: visibility .05s, opacity .05s; }
/* line 159, ../sass/search/_search.scss */ /* line 164, ../sass/search/_search.scss */
.search-holder .search .search-bar .search-menu-holder.off { .search-holder .search .search-bar .search-menu-holder.off {
visibility: hidden; visibility: hidden;
opacity: 0; } opacity: 0; }
/* line 164, ../sass/search/_search.scss */ /* line 169, ../sass/search/_search.scss */
.search-holder .search .search-bar .search-menu-holder .search-menu { .search-holder .search .search-bar .search-menu-holder .search-menu {
border-top: 0; } border-top: 0; }
/* line 167, ../sass/search/_search.scss */ /* line 172, ../sass/search/_search.scss */
.search-holder .search .search-bar .search-menu-holder .search-menu .search-menu-item { .search-holder .search .search-bar .search-menu-holder .search-menu .search-menu-item {
padding-top: 0; padding-top: 0;
padding-bottom: 0; padding-bottom: 0;
@@ -378,33 +381,33 @@ ul.tree {
color: #e6e6e6; color: #e6e6e6;
cursor: pointer; cursor: pointer;
transition: background-color .13s; } transition: background-color .13s; }
/* line 181, ../sass/search/_search.scss */ /* line 186, ../sass/search/_search.scss */
.search-holder .search .search-bar .search-menu-holder .search-menu .search-menu-item .search-menu-checkbox { .search-holder .search .search-bar .search-menu-holder .search-menu .search-menu-item .search-menu-checkbox {
margin-top: 0.3em; margin-top: 0.3em;
padding-left: 0; padding-left: 0;
margin-right: 0; margin-right: 0;
padding-right: 2px; } padding-right: 2px; }
/* line 194, ../sass/search/_search.scss */ /* line 199, ../sass/search/_search.scss */
.search-holder .search .search-bar .search-menu-holder .search-menu .search-menu-item .search-menu-checkbox em:before { .search-holder .search .search-bar .search-menu-holder .search-menu .search-menu-item .search-menu-checkbox em:before {
color: white; color: white;
background-color: grey; background-color: grey;
height: 12px; height: 12px;
width: 12px; width: 12px;
font-size: .7em; } font-size: .7em; }
/* line 207, ../sass/search/_search.scss */ /* line 212, ../sass/search/_search.scss */
.search-holder .search .search-bar .search-menu-holder .search-menu .search-menu-item .search-menu-glyph { .search-holder .search .search-bar .search-menu-holder .search-menu .search-menu-item .search-menu-glyph {
color: #3dcfff; } color: #3dcfff; }
/* line 211, ../sass/search/_search.scss */ /* line 216, ../sass/search/_search.scss */
.search-holder .search .search-bar .search-menu-holder .search-menu .search-menu-item.special { .search-holder .search .search-bar .search-menu-holder .search-menu .search-menu-item.special {
font-weight: bold; font-weight: bold;
background-color: #666666; } background-color: #666666; }
/* line 215, ../sass/search/_search.scss */ /* line 220, ../sass/search/_search.scss */
.search-holder .search .search-bar .search-menu-holder .search-menu .search-menu-item.special .search-menu-label { .search-holder .search .search-bar .search-menu-holder .search-menu .search-menu-item.special .search-menu-label {
font-size: 1.1em; } font-size: 1.1em; }
/* line 219, ../sass/search/_search.scss */ /* line 224, ../sass/search/_search.scss */
.search-holder .search .search-bar .search-menu-holder .search-menu .search-menu-item.special:hover { .search-holder .search .search-bar .search-menu-holder .search-menu .search-menu-item.special:hover {
background-color: gray; } background-color: gray; }
/* line 228, ../sass/search/_search.scss */ /* line 233, ../sass/search/_search.scss */
.search-holder .search .search-bar .search-menu-holder:after { .search-holder .search .search-bar .search-menu-holder:after {
position: absolute; position: absolute;
top: -6px; top: -6px;
@@ -414,13 +417,13 @@ ul.tree {
border-bottom: 6px solid #5e5e5e; border-bottom: 6px solid #5e5e5e;
border-left: 6px solid transparent; border-left: 6px solid transparent;
content: ''; } content: ''; }
/* line 241, ../sass/search/_search.scss */ /* line 246, ../sass/search/_search.scss */
.search-holder .search .search-bar .menu-icon:hover + div.search-menu-holder { .search-holder .search .search-bar .menu-icon:hover + div.search-menu-holder {
visibility: visible; } visibility: visible; }
/* line 244, ../sass/search/_search.scss */ /* line 249, ../sass/search/_search.scss */
.search-holder .search .search-bar div.search-menu-holder:hover { .search-holder .search .search-bar div.search-menu-holder:hover {
visibility: visible; } visibility: visible; }
/* line 249, ../sass/search/_search.scss */ /* line 254, ../sass/search/_search.scss */
.search-holder .search .active-filter-display { .search-holder .search .active-filter-display {
order: 2; order: 2;
font-size: .6em; font-size: .6em;
@@ -430,7 +433,7 @@ ul.tree {
padding-left: 4px; padding-left: 4px;
padding-right: 4px; padding-right: 4px;
margin-top: 2px; } margin-top: 2px; }
/* line 262, ../sass/search/_search.scss */ /* line 267, ../sass/search/_search.scss */
.search-holder .search .active-filter-display .clear-filters-icon { .search-holder .search .active-filter-display .clear-filters-icon {
padding: 4px; padding: 4px;
position: relative; position: relative;
@@ -439,13 +442,13 @@ ul.tree {
cursor: pointer; cursor: pointer;
color: #737373; color: #737373;
font-size: 6px; } font-size: 6px; }
/* line 275, ../sass/search/_search.scss */ /* line 280, ../sass/search/_search.scss */
.search-holder .search .active-filter-display .filter-options { .search-holder .search .active-filter-display .filter-options {
position: relative; position: relative;
top: -0.5em; top: -0.5em;
margin-left: 14px; margin-left: 14px;
text-indent: -4px; } text-indent: -4px; }
/* line 288, ../sass/search/_search.scss */ /* line 293, ../sass/search/_search.scss */
.search-holder .search .active-filter-display.off { .search-holder .search .active-filter-display.off {
visibility: hidden; visibility: hidden;
opacity: 0; opacity: 0;
@@ -453,7 +456,7 @@ ul.tree {
margin: 0; margin: 0;
padding: 0; padding: 0;
border: 0; } border: 0; }
/* line 298, ../sass/search/_search.scss */ /* line 303, ../sass/search/_search.scss */
.search-holder .search .search-scroll { .search-holder .search .search-scroll {
order: 3; order: 3;
margin-top: 4px; margin-top: 4px;
@@ -462,7 +465,7 @@ ul.tree {
height: auto; height: auto;
max-height: 100%; max-height: 100%;
position: relative; } position: relative; }
/* line 313, ../sass/search/_search.scss */ /* line 318, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item { .search-holder .search .search-scroll .results .search-result-item {
-moz-transition: background-color 0.25s; -moz-transition: background-color 0.25s;
-o-transition: background-color 0.25s; -o-transition: background-color 0.25s;
@@ -472,10 +475,10 @@ ul.tree {
border-radius: 2px; border-radius: 2px;
padding-top: 4px; padding-top: 4px;
padding-bottom: 2px; } padding-bottom: 2px; }
/* line 327, ../sass/search/_search.scss */ /* line 332, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item .label { .search-holder .search .search-scroll .results .search-result-item .label {
margin-left: 6px; } margin-left: 6px; }
/* line 331, ../sass/search/_search.scss */ /* line 336, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item .label .title-label { .search-holder .search .search-scroll .results .search-result-item .label .title-label {
display: inline-block; display: inline-block;
position: absolute; position: absolute;
@@ -487,47 +490,47 @@ ul.tree {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; } white-space: nowrap; }
/* line 353, ../sass/search/_search.scss */ /* line 358, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item.selected { .search-holder .search .search-scroll .results .search-result-item.selected {
background: #005177; background: #005177;
color: #fff; } color: #fff; }
/* line 357, ../sass/search/_search.scss */ /* line 362, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item.selected .view-control { .search-holder .search .search-scroll .results .search-result-item.selected .view-control {
color: #0099cc; } color: #0099cc; }
/* line 360, ../sass/search/_search.scss */ /* line 365, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item.selected .label .type-icon { .search-holder .search .search-scroll .results .search-result-item.selected .label .type-icon {
color: #fff; } color: #fff; }
/* line 367, ../sass/search/_search.scss */ /* line 372, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item:not(.selected):hover { .search-holder .search .search-scroll .results .search-result-item:not(.selected):hover {
background: #404040; background: #404040;
color: #cccccc; } color: #cccccc; }
/* line 370, ../sass/search/_search.scss */ /* line 375, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item:not(.selected):hover .context-trigger { .search-holder .search .search-scroll .results .search-result-item:not(.selected):hover .context-trigger {
display: block; } display: block; }
/* line 373, ../sass/search/_search.scss */ /* line 378, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item:not(.selected):hover .icon { .search-holder .search .search-scroll .results .search-result-item:not(.selected):hover .icon {
color: #33ccff; } color: #33ccff; }
/* line 381, ../sass/search/_search.scss */ /* line 386, ../sass/search/_search.scss */
.search-holder .search .search-scroll .load-icon { .search-holder .search .search-scroll .load-icon {
position: relative; } position: relative; }
/* line 383, ../sass/search/_search.scss */ /* line 388, ../sass/search/_search.scss */
.search-holder .search .search-scroll .load-icon.loading { .search-holder .search .search-scroll .load-icon.loading {
pointer-events: none; pointer-events: none;
margin-left: 6px; } margin-left: 6px; }
/* line 387, ../sass/search/_search.scss */ /* line 392, ../sass/search/_search.scss */
.search-holder .search .search-scroll .load-icon.loading .title-label { .search-holder .search .search-scroll .load-icon.loading .title-label {
font-style: italic; font-style: italic;
font-size: .9em; font-size: .9em;
opacity: 0.5; opacity: 0.5;
margin-left: 26px; margin-left: 26px;
line-height: 24px; } line-height: 24px; }
/* line 397, ../sass/search/_search.scss */ /* line 402, ../sass/search/_search.scss */
.search-holder .search .search-scroll .load-icon.loading .wait-spinner { .search-holder .search .search-scroll .load-icon.loading .wait-spinner {
margin-left: 6px; } margin-left: 6px; }
/* line 402, ../sass/search/_search.scss */ /* line 407, ../sass/search/_search.scss */
.search-holder .search .search-scroll .load-icon:not(.loading) { .search-holder .search .search-scroll .load-icon:not(.loading) {
cursor: pointer; } cursor: pointer; }
/* line 407, ../sass/search/_search.scss */ /* line 412, ../sass/search/_search.scss */
.search-holder .search .search-scroll .load-more-button { .search-holder .search .search-scroll .load-more-button {
margin-top: 5px; margin-top: 5px;
margin-bottom: 5px; margin-bottom: 5px;

5
platform/commonUI/general/res/sass/search/_search.scss
View File

@@ -58,6 +58,11 @@
// Modifications for existence of menu icon: // Modifications for existence of menu icon:
padding-right: 16px + 12px; padding-right: 16px + 12px;
// Make work for mct-control textfield
input {
width: 100%;
}
} }
.search-icon { .search-icon {

2
platform/search/bundle.json
View File

@@ -30,7 +30,7 @@
{ {
"key": "search", "key": "search",
"templateUrl": "templates/search.html", "templateUrl": "templates/search.html",
"uses": [ "controls", "forms" ] "uses": [ "control" ]
} }
], ],
"representations": [ "representations": [

5
platform/search/res/templates/search.html
View File

@@ -31,6 +31,11 @@
type="text" type="text"
ng-model="ngModel.input" ng-model="ngModel.input"
ng-keyup="controller.search()" /> ng-keyup="controller.search()" />
<!--mct-control key="'textfield'"
class="search-input"
ng-model="ngModel.input"
ng-keyup="controller.search()">
</mct-control-->
<!-- Search icon --> <!-- Search icon -->
<!-- ui symbols for search are 'd' and 'M' --> <!-- ui symbols for search are 'd' and 'M' -->