Skip to content

Commit bf62482

Browse files
committed
Change allowFullScreen to showFullscreenButton
1 parent b22969f commit bf62482

File tree

3 files changed

+28
-30
lines changed

3 files changed

+28
-30
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class MyComponent extends React.Component {
103103
* `lazyLoad`: Boolean, default `false`
104104
* `showNav`: Boolean, default `true`
105105
* `showThumbnails`: Boolean, default `true`
106-
* `allowFullscreen`: Boolean, default `true`
106+
* `showFullscreenButton`: Boolean, default `true`
107107
* `showPlayButton`: Boolean, default `true`
108108
* `showBullets`: Boolean, default `false`
109109
* `showIndex`: Boolean, default `false`

example/app.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class App extends React.Component {
1515
showBullets: true,
1616
infinite: true,
1717
showThumbnails: true,
18-
allowFullscreen: true,
18+
showFullscreenButton: true,
1919
showPlayButton: true,
2020
showNav: true,
2121
slideInterval: 2000,
@@ -76,7 +76,7 @@ class App extends React.Component {
7676
this.setState({
7777
showVideo: {},
7878
showPlayButton: true,
79-
allowFullscreen: true
79+
showFullscreenButton: true
8080
});
8181
}
8282

@@ -91,8 +91,8 @@ class App extends React.Component {
9191
this.setState({showPlayButton: false});
9292
}
9393

94-
if (this.state.allowFullscreen) {
95-
this.setState({allowFullscreen: false});
94+
if (this.state.showFullscreenButton) {
95+
this.setState({showFullscreenButton: false});
9696
}
9797
}
9898
}
@@ -169,7 +169,7 @@ class App extends React.Component {
169169
onPlay={this._onPlay.bind(this)}
170170
infinite={this.state.infinite}
171171
showBullets={this.state.showBullets}
172-
allowFullscreen={this.state.allowFullscreen}
172+
showFullscreenButton={this.state.showFullscreenButton}
173173
showPlayButton={this.state.showPlayButton}
174174
showThumbnails={this.state.showThumbnails}
175175
showIndex={this.state.showIndex}
@@ -202,15 +202,15 @@ class App extends React.Component {
202202
type='checkbox'
203203
onChange={this._handleCheckboxChange.bind(this, 'infinite')}
204204
checked={this.state.infinite}/>
205-
<label htmlFor='infinite'>infinite sliding</label>
205+
<label htmlFor='infinite'>allow infinite sliding</label>
206206
</li>
207207
<li>
208208
<input
209209
id='show_fullscreen'
210210
type='checkbox'
211-
onChange={this._handleCheckboxChange.bind(this, 'allowFullscreen')}
212-
checked={this.state.allowFullscreen}/>
213-
<label htmlFor='show_fullscreen'>allow fullscreen</label>
211+
onChange={this._handleCheckboxChange.bind(this, 'showFullscreenButton')}
212+
checked={this.state.showFullscreenButton}/>
213+
<label htmlFor='show_fullscreen'>show fullscreen button</label>
214214
</li>
215215
<li>
216216
<input

src/ImageGallery.jsx

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -178,24 +178,22 @@ export default class ImageGallery extends React.Component {
178178
}
179179

180180
fullScreen() {
181-
if (this.props.allowFullscreen) {
182-
const gallery = this._imageGallery;
183-
184-
if (gallery.requestFullscreen) {
185-
gallery.requestFullscreen();
186-
} else if (gallery.msRequestFullscreen) {
187-
gallery.msRequestFullscreen();
188-
} else if (gallery.mozRequestFullScreen) {
189-
gallery.mozRequestFullScreen();
190-
} else if (gallery.webkitRequestFullscreen) {
191-
gallery.webkitRequestFullscreen();
192-
} else {
193-
// fallback to modal for unsupported browsers
194-
this.setState({modalFullscreen: true});
195-
}
196-
197-
this.setState({isFullscreen: true});
181+
const gallery = this._imageGallery;
182+
183+
if (gallery.requestFullscreen) {
184+
gallery.requestFullscreen();
185+
} else if (gallery.msRequestFullscreen) {
186+
gallery.msRequestFullscreen();
187+
} else if (gallery.mozRequestFullScreen) {
188+
gallery.mozRequestFullScreen();
189+
} else if (gallery.webkitRequestFullscreen) {
190+
gallery.webkitRequestFullscreen();
191+
} else {
192+
// fallback to modal for unsupported browsers
193+
this.setState({modalFullscreen: true});
198194
}
195+
196+
this.setState({isFullscreen: true});
199197
}
200198

201199
exitFullScreen() {
@@ -710,7 +708,7 @@ export default class ImageGallery extends React.Component {
710708
className='image-gallery-slide-wrapper'>
711709

712710
{
713-
this.props.allowFullscreen &&
711+
this.props.showFullscreenButton &&
714712
<a
715713
className={
716714
`image-gallery-fullscreen-button${isFullscreen ? ' active' : ''}`}
@@ -822,7 +820,7 @@ ImageGallery.propTypes = {
822820
showBullets: React.PropTypes.bool,
823821
showThumbnails: React.PropTypes.bool,
824822
showPlayButton: React.PropTypes.bool,
825-
allowFullscreen: React.PropTypes.bool,
823+
showFullscreenButton: React.PropTypes.bool,
826824
slideOnThumbnailHover: React.PropTypes.bool,
827825
disableThumbnailScroll: React.PropTypes.bool,
828826
disableArrowKeys: React.PropTypes.bool,
@@ -850,7 +848,7 @@ ImageGallery.defaultProps = {
850848
showBullets: false,
851849
showThumbnails: true,
852850
showPlayButton: true,
853-
allowFullscreen: true,
851+
showFullscreenButton: true,
854852
slideOnThumbnailHover: false,
855853
disableThumbnailScroll: false,
856854
disableArrowKeys: false,

0 commit comments

Comments
 (0)