forked from cerc-io/plugeth
Merge pull request #335 from alexvandesande/ui
Cut, Copy, Undo and Redo working in webview
This commit is contained in:
commit
07c34751da
@ -20,16 +20,18 @@
|
||||
console.log("loaded?");
|
||||
|
||||
document.onkeydown = function(evt) {
|
||||
// This functions keeps track of keyboard inputs in order to allow copy, paste and other features
|
||||
|
||||
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");
|
||||
} else if (evt.ctrlKey && evt.keyCode == 86) {
|
||||
window.document.execCommand("paste");
|
||||
} else if (evt.ctrlKey && evt.keyCode == 90) {
|
||||
window.document.execCommand("undo");
|
||||
} else if (evt.ctrlKey && evt.shiftKey && evt.keyCode == 90) {
|
||||
window.document.execCommand("redo");
|
||||
}
|
||||
};
|
@ -131,7 +131,11 @@ ApplicationWindow {
|
||||
var existingDomain = matches && matches[1];
|
||||
if (requestedDomain == existingDomain) {
|
||||
domainAlreadyOpen = true;
|
||||
mainSplit.views[i].view.url = url;
|
||||
|
||||
if (mainSplit.views[i].view.url != url){
|
||||
mainSplit.views[i].view.url = url;
|
||||
}
|
||||
|
||||
activeView(mainSplit.views[i].view, mainSplit.views[i].menuItem);
|
||||
}
|
||||
}
|
||||
|
@ -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,7 +340,7 @@ Rectangle {
|
||||
WebEngineView {
|
||||
objectName: "webView"
|
||||
id: webview
|
||||
//experimental.settings.javascriptCanAccessClipboard: true
|
||||
experimental.settings.javascriptCanAccessClipboard: true
|
||||
//experimental.settings.localContentCanAccessRemoteUrls: true
|
||||
anchors {
|
||||
left: parent.left
|
||||
@ -399,7 +399,8 @@ Rectangle {
|
||||
|
||||
onLoadingChanged: {
|
||||
if (loadRequest.status == WebEngineView.LoadSucceededStatus) {
|
||||
webview.runJavaScript("document.title", function(pageTitle) {
|
||||
|
||||
webview.runJavaScript("document.title", function(pageTitle) {
|
||||
menuItem.title = pageTitle;
|
||||
});
|
||||
|
||||
@ -441,7 +442,8 @@ Rectangle {
|
||||
|
||||
webview.runJavaScript(eth.readFile("bignumber.min.js"));
|
||||
webview.runJavaScript(eth.readFile("ethereum.js/dist/ethereum.js"));
|
||||
|
||||
webview.runJavaScript(eth.readFile("mist.js"));
|
||||
|
||||
var cleanTitle = webview.url.toString()
|
||||
var matches = cleanTitle.match(/^[a-z]*\:\/\/([^\/?#]+)(?:[\/?#]|$)/i);
|
||||
var domain = matches && matches[1];
|
||||
|
@ -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;
|
||||
|
||||
|
||||
@ -21,8 +21,6 @@ Rectangle {
|
||||
property alias windowTitle: webview.title
|
||||
property alias webView: webview
|
||||
|
||||
|
||||
|
||||
property var cleanPath: false
|
||||
property var open: function(url) {
|
||||
if(!window.cleanPath) {
|
||||
@ -66,9 +64,6 @@ Rectangle {
|
||||
}
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
}
|
||||
|
||||
Item {
|
||||
objectName: "root"
|
||||
id: root
|
||||
@ -85,7 +80,7 @@ Rectangle {
|
||||
property var domain: "ethereum-dapp-catalog.meteor.com"
|
||||
url: protocol + domain
|
||||
|
||||
//experimental.settings.javascriptCanAccessClipboard: true
|
||||
experimental.settings.javascriptCanAccessClipboard: true
|
||||
|
||||
|
||||
onJavaScriptConsoleMessage: {
|
||||
@ -112,11 +107,11 @@ Rectangle {
|
||||
|
||||
}
|
||||
}
|
||||
// onLoadingChanged: {
|
||||
// if (loadRequest.status == WebEngineView.LoadSucceededStatus) {
|
||||
// webview.runJavaScript(eth.readFile("mist.js"));
|
||||
// }
|
||||
// }
|
||||
onLoadingChanged: {
|
||||
if (loadRequest.status == WebEngineView.LoadSucceededStatus) {
|
||||
webview.runJavaScript(eth.readFile("mist.js"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user