Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor Timelion expression suggestion logic for clarity. #11285

Merged
merged 5 commits into from
May 4, 2017
Merged

Refactor Timelion expression suggestion logic for clarity. #11285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
af45ab3
Refactor Timelion expression suggestion logic for clarity.
cjcenizal Apr 17, 2017
94de007
Add timelion-interval-compact class.
cjcenizal Apr 27, 2017
a88f95f
Add comment to clarify role of inHeader attribute.
cjcenizal Apr 28, 2017
4951810
Rename intervalOption variable for clarity.
cjcenizal Apr 28, 2017
fb02de0
Tweak Timelion Interval select styles.
cjcenizal May 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 19 additions & 34 deletions src/core_plugins/timelion/public/app.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,18 @@
}
}

/**
* 1. Needs to be relative to contain absolutely-positioned typeahead suggestions.
*/
.timelionLocalSearch {
position: relative; /* 1 */
}

.timelionSearchInputContainer {
flex: 1 1 auto;
display: flex;
}

.timelion-container {
margin: 20px;
}
Expand All @@ -38,10 +50,6 @@
background-color: @gray-lighter;
}

.timelion-expression {
position: relative !important;
}

.timelion-subnav {
background-color: @gray-lighter;
margin: 0px
Expand Down Expand Up @@ -88,33 +96,17 @@
opacity: 0.50;
}

.timelion-interval {
width: 70px !important;
height: auto;
-webkit-appearance: none;
-moz-appearance: none;
padding: .5em;
padding-right: 1.5em;
line-height: 1;
border-top: 0;
border-right: 0;
border-bottom: 0;
border-radius: 0;
text-align: center;

&:focus {
border-color: #ecf0f1;
}
.timelion-interval-custom {
width: 60px;
}

.timelion-interval--select {
background-position: right 50%;
background-repeat: no-repeat;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAMCAYAAABSgIzaAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBNYWNpbnRvc2giIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NDZFNDEwNjlGNzFEMTFFMkJEQ0VDRTM1N0RCMzMyMkIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NDZFNDEwNkFGNzFEMTFFMkJEQ0VDRTM1N0RCMzMyMkIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo0NkU0MTA2N0Y3MUQxMUUyQkRDRUNFMzU3REIzMzIyQiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo0NkU0MTA2OEY3MUQxMUUyQkRDRUNFMzU3REIzMzIyQiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PuGsgwQAAAA5SURBVHjaYvz//z8DOYCJgUxAf42MQIzTk0D/M+KzkRGPoQSdykiKJrBGpOhgJFYTWNEIiEeAAAMAzNENEOH+do8AAAAASUVORK5CYII=);
.timelion-interval-presets {
width: 90px;
}

.timelion-interval-other {
width: 10px !important;
.timelion-interval-presets-compact {
width: 10px;
padding-left: 0;
}

timelion-interval {
Expand Down Expand Up @@ -214,10 +206,3 @@ timelion-interval {
margin-right: 5px;
font-weight: bold;
}

/**
* 1. Needs to be relative to contain absolutely-positioned typeahead suggestions.
*/
.timelionLocalSearch {
position: relative; /* 1 */
}
23 changes: 23 additions & 0 deletions src/core_plugins/timelion/public/directives/expression_directive.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<div class="timelionSearchInputContainer">
<input
id="timelionSearchInput"
input-focus
ng-model="sheet"
timelion-expression="{{sheet}}"
placeholder="Expression..."
aria-label="Expression input"
type="text"
class="kuiLocalSearchInput"
ng-keyup="keyUpHandler($event)"
ng-keydown="keyDownHandler($event)"
ng-mouseup="mouseUpHandler()"
ng-blur="blurHandler()"
>

<timelion-expression-suggestions
ng-show="functionSuggestions.isVisible"
suggestions="functionSuggestions.list"
selected-index="functionSuggestions.index"
on-click-suggestion="suggestionClickHandler"
></timelion-expression-suggestions>
</div>
Loading