IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: prevents click on select-box to close timeline-container on mobile

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2017-09-13 10:00:10 +02:00 committed by GitHub
parent 26c6447161
commit 64c154d9df
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/components/dropdown-select-box/dropdown-header.js.es6
View File

@ -3,5 +3,5 @@ import SelectBoxHeaderComponent from "discourse/components/select-box/select-box
export default SelectBoxHeaderComponent.extend({ export default SelectBoxHeaderComponent.extend({
layoutName: "components/dropdown-select-box/dropdown-header", layoutName: "components/dropdown-select-box/dropdown-header",
classNames: ["dropdown-header"], classNames: ["dropdown-header"]
}); });

4
app/assets/javascripts/discourse/components/select-box.js.es6
View File

@ -49,6 +49,10 @@ export default Ember.Component.extend({
castInteger: false, castInteger: false,
click(event) {
event.stopPropagation();
},
filterFunction: function(content) { filterFunction: function(content) {
return (selectBox) => { return (selectBox) => {
const filter = selectBox.get("filter").toLowerCase(); const filter = selectBox.get("filter").toLowerCase();

3
app/assets/javascripts/discourse/components/select-box/select-box-header.js.es6
View File

@ -9,8 +9,9 @@ export default Ember.Component.extend({
this._setCaretIcon(); this._setCaretIcon();
}, },
click() { click(event) {
this.sendAction("onToggle"); this.sendAction("onToggle");
event.stopPropagation();
}, },
_setCaretIcon() { _setCaretIcon() {

1
app/assets/stylesheets/common/components/dropdown-select-box.scss
View File

@ -55,6 +55,7 @@
display: block; display: block;
font-size: 1em; font-size: 1em;
color: $primary; color: $primary;
padding: 0;
} }
.desc { .desc {