Skip to content
This repository has been archived by the owner on Feb 6, 2024. It is now read-only.

Commit

Permalink
feat: expose util method isMobile
Browse files Browse the repository at this point in the history
  • Loading branch information
peterpeterparker committed Jan 20, 2019
1 parent 5fe773e commit fe1239c
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 16 deletions.
9 changes: 9 additions & 0 deletions doc/features/extra.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ The [DeckDeckGo] deck expose a couple of extra features which could be added to
- [Extra features](#extra-features)
- [Toggle on/off the full screen mode](#toggle-onoff-the-full-screen-mode)
- [Print the presentation](#print-the-presentation)
- [Mobile](#mobile)
- [Extra events](#extra-events)

## Extra features
Expand All @@ -31,6 +32,14 @@ await deck.toggleFullScreen();
await deck.print();
```

### Mobile

A util method to know if the current presentation is browsed on a mobile device or not.

```
await deck.isMobile(); // resolve a boolean
```

## Extra events

[DeckDeckGo] triggers the following events:
Expand Down
1 change: 1 addition & 0 deletions src/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export namespace Components {
'getLength': () => Promise<number>;
'isBeginning': () => Promise<boolean>;
'isEnd': () => Promise<boolean>;
'isMobile': () => Promise<boolean>;
'keyboard': boolean;
'pager': boolean;
'pagerPercentage': boolean;
Expand Down
13 changes: 10 additions & 3 deletions src/components/deck/deckdeckgo-deck/deckdeckgo-deck.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ export class DeckdeckgoDeck {
return;
}

this.deckTranslateX = index * window.innerWidth * (this.rtl ? 1 : -1);
this.deckTranslateX = index * window.innerWidth * (this.rtl ? 1 : -1);
this.activeIndex = index;

await this.lazyLoadContent(this.activeIndex);
Expand Down Expand Up @@ -583,7 +583,7 @@ export class DeckdeckgoDeck {

/* END: Full screen */

/* BEGIN: Full screen */
/* BEGIN: Utils */

@Method()
doPrint(): Promise<void> {
Expand All @@ -608,7 +608,14 @@ export class DeckdeckgoDeck {
return Promise.all(promises);
}

/* END: Full screen */
@Method()
isMobile(): Promise<boolean> {
return new Promise<boolean>((resolve) => {
resolve(DeckdeckgoUtils.isMobile());
});
}

/* END: Utils */

render() {
return [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export class DeckdeckgoSlideCode implements DeckdeckgoSlide {
private action: DeckdeckgoSlideCodeAction = DeckdeckgoSlideCodeAction.SWIPE;

componentWillLoad() {
this.mobile = DeckdeckgoSlideUtils.isMobile();
this.mobile = DeckdeckgoUtils.isMobile();
}

async componentDidLoad() {
Expand Down
13 changes: 1 addition & 12 deletions src/components/slides/deckdeckgo-slide.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export class DeckdeckgoSlideUtils {
static hideRevealElements(el: HTMLElement, revealShowFirst: boolean): Promise<void> {
return new Promise<void>((resolve) => {
// No keyboard on mobile device to reveal elements
if (this.isMobile()) {
if (DeckdeckgoUtils.isMobile()) {
resolve();
return;
}
Expand Down Expand Up @@ -92,17 +92,6 @@ export class DeckdeckgoSlideUtils {
});
};

// Source: http://detectmobilebrowsers.com
static isMobile(): boolean {
if (!window) {
return false;
}

const a: string = navigator.userAgent || navigator.vendor || (window as any).opera;

return (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0, 4)));
}

static lazyLoadContent(el: HTMLElement): Promise<void> {
return new Promise<void>(async (resolve) => {
const promises = [];
Expand Down
11 changes: 11 additions & 0 deletions src/components/utils/deckdeckgo-utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,15 @@ export class DeckdeckgoUtils {
};
}

// Source: http://detectmobilebrowsers.com
static isMobile(): boolean {
if (!window) {
return false;
}

const a: string = navigator.userAgent || navigator.vendor || (window as any).opera;

return (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0, 4)));
}

}

0 comments on commit fe1239c

Please sign in to comment.