mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #8910 from electron/touchbar-scrubber

Browse source 
Touchbar NSScrubber
This commit is contained in:
Kevin Sawicki 2017-03-16 09:10:59 -07:00 • committed by GitHub
commit da0d0e7aac
7 changed files with 325 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
spec/api-touch-bar-spec.js
View file

@ -3,7 +3,7 @@ const {BrowserWindow, TouchBar} = require('electron').remote
const {closeWindow} = require('./window-helpers')
const {TouchBarButton, TouchBarColorPicker, TouchBarGroup} = TouchBar
const {TouchBarLabel, TouchBarPopover, TouchBarSegmentedControl, TouchBarSlider, TouchBarSpacer} = TouchBar
const {TouchBarLabel, TouchBarPopover, TouchBarScrubber, TouchBarSegmentedControl, TouchBarSlider, TouchBarSpacer} = TouchBar
describe('TouchBar module', function () {
it('throws an error when created without an items array', function () {
@ -47,7 +47,13 @@ describe('TouchBar module', function () {
segments: [{label: 'baz', enabled: false}],
selectedIndex: 5
}),
new TouchBarSegmentedControl({segments: []})
new TouchBarSegmentedControl({segments: []}),
new TouchBarScrubber({
items: [{label: 'foo'}, {label: 'bar'}, {label: 'baz'}],
selectedStyle: 'outline',
mode: 'fixed',
showArrowButtons: true
})
])
window.setTouchBar(touchBar)
label.label = 'baz'