This repository has been archived by the owner on Sep 5, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Eth 02 fixes #1483
Merged
Merged
Eth 02 fixes #1483
Changes from all commits
Commits
Show all changes
39 commits
Select commit
Hold shift + click to select a range
79ba4ee
updated package elemeents
frozeman 4139564
Merge branch 'develop' of github.com:ethereum/mist into develop
frozeman 4c79f8a
Merge branch 'develop' of github.com:ethereum/mist into develop
frozeman 0135208
Merge branch 'develop' of github.com:ethereum/mist into develop
frozeman 93d76fd
Merge branch 'develop' of github.com:ethereum/mist into develop
frozeman 7fddec7
Merge branch 'develop' of github.com:ethereum/mist into develop
frozeman 502ced4
fixed max callstack error
frozeman 1f231b4
Merge branch 'develop' of github.com:ethereum/mist into develop
frozeman 0d6184d
Merge branch 'develop' of github.com:ethereum/mist into develop
frozeman 8d6cb70
Merge branch 'develop' of github.com:ethereum/mist into develop
frozeman 16af72e
Merge branch 'develop' of github.com:ethereum/mist into develop
frozeman 5bffe02
Merge branch 'develop' of github.com:ethereum/mist into develop
frozeman 5c044c2
Merge branch 'develop' of github.com:ethereum/mist into develop
frozeman 79a4e16
remove URL from error page
frozeman a7c7315
remove URL from error page
frozeman bc65c28
improved url updating
frozeman 4e5ce02
improved url updating
frozeman c83a22b
Merge branch 'develop' into ETH-01-cure-fixes
frozeman 0182c73
fix ETH-02-003
frozeman b4a081c
Merge branch 'develop' into ETH-01-cure-fixes
frozeman f8f339a
added Blaze._escape to the url.protocol
frozeman 264bcc4
Merge branch 'develop' into ETH-01-cure-fixes
frozeman c7a103c
use shorthand for `url: url`
frozeman 3a9199a
remove function connotation with string.
frozeman 7bc6303
updated signatures
frozeman d655ef4
Merge branch 'ETH-01-cure-fixes' of github.com:ethereum/mist into ETH…
frozeman 75a4896
reverted url shorthand
frozeman 4420e9c
made preloaders more secure, moved mistAPI
frozeman a301f4e
Merge branch 'develop' into ETH-02-fixes
frozeman cbc914e
Merge branch 'develop' into ETH-02-fixes
frozeman 174373d
move pinch zoom blocking
frozeman 1f69331
Merge branch 'ETH-02-fixes' of github.com:ethereum/mist into ETH-02-f…
frozeman e7d27a7
changed ipc -> ipcRenderer in wrapper
frozeman 3478bf0
fixes ETH03-001
frozeman 93d72c3
fixes #1489
frozeman 506c506
Adding mistMode on the preloader
evertonfraga 67957b3
fixed mistMode
frozeman d322d59
fixed sound playing
frozeman b9cbf86
Merge branch 'develop' into ETH-02-fixes
alexvansande File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,9 @@ | ||
<template name="views_webview"> | ||
<div class="webview {{isVisible}} {{#if appBar}}app-bar-{{appBar}}{{/if}}"> | ||
{{#if $eq _id "browser"}} | ||
<webview src="{{checkedUrl}}" useragent="{{useragent}}" data-id="{{_id}}" preload="file://{{preload_dirname}}/browser.js" autosize="on"></webview> | ||
{{#if $eq _id "tests"}} | ||
<webview src="file://{{dirname}}/tests/mocha-in-browser/runner.html" useragent="{{useragent}}" data-id="{{_id}}" preload="{{preloaderFile}}" autosize="on"></webview> | ||
{{else}} | ||
{{#if $eq _id "tests"}} | ||
<webview src="file://{{dirname}}/tests/mocha-in-browser/runner.html" useragent="{{useragent}}" data-id="{{_id}}" preload="file://{{preload_dirname}}/tests.js" autosize="on"></webview> | ||
{{else}} | ||
<webview src="{{checkedUrl}}" useragent="{{useragent}}" data-id="{{_id}}" preload="file://{{preload_dirname}}/dapps.js" autosize="on"></webview> | ||
{{/if}} | ||
<webview src="{{checkedUrl}}" useragent="{{useragent}}" data-id="{{_id}}" preload="{{preloaderFile}}" autosize="on"></webview> | ||
{{/if}} | ||
</div> | ||
</template> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,16 @@ | ||
module.exports = (windowType) => { | ||
const { ipcRenderer: ipc } = require('electron'); | ||
const { ipcRenderer, webFrame } = require('electron'); | ||
|
||
if (process.env.TEST_MODE) { | ||
window.electronRequire = require; | ||
} | ||
|
||
require('./consoleLogCapture')(windowType); | ||
// disable pinch zoom | ||
webFrame.setZoomLevelLimits(1, 1); | ||
|
||
require('./consoleLogCapture')(windowType); // !!! | ||
require('./suppressWindowPrompt')(); | ||
|
||
// register with window manager | ||
ipc.send('backendAction_setWindowId'); | ||
ipcRenderer.send('backendAction_setWindowId'); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍