Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-02-03 13:59:12 +08:00
Code Issues Projects Releases Packages Wiki Activity

Revert "bump(electron): 0.35.4 => 0.36.2"

Browse source 
This reverts commit da607dd508.
This commit is contained in:
Ben Gotow 2016-01-08 10:06:09 -08:00
parent 348aa69a17
commit 7474c79c61
7 changed files with 54 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -11,7 +11,7 @@
"bugs": { "bugs": {
"url": "https://github.com/nylas/N1/issues" "url": "https://github.com/nylas/N1/issues"
}, },
"electronVersion": "0.36.2", "electronVersion": "0.35.4",
"dependencies": { "dependencies": {
"async": "^0.9", "async": "^0.9",
"atom-keymap": "^6.1.1", "atom-keymap": "^6.1.1",

2
script/bootstrap
View file

@ -48,7 +48,7 @@ function makeSqlite3Command() {
// Use our local version of npm (npm 3x) to build sqlite // Use our local version of npm (npm 3x) to build sqlite
var npmPath = '"' + path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'npm') + '"'; var npmPath = '"' + path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'npm') + '"';
return npmPath + " install https://github.com/bengotow/node-sqlite3/archive/bengotow/usleep.tar.gz --ignore-scripts && cd node_modules/sqlite3 && "+nodeGypPath+" configure rebuild --target="+targetElectronVersion+" --arch="+targetArch+" --target_platform="+targetPlatform+" --dist-url=https://atom.io/download/atom-shell --module_name=node_sqlite3 --module_path=../lib/binding/node-v47-"+targetPlatform+"-"+targetArch return npmPath + " install https://github.com/bengotow/node-sqlite3/archive/bengotow/usleep.tar.gz --ignore-scripts && cd node_modules/sqlite3 && "+nodeGypPath+" configure rebuild --target="+targetElectronVersion+" --arch="+targetArch+" --target_platform="+targetPlatform+" --dist-url=https://atom.io/download/atom-shell --module_name=node_sqlite3 --module_path=../lib/binding/node-v46-"+targetPlatform+"-"+targetArch
} }
function bootstrap() { function bootstrap() {

2
spec/spec-bootstrap.coffee
View file

@ -1,5 +1,5 @@
# Start the crash reporter before anything else. # Start the crash reporter before anything else.
# require('crash-reporter').start(productName: 'N1', companyName: 'Nylas') require('crash-reporter').start(productName: 'N1', companyName: 'Nylas')
path = require 'path' path = require 'path'

1
src/browser/window-manager.coffee
View file

@ -85,7 +85,6 @@ class WindowManager
center: true center: true
width: 640 width: 640
height: 396 height: 396
minHeight: 396
resizable: false resizable: false
### ###

23
src/nylas-env.coffee
View file

@ -654,16 +654,18 @@ class NylasEnvConstructor extends Model
@deserializeSheetContainer() @deserializeSheetContainer()
@packages.activate() @packages.activate()
@keymaps.loadUserKeymap() @keymaps.loadUserKeymap()
@requireUserInitScript() unless safeMode
@menu.update() @menu.update()
@getCurrentWindow().hide() @showRootWindow()
ipcRenderer.send('window-command', 'window:loaded')
showRootWindow: ->
document.getElementById("application-loading-cover").remove() document.getElementById("application-loading-cover").remove()
document.body.classList.add("window-loaded") document.body.classList.add("window-loaded")
window.requestAnimationFrame =>
window.requestAnimationFrame =>
@restoreWindowDimensions() @restoreWindowDimensions()
@getCurrentWindow().show() @getCurrentWindow().setMinimumSize(875, 500)
ipcRenderer.send('window-command', 'window:loaded')
registerCommands: -> registerCommands: ->
{resourcePath} = @getLoadSettings() {resourcePath} = @getLoadSettings()
@ -865,6 +867,17 @@ class NylasEnvConstructor extends Model
crashRenderProcess: -> crashRenderProcess: ->
process.crash() process.crash()
getUserInitScriptPath: ->
initScriptPath = fs.resolve(@getConfigDirPath(), 'init', ['js', 'coffee'])
initScriptPath ? path.join(@getConfigDirPath(), 'init.coffee')
requireUserInitScript: ->
if userInitScriptPath = @getUserInitScriptPath()
try
require(userInitScriptPath) if fs.isFileSync(userInitScriptPath)
catch error
console.log(error)
# Require the module with the given globals. # Require the module with the given globals.
# #
# The globals will be set on the `window` object and removed after the # The globals will be set on the `window` object and removed after the

2
static/index.html
View file

@ -3,7 +3,7 @@
<head> <head>
<title></title> <title></title>
<meta http-equiv="Content-Security-Policy" content="default-src *; script-src 'self'; style-src * 'unsafe-inline'; img-src * data:;"> <meta http-equiv="Content-Security-Policy" content="default-src *; script-src 'self'; style-src * 'unsafe-inline';">
<script src="index.js"></script> <script src="index.js"></script>
</head> </head>

20
static/index.js
View file

@ -49,13 +49,13 @@ function setupWindow (loadSettings) {
ModuleCache.add(loadSettings.resourcePath) ModuleCache.add(loadSettings.resourcePath)
// Start the crash reporter before anything else. // Start the crash reporter before anything else.
// require('crash-reporter').start({ require('crash-reporter').start({
// productName: 'N1', productName: 'N1',
// companyName: 'Nylas', companyName: 'Nylas',
// // By explicitly passing the app version here, we could save the call // By explicitly passing the app version here, we could save the call
// // of "require('remote').require('app').getVersion()". // of "require('remote').require('app').getVersion()".
// extra: {_version: loadSettings.appVersion} extra: {_version: loadSettings.appVersion}
// }) })
setupVmCompatibility() setupVmCompatibility()
setupCsonCache(CompileCache.getCacheDirectory()) setupCsonCache(CompileCache.getCacheDirectory())
@ -77,10 +77,6 @@ function setupVmCompatibility () {
window.onload = function() { window.onload = function() {
// wait for first frame, which will be blank
window.requestAnimationFrame(function() {
// wait for second frame, which is correct
window.requestAnimationFrame(function() {
try { try {
var startTime = Date.now(); var startTime = Date.now();
@ -110,6 +106,4 @@ window.onload = function() {
catch (error) { catch (error) {
handleSetupError(error) handleSetupError(error)
} }
});
});
} }