diff options
author | Stefan Malzner <stefan@adlk.io> | 2017-12-24 22:11:36 +0100 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2017-12-24 22:11:36 +0100 |
commit | df44b69c4655415fe1e44689ece443ec06ef0f52 (patch) | |
tree | e677ed5f5328bb3b14bc976c7392d8e259f89034 /src/components/services/tabs/Tabbar.js | |
parent | [wip] add icon upload (diff) | |
parent | Merge pull request #494 from heavypackets/websecurity-enable-patch (diff) | |
download | ferdium-app-df44b69c4655415fe1e44689ece443ec06ef0f52.tar.gz ferdium-app-df44b69c4655415fe1e44689ece443ec06ef0f52.tar.zst ferdium-app-df44b69c4655415fe1e44689ece443ec06ef0f52.zip |
Merge branch 'develop' into feature/icon-upload
Diffstat (limited to 'src/components/services/tabs/Tabbar.js')
-rw-r--r-- | src/components/services/tabs/Tabbar.js | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js index fd4325107..ceb88c51c 100644 --- a/src/components/services/tabs/Tabbar.js +++ b/src/components/services/tabs/Tabbar.js | |||
@@ -18,6 +18,8 @@ export default class TabBar extends Component { | |||
18 | toggleAudio: PropTypes.func.isRequired, | 18 | toggleAudio: PropTypes.func.isRequired, |
19 | deleteService: PropTypes.func.isRequired, | 19 | deleteService: PropTypes.func.isRequired, |
20 | updateService: PropTypes.func.isRequired, | 20 | updateService: PropTypes.func.isRequired, |
21 | showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired, | ||
22 | showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired, | ||
21 | } | 23 | } |
22 | 24 | ||
23 | onSortEnd = ({ oldIndex, newIndex }) => { | 25 | onSortEnd = ({ oldIndex, newIndex }) => { |
@@ -30,6 +32,8 @@ export default class TabBar extends Component { | |||
30 | reorder({ oldIndex, newIndex }); | 32 | reorder({ oldIndex, newIndex }); |
31 | }; | 33 | }; |
32 | 34 | ||
35 | shouldPreventSorting = event => event.target.tagName !== 'LI'; | ||
36 | |||
33 | toggleService = ({ serviceId, isEnabled }) => { | 37 | toggleService = ({ serviceId, isEnabled }) => { |
34 | const { updateService } = this.props; | 38 | const { updateService } = this.props; |
35 | 39 | ||
@@ -62,6 +66,8 @@ export default class TabBar extends Component { | |||
62 | toggleNotifications, | 66 | toggleNotifications, |
63 | toggleAudio, | 67 | toggleAudio, |
64 | deleteService, | 68 | deleteService, |
69 | showMessageBadgeWhenMutedSetting, | ||
70 | showMessageBadgesEvenWhenMuted, | ||
65 | } = this.props; | 71 | } = this.props; |
66 | 72 | ||
67 | return ( | 73 | return ( |
@@ -71,6 +77,7 @@ export default class TabBar extends Component { | |||
71 | setActive={setActive} | 77 | setActive={setActive} |
72 | onSortEnd={this.onSortEnd} | 78 | onSortEnd={this.onSortEnd} |
73 | onSortStart={disableToolTip} | 79 | onSortStart={disableToolTip} |
80 | shouldCancelStart={this.shouldPreventSorting} | ||
74 | reload={reload} | 81 | reload={reload} |
75 | toggleNotifications={toggleNotifications} | 82 | toggleNotifications={toggleNotifications} |
76 | toggleAudio={toggleAudio} | 83 | toggleAudio={toggleAudio} |
@@ -82,6 +89,8 @@ export default class TabBar extends Component { | |||
82 | axis="y" | 89 | axis="y" |
83 | lockAxis="y" | 90 | lockAxis="y" |
84 | helperClass="is-reordering" | 91 | helperClass="is-reordering" |
92 | showMessageBadgeWhenMutedSetting={showMessageBadgeWhenMutedSetting} | ||
93 | showMessageBadgesEvenWhenMuted={showMessageBadgesEvenWhenMuted} | ||
85 | /> | 94 | /> |
86 | </div> | 95 | </div> |
87 | ); | 96 | ); |