diff --git a/libjsqrc/ethereumjs/dist/ethereum.js b/libjsqrc/ethereumjs/dist/ethereum.js index 0f30280f9..5c912dbba 100644 --- a/libjsqrc/ethereumjs/dist/ethereum.js +++ b/libjsqrc/ethereumjs/dist/ethereum.js @@ -903,9 +903,8 @@ var ProviderManager = function() { data.data._id = self.id; self.id++; var result = self.provider.send(data.data); - - result = JSON.parse(result); - + result = JSON.parse(result); + // dont call the callback if result is not an array, or empty one if (result.error || !(result.result instanceof Array) || result.result.length === 0) { return; @@ -1520,4 +1519,4 @@ module.exports = web3; },{"./lib/abi":1,"./lib/contract":3,"./lib/filter":5,"./lib/httpsync":7,"./lib/providermanager":8,"./lib/qtsync":9,"./lib/web3":12}]},{},["web3"]) -//# sourceMappingURL=ethereum.js.map \ No newline at end of file +//# sourceMappingURL=ethereum.js.map diff --git a/mix/qml/Splitter.qml b/mix/qml/Splitter.qml deleted file mode 100644 index 341dc4450..000000000 --- a/mix/qml/Splitter.qml +++ /dev/null @@ -1,47 +0,0 @@ -import QtQuick 2.2 - -Rectangle { - property variant itemToStick; - property int itemMinimumWidth; - property string direction; - property variant brother; - - Component.onCompleted: - { - if (direction === "left") - anchors.right = itemToStick.left; - else if (direction === "right") - anchors.left = itemToStick.right; - } - - width: 5 - height: parent.height - anchors.top: parent.top; - MouseArea - { - property int startX: 0; - anchors.fill: parent - onPressed: startX = mouseX; - onPositionChanged: - { - parent.x += mouseX; - var diff = 0; - if (direction == "left") - diff = mouseX - startX; - else if (direction == "right") - diff = -(mouseX - startX); - - if (itemMinimumWidth > itemToStick.width - diff) - { - brother.width = brother.width + diff; - itemToStick.width = itemMinimumWidth; - } - else - { - brother.width = brother.width + diff; - itemToStick.width = itemToStick.width - diff; - } - } - cursorShape: Qt.SizeHorCursor - } -} diff --git a/mix/res.qrc b/mix/res.qrc index 639881e6a..b511217e6 100644 --- a/mix/res.qrc +++ b/mix/res.qrc @@ -44,7 +44,6 @@ qml/BigIntValue.qml qml/js/QEtherHelper.js qml/js/TransactionHelper.js - qml/Splitter.qml qml/ContractLibrary.qml stdc/config.sol stdc/namereg.sol