Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
sindresorhus committed Mar 13, 2017
1 parent b4d679f commit db980c3
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 33 deletions.
8 changes: 4 additions & 4 deletions index.html
Expand Up @@ -133,7 +133,7 @@ <h1>screenfull<span>.js</span></h1>
<hr>
<section>
<p>Click the image to make it fullscreen</p>
<img width="500" height="206" id="demo-img" src="https://sindresorhus.com/img/slideshow/4.jpg">
<img id="demo-img" src="https://sindresorhus.com/unicorn" width="500">
</section>
</section>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
Expand All @@ -156,7 +156,7 @@ <h1>screenfull<span>.js</span></h1>

$('#request').click(function () {
screenfull.request($('#container')[0]);
// does not require jQuery, can be used like this too:
// Does not require jQuery. Can be used like this too:
// screenfull.request(document.getElementById('container'));
});

Expand Down Expand Up @@ -191,9 +191,9 @@ <h1>screenfull<span>.js</span></h1>
}
}

document.addEventListener(screenfull.raw.fullscreenchange, fullscreenchange);
screenfull.onchange(fullscreenchange);

// set the initial values
// Set the initial values
fullscreenchange();
});
</script>
Expand Down
45 changes: 18 additions & 27 deletions readme.md
Expand Up @@ -74,7 +74,6 @@ Safari doesn't support use of the keyboard in fullscreen.

### Examples


#### Fullscreen the page

```js
Expand All @@ -87,20 +86,18 @@ document.getElementById('button').addEventListener('click', () => {
});
```


#### Fullscreen an element

```js
const elem = document.getElementById('target');
const el = document.getElementById('target');

document.getElementById('button').addEventListener('click', () => {
if (screenfull.enabled) {
screenfull.request(elem);
screenfull.request(el);
}
});
```


#### Fullscreen an element with jQuery

```js
Expand All @@ -113,7 +110,6 @@ $('#button').on('click', () => {
});
```


#### Toggle fullscreen on a image with jQuery

```js
Expand All @@ -124,13 +120,12 @@ $('img').on('click', event => {
});
```


#### Detect fullscreen change

```js
if (screenfull.enabled) {
screenfull.onchange(() => {
console.log('Am I fullscreen? ' + (screenfull.isFullscreen ? 'Yes' : 'No'));
console.log('Am I fullscreen?', screenfull.isFullscreen ? 'Yes' : 'No');
});
}
```
Expand All @@ -153,26 +148,26 @@ You can use the [Angular.js binding](https://github.com/hrajchert/angular-screen

```html
<div ngsf-fullscreen>
<p>This is a fullscreen element</p>
<button ngsf-toggle-fullscreen>Toggle fullscreen</button>
<p>This is a fullscreen element</p>
<button ngsf-toggle-fullscreen>Toggle fullscreen</button>
</div>
```

#### Fullscreen the page with Angular 2

```typescript
import { Directive, HostListener } from '@angular/core';
import {Directive, HostListener} from '@angular/core';
const screenfull = require('screenfull');

@Directive({
selector: '[toggleFullscreen]'
selector: '[toggleFullscreen]'
})
export class ToggleFullscreenDirective {
@HostListener('click') onClick() {
if (screenfull.enabled) {
screenfull.toggle();
}
}
@HostListener('click') onClick() {
if (screenfull.enabled) {
screenfull.toggle();
}
}
}
```

Expand Down Expand Up @@ -200,11 +195,13 @@ Brings you out of fullscreen.

Requests fullscreen if not active, otherwise exits.

#### .onchange()
Add a listener for fullscreenchange event
#### .onchange(function)

#### .onerror()
Add a listener for fullscreenerror event
Add a listener for when the browser switches in and out of fullscreen.

#### .onerror(function)

Add a listener for when the browser cannot switch to fullscreen.

### Properties

Expand All @@ -224,12 +221,6 @@ Returns a boolean whether you are allowed to enter fullscreen. If your page is i

Exposes the raw properties (prefixed if needed) used internally: `requestFullscreen`, `exitFullscreen`, `fullscreenElement`, `fullscreenEnabled`, `fullscreenchange`, `fullscreenerror`

```js
$(document).on(screenfull.raw.fullscreenchange, () => {
console.log('Fullscreen change');
});
```


## FAQ

Expand Down
4 changes: 2 additions & 2 deletions src/screenfull.js
Expand Up @@ -6,7 +6,7 @@

var fn = (function () {
var val;

var fnMap = [
[
'requestFullscreen',
Expand Down Expand Up @@ -81,7 +81,7 @@
// keyboard in fullscreen even though it doesn't.
// Browser sniffing, since the alternative with
// setTimeout is even worse.
if (/5\.1[\.\d]* Safari/.test(navigator.userAgent)) {
if (/5\.1[.\d]* Safari/.test(navigator.userAgent)) {
elem[request]();
} else {
elem[request](keyboardAllowed && Element.ALLOW_KEYBOARD_INPUT);
Expand Down

0 comments on commit db980c3

Please sign in to comment.