Skip to content

Commit 77b0335

Browse files
author
Masashi Hirano
committed
Update toggle-fullscreen for Promise
1 parent 13b0001 commit 77b0335

File tree

5 files changed

+31
-23
lines changed

5 files changed

+31
-23
lines changed

Diff for: demo/slideshow.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ var SlideShow = function (_React$Component) {
283283
_this.onChangeFullScreen = function () {
284284
var element = document.getElementsByClassName('slideshow-wrapper')[0];
285285
(0, _toggleFullscreen2.default)(element).then(function () {
286-
return (0, _toggleFullscreen.fullScreenChange)(function () {
286+
return (0, _toggleFullscreen.fullscreenChange)(function () {
287287
var isFullScreen = (0, _toggleFullscreen.isFullscreen)();
288288
_this.setState({ isFullScreen: isFullScreen });
289289
if (isFullScreen) {
@@ -511,6 +511,11 @@ var SlideShow = function (_React$Component) {
511511
src += '?' + this.state.timestamp;
512512
}
513513

514+
var paging = void 0;
515+
if (this.props.images) {
516+
paging = this.state.index + 1 + ' / ' + this.props.images.length;
517+
}
518+
514519
return _react2.default.createElement(
515520
'div',
516521
{ style: this.style, className: 'slideshow' },
@@ -573,7 +578,7 @@ var SlideShow = function (_React$Component) {
573578
_react2.default.createElement(
574579
'span',
575580
{ style: _Styles.Styles.PAGE_VIEW },
576-
this.props.images ? this.state.index + 1 + ' / ' + this.props.images.length : null
581+
paging
577582
),
578583
_react2.default.createElement(
579584
'button',

Diff for: demo/vendor.dll.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -23566,7 +23566,7 @@ __webpack_require__(83).polyfill();
2356623566
function toggleFullscreen(element, callback) {
2356723567
if (callback && typeof callback === 'function') {
2356823568
if (!isFullscreen()) {
23569-
fullScreenChange(function () {
23569+
fullscreenChange(function() {
2357023570
if (isFullscreen()) {
2357123571
callback(true);
2357223572
} else {
@@ -23580,7 +23580,7 @@ function toggleFullscreen(element, callback) {
2358023580
}
2358123581
return null;
2358223582
}
23583-
return new Promise(function (resolve, reject) {
23583+
return new Promise(function(resolve, reject) {
2358423584
if (!isFullscreen()) {
2358523585
enterFullscreen(element);
2358623586
} else {
@@ -23626,7 +23626,7 @@ function toggleFullscreen(element, callback) {
2362623626
}
2362723627

2362823628
/**
23629-
* check whether fullscreen or not.
23629+
* check if fullscreen or not.
2363023630
* @returns {boolean}
2363123631
*/
2363223632
function isFullscreen() {
@@ -23642,11 +23642,11 @@ function isFullscreen() {
2364223642
}
2364323643

2364423644
/**
23645-
* injection function to onfullscreenchange.
23645+
* add eventListener 'fullscreenchange'
2364623646
* @param callback
2364723647
* @return {Promise}
2364823648
*/
23649-
function fullScreenChange(callback) {
23649+
function fullscreenChange(callback) {
2365023650
return new Promise(function(resolve, reject) {
2365123651
if (document.fullscreenEnabled) {
2365223652
document.addEventListener('fullscreenchange', callback);
@@ -23665,7 +23665,7 @@ function fullScreenChange(callback) {
2366523665
}
2366623666

2366723667
module.exports = toggleFullscreen;
23668-
module.exports.fullScreenChange = fullScreenChange;
23668+
module.exports.fullscreenChange = fullscreenChange;
2366923669
module.exports.isFullscreen = isFullscreen;
2367023670

2367123671
/***/ }),

Diff for: lib/SlideShow.js

+8-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-slideshow-ui",
3-
"version": "0.3.6",
3+
"version": "0.3.7",
44
"author": "Masashi Hirano (https://github.com/shisama)",
55
"license": "MIT",
66
"description": "React UI Component for slideshow like SlideShare or SpeakerDeck.",
@@ -40,7 +40,7 @@
4040
},
4141
"dependencies": {
4242
"react": "^15.6.1",
43-
"toggle-fullscreen": "^0.2.3"
43+
"toggle-fullscreen": "^0.3.1"
4444
},
4545
"devDependencies": {
4646
"ava": "^0.21.0",
@@ -57,7 +57,6 @@
5757
"babel-preset-react": "^6.24.1",
5858
"browser-env": "^3.1.0",
5959
"enzyme": "^2.8.2",
60-
"es6-promise": "^4.1.1",
6160
"eslint": "^4.5.0",
6261
"eslint-closure": "^0.0.1",
6362
"eslint-config-google": "^0.9.1",

Diff for: src/SlideShow.jsx

+8-9
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@ import React from 'react';
33
import PropTypes from 'prop-types';
44
import {Styles as styles} from './Styles';
55
import toggleFullscreen, {
6-
fullScreenChange,
6+
fullscreenChange,
77
isFullscreen,
88
} from 'toggle-fullscreen';
99

10-
require('es6-promise').polyfill();
11-
1210
/**
1311
* @typedef {Object} Props
1412
* @property {Object} style
@@ -185,7 +183,7 @@ export default class SlideShow extends React.Component {
185183
'slideshow-wrapper',
186184
)[0];
187185
toggleFullscreen(element).then(() => {
188-
return fullScreenChange(() => {
186+
return fullscreenChange(() => {
189187
const isFullScreen = isFullscreen();
190188
this.setState({isFullScreen: isFullScreen});
191189
if (isFullScreen) {
@@ -272,6 +270,11 @@ export default class SlideShow extends React.Component {
272270
src += `?${this.state.timestamp}`;
273271
}
274272

273+
let paging;
274+
if (this.props.images) {
275+
paging = `${this.state.index + 1} / ${this.props.images.length}`;
276+
}
277+
275278
return (
276279
<div style={this.style} className="slideshow">
277280
<div className="slideshow-wrapper" style={{margin: 'auto'}}>
@@ -316,11 +319,7 @@ export default class SlideShow extends React.Component {
316319
>
317320
{this.props.prevIcon}
318321
</button>
319-
<span style={styles.PAGE_VIEW}>
320-
{this.props.images
321-
? `${this.state.index + 1} / ${this.props.images.length}`
322-
: null}
323-
</span>
322+
<span style={styles.PAGE_VIEW}>{paging}</span>
324323
<button
325324
className={'nextButton'}
326325
onClick={this.onClickNextButton}

0 commit comments

Comments
 (0)