Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
666ef482
Commit
666ef482
authored
Feb 16, 2015
by
Alexandre Van de Sande
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SideIcons work. Copy paste still doesn't.
parent
3068e268
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
55 additions
and
13 deletions
+55
-13
mist.js
cmd/mist/assets/ext/mist.js
+35
-0
browser.qml
cmd/mist/assets/qml/views/browser.qml
+11
-12
catalog.qml
cmd/mist/assets/qml/views/catalog.qml
+9
-1
No files found.
cmd/mist/assets/ext/mist.js
0 → 100644
View file @
666ef482
// Copyright (c) 2015, ETHDEV. All rights reserved.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public
// License as published by the Free Software Foundation; either
// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this library; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
// MA 02110-1301 USA
// this function is included locally, but you can also include separately via a header definition
console
.
log
(
"loaded?"
);
document
.
onkeydown
=
function
(
evt
)
{
evt
=
evt
||
window
.
event
;
if
(
evt
.
ctrlKey
&&
evt
.
keyCode
==
67
)
{
window
.
document
.
execCommand
(
"copy"
);
console
.
log
(
"Ctrl-C"
);
}
else
if
(
evt
.
ctrlKey
&&
evt
.
keyCode
==
88
)
{
window
.
document
.
execCommand
(
"cut"
);
console
.
log
(
"Ctrl-X"
);
}
if
(
evt
.
ctrlKey
&&
evt
.
keyCode
==
86
)
{
console
.
log
(
"Ctrl-V"
);
}
if
(
evt
.
ctrlKey
&&
evt
.
keyCode
==
90
)
{
console
.
log
(
"Ctrl-Z"
);
}
};
\ No newline at end of file
cmd/mist/assets/qml/views/browser.qml
View file @
666ef482
...
...
@@ -3,7 +3,7 @@ import QtQuick.Controls 1.0;
import
QtQuick
.
Controls
.
Styles
1.0
import
QtQuick
.
Layouts
1.0
;
import
QtWebEngine
1.0
import
QtWebEngine
.
experimental
1.0
//
import QtWebEngine.experimental 1.0
import
QtQuick
.
Window
2.0
;
Rectangle
{
...
...
@@ -340,8 +340,8 @@ Rectangle {
WebEngineView
{
objectName
:
"webView"
id
:
webview
experimental.settings.javascriptCanAccessClipboard
:
true
experimental.settings.localContentCanAccessRemoteUrls
:
true
//
experimental.settings.javascriptCanAccessClipboard: true
//
experimental.settings.localContentCanAccessRemoteUrls: true
anchors
{
left
:
parent
.
left
right
:
parent
.
right
...
...
@@ -367,7 +367,12 @@ Rectangle {
menuItem
.
title
=
pageTitle
;
});
webView
.
runJavaScript
(
"document.querySelector(
\"
link[rel='icon']
\"
).getAttribute(
\"
href
\"
)"
,
function
(
sideIcon
){
if
(
sideIcon
){
menuItem
.
icon
=
"http://localhost:3000/whisper-icon@2x.png"
};
});
webView
.
runJavaScript
(
"try{document.querySelector(
\"
meta[name='ethereum-dapp-url-bar-style']
\"
).getAttribute(
\"
content
\"
)}catch(e){}"
,
function
(
topBarStyle
){
if
(
!
topBarStyle
)
{
showFullUrlBar
(
true
);
...
...
@@ -397,15 +402,9 @@ Rectangle {
};
});
// webView.runJavaScript("document.querySelector(\"link[rel='icon']\").getAttribute(\"href\")", function(sideIcon){
// if(sideIcon){
// window.iconSource = "http://localhost:3000/whisper-icon@2x.png" //webview.url + sideIcon
// console.log(iconSource)
// };
// });
webview
.
runJavaScript
(
eth
.
readFile
(
"bignumber.min.js"
));
webview
.
runJavaScript
(
eth
.
readFile
(
"ethereum.js/dist/ethereum.js"
));
webview
.
runJavaScript
(
eth
.
readFile
(
"ethereum.js/dist/ethereum.js"
));
var
cleanTitle
=
webview
.
url
.
toString
()
var
matches
=
cleanTitle
.
match
(
/^
[
a-z
]
*
\:\/\/([^\/
?#
]
+
)(?:[\/
?#
]
|$
)
/i
);
...
...
cmd/mist/assets/qml/views/catalog.qml
View file @
666ef482
...
...
@@ -85,7 +85,7 @@ Rectangle {
property
var
domain
:
"ethereum-dapp-catalog.meteor.com"
url
:
protocol
+
domain
//experimental.settings.javascriptCanAccessClipboard: true
onJavaScriptConsoleMessage
:
{
...
...
@@ -112,10 +112,18 @@ Rectangle {
}
}
// onLoadingChanged: {
// if (loadRequest.status == WebEngineView.LoadSucceededStatus) {
// webview.runJavaScript(eth.readFile("mist.js"));
// }
// }
}
WebEngineView
{
id
:
inspector
visible
:
false
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment