mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-12-23 03:59:38 +00:00
Merge branch 'master' of https://github.com/fluffypony/monero-core into fluffypony-master
This commit is contained in:
commit
30f0bce569
2 changed files with 23 additions and 20 deletions
2
main.qml
2
main.qml
|
@ -43,7 +43,7 @@ ApplicationWindow {
|
|||
property var currentItem
|
||||
property bool whatIsEnable: false
|
||||
property bool ctrlPressed: false
|
||||
property bool rightPanelExpanded: true
|
||||
property bool rightPanelExpanded: false
|
||||
property bool osx: false
|
||||
property alias persistentSettings : persistentSettings
|
||||
property var wallet;
|
||||
|
|
|
@ -60,6 +60,8 @@ Item {
|
|||
if (from == "" && phrase == "")
|
||||
return;
|
||||
|
||||
if (appWindow.rightPanelExpanded) {
|
||||
|
||||
//! [requesting]
|
||||
var req = new XMLHttpRequest;
|
||||
req.open("GET", "https://api.twitter.com/1.1/search/tweets.json?from=" + from +
|
||||
|
@ -85,6 +87,7 @@ Item {
|
|||
req.send();
|
||||
//! [requesting]
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Component.onCompleted: {
|
||||
|
|
Loading…
Reference in a new issue