Commit 247f29c3 authored by 神楽坂玲奈's avatar 神楽坂玲奈

Revert "remote"

This reverts commit 3b393bce.
parent 3b393bce
...@@ -4,8 +4,7 @@ import {InstallOption} from './install-option'; ...@@ -4,8 +4,7 @@ import {InstallOption} from './install-option';
import {SettingsService} from './settings.sevices'; import {SettingsService} from './settings.sevices';
import {App} from './app'; import {App} from './app';
import {DownloadService} from './download.service'; import {DownloadService} from './download.service';
import {clipboard} from 'electron'; import {clipboard, remote} from 'electron';
import * as remote from '@electron/remote';
import * as path from 'path'; import * as path from 'path';
import * as fs from 'fs'; import * as fs from 'fs';
import * as $ from 'jquery'; import * as $ from 'jquery';
......
...@@ -3,7 +3,7 @@ import { Http } from '@angular/http'; ...@@ -3,7 +3,7 @@ import { Http } from '@angular/http';
import * as child_process from 'child_process'; import * as child_process from 'child_process';
import { ChildProcess } from 'child_process'; import { ChildProcess } from 'child_process';
import * as crypto from 'crypto'; import * as crypto from 'crypto';
import * as remote from '@electron/remote'; import { remote } from 'electron';
import * as sudo from 'electron-sudo'; import * as sudo from 'electron-sudo';
import * as fs from 'fs'; import * as fs from 'fs';
import * as glob from 'glob'; import * as glob from 'glob';
......
import {TRANSLATIONS, TRANSLATIONS_FORMAT, LOCALE_ID} from '@angular/core'; import {TRANSLATIONS, TRANSLATIONS_FORMAT, LOCALE_ID} from '@angular/core';
import * as remote from '@electron/remote'; import {remote} from 'electron';
export async function getTranslationProviders (): Promise<Object[]> { export async function getTranslationProviders (): Promise<Object[]> {
let locale = localStorage.getItem('locale'); let locale = localStorage.getItem('locale');
......
import { ChangeDetectorRef, Component, ElementRef, OnInit, Renderer, ViewChild } from '@angular/core'; import { ChangeDetectorRef, Component, ElementRef, OnInit, Renderer, ViewChild } from '@angular/core';
import 'bootstrap'; import 'bootstrap';
import { shell } from 'electron'; import { remote, shell } from 'electron';
import * as remote from '@electron/remote';
import * as $ from 'jquery'; import * as $ from 'jquery';
import * as Tether from 'tether'; import * as Tether from 'tether';
import { LoginService } from './login.service'; import { LoginService } from './login.service';
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* Created by weijian on 2016/10/24. * Created by weijian on 2016/10/24.
*/ */
import {Injectable} from '@angular/core'; import {Injectable} from '@angular/core';
import * as remote from '@electron/remote'; import {remote} from 'electron';
import * as path from 'path'; import * as path from 'path';
export interface Library { export interface Library {
......
...@@ -14,8 +14,7 @@ import { ...@@ -14,8 +14,7 @@ import {
} from '@angular/core'; } from '@angular/core';
import { Headers, Http } from '@angular/http'; import { Headers, Http } from '@angular/http';
import * as child_process from 'child_process'; import * as child_process from 'child_process';
import { clipboard, shell } from 'electron'; import { clipboard, remote, shell } from 'electron';
import * as remote from '@electron/remote';
import * as fs from 'fs-extra'; import * as fs from 'fs-extra';
import * as ini from 'ini'; import * as ini from 'ini';
import { EncodeOptions } from 'ini'; import { EncodeOptions } from 'ini';
......
...@@ -32,7 +32,6 @@ const { autoUpdater } = require('electron-updater'); ...@@ -32,7 +32,6 @@ const { autoUpdater } = require('electron-updater');
const isDev = require('electron-is-dev'); const isDev = require('electron-is-dev');
const child_process = require('child_process'); const child_process = require('child_process');
const path = require('path'); const path = require('path');
require('@electron/remote/main').initialize()
// Keep a global reference of the window object, if you don't, the window will // Keep a global reference of the window object, if you don't, the window will
// be closed automatically when the JavaScript object is garbage collected. // be closed automatically when the JavaScript object is garbage collected.
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment