Skip to content

Commit

Permalink
changes for relases
Browse files Browse the repository at this point in the history
  • Loading branch information
poush committed Oct 12, 2018
1 parent 5760355 commit 1c460fb
Show file tree
Hide file tree
Showing 14 changed files with 9,793 additions and 3,728 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
node_modules
yarn*
dist/
8 changes: 5 additions & 3 deletions ServiceProviders/MediaProviders/baseMediaProvider.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {clipboard} from 'electron'
const {clipboard} = require('electron')

export default class baseMediaProvider {
class baseMediaProvider {

constructor() {
this.version = '0.1'
Expand Down Expand Up @@ -41,4 +41,6 @@ export default class baseMediaProvider {
return true
}

}
}

module.exports = baseMediaProvider
6 changes: 3 additions & 3 deletions ServiceProviders/MediaProviders/docs.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import baseMediaProvider from './baseMediaProvider'
const baseMediaProvider = require('./baseMediaProvider')

export class docsProvider extends baseMediaProvider {
class docsProvider extends baseMediaProvider {

constructor(){
super()
Expand Down Expand Up @@ -32,4 +32,4 @@ export class docsProvider extends baseMediaProvider {
return true
}

}
}module.exports = docsProvider
8 changes: 5 additions & 3 deletions ServiceProviders/MediaProviders/pdf.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import baseMediaProvider from './baseMediaProvider'
const baseMediaProvider = require('./baseMediaProvider')

export class pdfProvider extends baseMediaProvider {
class pdfProvider extends baseMediaProvider {

constructor(){
super()
Expand Down Expand Up @@ -31,4 +31,6 @@ export class pdfProvider extends baseMediaProvider {
return true
}

}
}

module.exports = pdfProvider
8 changes: 5 additions & 3 deletions ServiceProviders/MediaProviders/youtube.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import baseMediaProvider from './baseMediaProvider'
const baseMediaProvider = require('./baseMediaProvider')

export class youtubeProvider extends baseMediaProvider {
class youtubeProvider extends baseMediaProvider {

constructor(){
super()
Expand Down Expand Up @@ -32,4 +32,6 @@ export class youtubeProvider extends baseMediaProvider {
return true
}

}
}

module.exports = youtubeProvider
5 changes: 2 additions & 3 deletions ServiceProviders/mediaProviderApplier.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import baseMediaProvider from './MediaProviders/baseMediaProvider'
const baseMediaProvider = require('./MediaProviders/baseMediaProvider')

export default function (toApply, win){
module.exports = function (toApply, win){

if(toApply instanceof baseMediaProvider){

if(toApply.response.type === 'iframe'){
win.loadFile('./index.html')
console.log('test')

win.webContents.once('dom-ready', () => {
win.webContents.send(toApply.response.eventName, toApply.response.content)
Expand Down
10 changes: 5 additions & 5 deletions ServiceProviders/providers.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {youtubeProvider} from './MediaProviders/youtube'
import {pdfProvider} from './MediaProviders/pdf'
import {docsProvider} from './MediaProviders/docs'
import applyMedia from './mediaProviderApplier'
import {clipboard} from 'electron'
const youtubeProvider = require('./MediaProviders/youtube')
const pdfProvider = require('./MediaProviders/pdf')
const docsProvider = require('./MediaProviders/docs')
const applyMedia = require('./mediaProviderApplier')
const {clipboard} = require('electron')


let matchers = {
Expand Down
2 changes: 1 addition & 1 deletion lib/notifications.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export default function (message, onclick=null){
module.exports = function (message, onclick=null){

console.log(Notification)
let notif = new Notification('H2', {
Expand Down
2 changes: 1 addition & 1 deletion main.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ function createWindow() {
}

let createMenuTray = () => {
tray = new Tray('icon.png')
tray = new Tray(__dirname + '/tray.png')
const contextMenu = Menu.buildFromTemplate([
{ role: 'about' },
{ label: 'Quit', click() { app.quit() } }
Expand Down
Loading

0 comments on commit 1c460fb

Please sign in to comment.