1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 17:56:25 +00:00

bump up electron version 0.34 -> 0.35.1

This commit is contained in:
Rokt33r
2015-11-23 11:38:35 +09:00
parent 53455496bf
commit de3b76b31d
18 changed files with 57 additions and 60 deletions

View File

@@ -28,7 +28,8 @@
<div id="content"></div>
<script src="../../submodules/ace/src-min/ace.js"></script>
<script>
require('web-frame').setZoomLevelLimits(1, 1)
const electron = require('electron')
electron.webFrame.setZoomLevelLimits(1, 1)
var scriptUrl = process.env.BOOST_ENV === 'development'
? 'http://localhost:8080/assets/finder.js'
: '../../compiled/finder.js'

View File

@@ -10,9 +10,10 @@ import { selectArticle, searchArticle, refreshData } from './actions'
import _ from 'lodash'
import activityRecord from 'boost/activityRecord'
import remote from 'remote'
const electron = require('electron')
const { remote, clipboard } = electron
var hideFinder = remote.getGlobal('hideFinder')
import clipboard from 'clipboard'
function notify (...args) {
return new window.Notification(...args)

View File

@@ -7,8 +7,9 @@ import ArticleTopBar from './HomePage/ArticleTopBar'
import ArticleList from './HomePage/ArticleList'
import ArticleDetail from './HomePage/ArticleDetail'
import _ from 'lodash'
import keygen from 'boost/keygen'
import { isModalOpen, closeModal } from 'boost/modal'
const electron = require('electron')
const BrowserWindow = electron.remote.BrowserWindow
const TEXT_FILTER = 'TEXT_FILTER'
const FOLDER_FILTER = 'FOLDER_FILTER'
@@ -31,7 +32,7 @@ class HomePage extends React.Component {
if (process.env.BOOST_ENV === 'development' && e.keyCode === 73 && e.metaKey && e.altKey) {
e.preventDefault()
e.stopPropagation()
require('remote').require('browser-window').getFocusedWindow().toggleDevTools()
BrowserWindow.getFocusedWindow().toggleDevTools()
return
}

View File

@@ -7,7 +7,8 @@ import Preferences from 'boost/components/modal/Preferences'
import CreateNewFolder from 'boost/components/modal/CreateNewFolder'
import keygen from 'boost/keygen'
import remote from 'remote'
const electron = require('electron')
const remote = electron.remote
let userName = remote.getGlobal('process').env.USER
const BRAND_COLOR = '#18AF90'

View File

@@ -1,4 +1,5 @@
import ipc from 'ipc'
const electron = require('electron')
const ipc = electron.ipcRenderer
import React, { PropTypes } from 'react'
var ContactModal = require('boost/components/modal/ContactModal')

View File

@@ -54,8 +54,9 @@
<script src="../../submodules/ace/src-min/ace.js"></script>
<script type='text/javascript'>
require('web-frame').setZoomLevelLimits(1, 1)
var version = require('remote').require('app').getVersion()
const electron = require('electron')
electron.webFrame.setZoomLevelLimits(1, 1)
var version = electron.remote.app.getVersion()
document.title = 'Boost' + ((version == null || version.length === 0) ? ' DEV' : '')
var scriptUrl = process.env.BOOST_ENV === 'development'
? 'http://localhost:8080/assets/main.js'

View File

@@ -11,7 +11,8 @@ require('../styles/main/index.styl')
import { openModal } from 'boost/modal'
import Tutorial from 'boost/components/modal/Tutorial'
import activityRecord from 'boost/activityRecord'
import ipc from 'ipc'
const electron = require('electron')
const ipc = electron.ipcRenderer
activityRecord.init()
window.addEventListener('online', function () {