Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
update: "&"
},
template: `
<ui-select ng-model="$ctrl.selectedEvent" on-select="$ctrl.selectOption($item, $model)" theme="bootstrap">
<ui-select ng-model="$ctrl.selectedEvent" on-select="$ctrl.selectOption($item, $model)" theme="bootstrap" title="{{$select.selected != null ? $select.selected.name + ' ' + $select.selected.source.name : 'Select or search for an event...'}}">
<ui-select-match placeholder="Select or search for an event... ">{{$select.selected.name}} ({{$select.selected.source.name}})</ui-select-match>
<ui-select-choices repeat="option in $ctrl.options | eventfilter: $select.search" style="position:relative;">
<div>
Expand Down
3 changes: 2 additions & 1 deletion src/gui/app/directives/filters/filterList.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
<span>Only trigger this event when</span>

<div class="text-dropdown filter-mode-dropdown" uib-dropdown uib-dropdown-toggle>
<div class="noselect pointer ddtext" style="font-size: 12px;">{{$ctrl.getFilterModeDisplay()}}<span class="fb-arrow down ddtext"></span></div>
<a href role="button"
class="noselect pointer ddtext" style="font-size: 12px;">{{$ctrl.getFilterModeDisplay()}}<span class="fb-arrow down ddtext"></span></a>
<ul class="dropdown-menu" style="z-index: 10000000;" uib-dropdown-menu>

<li ng-click="$ctrl.filterData.mode = 'exclusive'">
Expand Down
6 changes: 3 additions & 3 deletions src/gui/app/directives/modals/events/addOrEditEventModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,21 @@

<div class="controls-fb-inline effect-setting-container">
<label class="control-fb control--checkbox">Is Enabled
<input type="checkbox" ng-model="$ctrl.event.active" aria-label="..." checked>
<input type="checkbox" ng-model="$ctrl.event.active" aria-label="Is Active" checked>
<div class="control__indicator"></div>
</label>
</div>
</div>
<div class="cooldown-title">
<div class="controls-fb-inline effect-custom-cooldown-container">
<label class="control-fb control--checkbox">Custom Cooldown
<input type="checkbox" ng-model="$ctrl.event.customCooldown" aria-label="..." >
<input type="checkbox" ng-model="$ctrl.event.customCooldown" aria-label="Use Custom Cooldown" >
<div class="control__indicator"></div>
</label>
<div id="cooldown-options" ng-if="$ctrl.event.customCooldown" class="nav-body-wrapper" style="padding-left: 29px;">
<input type="number" class="form-control event-id" aria-describedby="basic-addon3" placeholder="Enter time in seconds" ng-model="$ctrl.event.customCooldownSecs" style="margin-bottom: 6px;">
<label class="control-fb control--checkbox">Apply Cooldown Per User
<input type="checkbox" ng-model="$ctrl.event.customCooldownPerUser" aria-label="..." >
<input type="checkbox" ng-model="$ctrl.event.customCooldownPerUser" aria-label="Apply Cooldown Per User" >
<div class="control__indicator"></div>
</label>
</div>
Expand Down
2 changes: 2 additions & 0 deletions src/gui/js/plugins/select.js
Original file line number Diff line number Diff line change
Expand Up @@ -2038,6 +2038,8 @@ uis.directive('uiSelectSingle', ['$timeout','$compile', function($timeout, $comp
scope.$watch('$select.selected', function(newValue) {
if (ngModel.$viewValue !== newValue) {
ngModel.$setViewValue(newValue);
$select.baseTitle = newValue.name || 'Select box';
$select.focusserTitle = $select.baseTitle + ' focus';
}
});

Expand Down