diff options
author | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-18 17:25:40 +0800 |
---|---|---|
committer | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-18 17:25:40 +0800 |
commit | acd93c29711f18787ec3392751f57ffe08b5df28 (patch) | |
tree | b95c6be3a30947dee779fa7b52960dce82a6d1b1 /cmd/mist/assets | |
parent | 0e2f6691bfbbcc666c409be6b8657bd6ca475ddd (diff) | |
download | dexon-acd93c29711f18787ec3392751f57ffe08b5df28.tar.gz dexon-acd93c29711f18787ec3392751f57ffe08b5df28.tar.zst dexon-acd93c29711f18787ec3392751f57ffe08b5df28.zip |
Removed console logs from mist.js
also fixed an issue where it would force reloads unnecessarily
Diffstat (limited to 'cmd/mist/assets')
-rw-r--r-- | cmd/mist/assets/ext/mist.js | 7 | ||||
-rw-r--r-- | cmd/mist/assets/qml/main.qml | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/cmd/mist/assets/ext/mist.js b/cmd/mist/assets/ext/mist.js index 8589c8fc5..2fc38cdfa 100644 --- a/cmd/mist/assets/ext/mist.js +++ b/cmd/mist/assets/ext/mist.js @@ -20,21 +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"); } else if (evt.ctrlKey && evt.keyCode == 86) { window.document.execCommand("paste"); - console.log("Ctrl-V"); } else if (evt.ctrlKey && evt.keyCode == 90) { window.document.execCommand("undo"); - console.log("Ctrl-Z"); } else if (evt.ctrlKey && evt.shiftKey && evt.keyCode == 90) { window.document.execCommand("redo"); - console.log("Ctrl-Z"); } };
\ No newline at end of file diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml index 9a6bf5273..78a6dd846 100644 --- a/cmd/mist/assets/qml/main.qml +++ b/cmd/mist/assets/qml/main.qml @@ -132,7 +132,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); } } @@ -888,7 +892,7 @@ ApplicationWindow { function addPeer(peer) { peerModel.append(peer) } function setPeerCounters(text) { - peerCounterLabel.text = text + //peerCounterLabel.text = text } function timeAgo(unixTs){ |