diff options
| -rw-r--r-- | src/webchannel/qwebchannel.js | 23 | ||||
| -rw-r--r-- | tests/auto/qml/data/grouping.html | 2 | ||||
| -rw-r--r-- | tests/auto/qml/data/property.html | 4 | ||||
| -rw-r--r-- | tests/auto/qml/data/wrapper.html | 2 |
4 files changed, 10 insertions, 21 deletions
diff --git a/src/webchannel/qwebchannel.js b/src/webchannel/qwebchannel.js index 9529c0b..278f423 100644 --- a/src/webchannel/qwebchannel.js +++ b/src/webchannel/qwebchannel.js @@ -389,24 +389,13 @@ function QObject(name, data, webChannel) }); object.__defineGetter__(propertyName, function () { - return (function (callback) { - var propertyValue = object.__propertyCache__[propertyIndex]; - if (propertyValue === undefined) { - // This shouldn't happen - console.warn("Undefined value in property cache for property \"" + propertyName + "\" in object " + object.__id__); - } + var propertyValue = object.__propertyCache__[propertyIndex]; + if (propertyValue === undefined) { + // This shouldn't happen + console.warn("Undefined value in property cache for property \"" + propertyName + "\" in object " + object.__id__); + } - // TODO: A callback is not required here anymore, but is kept for backwards compatibility - if (callback !== undefined) { - if (typeof(callback) !== "function") { - console.error("Bad callback given to get property " + property); - return; - } - callback(propertyValue); - } else { - return propertyValue; - } - }); + return propertyValue; }); } diff --git a/tests/auto/qml/data/grouping.html b/tests/auto/qml/data/grouping.html index f2d7aec..f6bc33c 100644 --- a/tests/auto/qml/data/grouping.html +++ b/tests/auto/qml/data/grouping.html @@ -6,7 +6,7 @@ //BEGIN SETUP window.channel = createWebChannel(function(channel) { channel.subscribe(QWebChannelMessageTypes.propertyUpdate, function() { - channel.exec({label: "gotPropertyUpdate", values: [myObj.myProperty(), myOtherObj.foo(), myOtherObj.bar()]}); + channel.exec({label: "gotPropertyUpdate", values: [myObj.myProperty, myOtherObj.foo, myOtherObj.bar]}); }); }); //END SETUP diff --git a/tests/auto/qml/data/property.html b/tests/auto/qml/data/property.html index 9565aaa..49b3811 100644 --- a/tests/auto/qml/data/property.html +++ b/tests/auto/qml/data/property.html @@ -5,9 +5,9 @@ <script type="text/javascript"> //BEGIN SETUP createWebChannel(function(channel) { - channel.exec({label: "init", value: myObj.myProperty()}); + channel.exec({label: "init", value: myObj.myProperty}); myObj.myPropertyChanged.connect(function() { - channel.exec({label: "changed", value: myObj.myProperty()}); + channel.exec({label: "changed", value: myObj.myProperty}); }); channel.subscribe("setProperty", function(newValue) { myObj.myProperty = newValue; diff --git a/tests/auto/qml/data/wrapper.html b/tests/auto/qml/data/wrapper.html index a556486..df368ee 100644 --- a/tests/auto/qml/data/wrapper.html +++ b/tests/auto/qml/data/wrapper.html @@ -6,7 +6,7 @@ //BEGIN SETUP createWebChannel(function(channel) { myFactory.create("testObj", function(obj) { - window[obj.objectName()] = obj; + window[obj.objectName] = obj; obj.mySignal.connect(function(arg1, arg2) { channel.exec({label: "signalReceived", args: [arg1, arg2]}); }); |