Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Commit

Permalink
Merge branch 'release/2.1.2'
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
  • Loading branch information
ThorstenHans committed Oct 18, 2019
2 parents d8fda82 + 4991314 commit 060ea3f
Show file tree
Hide file tree
Showing 9 changed files with 5,896 additions and 3,141 deletions.
13 changes: 7 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
dist: xenial
services:
- xvfb
addons:
chrome: stable
language: node_js
sudo: required
notifications:
email: false
node_js:
- '10'
- "10"
before_install:
- export CHROME_BIN=chromium-browser
- if [[ `npm -v` != 6* ]]; then npm i -g npm@6; fi
- google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
after_success:
- npm run build
- cp .git dist/ngx-electron/ -r
Expand All @@ -17,6 +21,3 @@ after_success:
branches:
except:
- /^v\d+\.\d+\.\d+$/
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
[![Build Status](https://travis-ci.org/ThorstenHans/ngx-electron.svg?branch=master)](https://travis-ci.org/ThorstenHans/ngx-electron)
[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)](https://github.com/semantic-release/semantic-release)

`ngx-electron` is a small Module for [Angular](http://angular.io) which makes calling [Electron]() APIs from the [Renderer Process]() easier. By adding it to your Angular project, you'll get intelli sense and a simple Angular service which acts as facade for Electron API's.
`ngx-electron` is a small Module for [Angular](http://angular.io) which makes calling [Electron](https://electronjs.org) APIs from the `Renderer Process` easier. By adding it to your Angular project, you'll get IntelliSense and a simple Angular service which acts as facade for Electron APIs.

`ngx-electron` is licensed under [MIT](https://opensource.org/licenses/MIT).

## Introduction
## Introduction

Checkout the introduction post on my [blog](https://thorsten-hans.com/integrating-angular-and-electron-using-ngx-electron) for more details.

Expand Down Expand Up @@ -44,7 +44,7 @@ import { NgxElectronModule } from 'ngx-electron';
bootstrap: [AppComponent]
})
export class AppModule {

}
```

Expand All @@ -53,15 +53,15 @@ Once the module has been imported, you can easily use dependency injection to ge
``` typescript
import { Component } from '@angular/core';
import { ElectronService } from 'ngx-electron';

@Component({
selector: 'my-app',
templateUrl: 'app.html'
})
export class AppComponent {

constructor(private _electronService: ElectronService) { }

public playPingPong() {
if(this._electronService.isElectronApp) {
let pong: string = this._electronService.ipcRenderer.sendSync('ping');
Expand Down Expand Up @@ -93,3 +93,4 @@ The `ElectronService` is exposing all API's accessible from within Electron's re
* `isLinux: boolean` - Indicates if app is running in electron and on `Linux`
* `isX86: boolean` - Indicates if app is running in electron and on a `x86` architecture
* `isX64: boolean` - Indicates if app is running in electron and on a `x64` architecture
* `isArm: boolean` - Indiciates it app is running in electron adn on a `ARM` architecture
Loading

0 comments on commit 060ea3f

Please sign in to comment.