Skip to content

Commit a5db2b9

Browse files
committed
makes resolve return passed value
1 parent 5fe4d4c commit a5db2b9

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

resolver/resolver-test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,21 @@ QUnit.test("timer with teardown", function(){
4949

5050
});
5151

52-
QUnit.test('basics listenTo', 10, function(assert){
52+
QUnit.test('basics listenTo', 14, function(assert){
5353
var number = new SimpleObservable(1);
5454

5555
var map = mapEventMixin({
5656
property: 1
5757
});
5858

5959
var obs = new ResolverObservable(function(value){
60-
value.resolve(6);
60+
QUnit.equal( value.resolve(6), 6, "resolve returns passed value");
6161

6262

6363
value.listenTo(number, function(newNumber){
6464
assert.equal(newNumber,2, "got the new number");
6565
assert.equal(this, map, "listenTo this is the context");
66-
value.resolve(5);
66+
QUnit.equal( value.resolve(5), 5, "resolve returns passed value");
6767
});
6868

6969
}, map);

resolver/resolver.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ canReflect.assignMap(ResolverObservable.prototype, {
103103

104104
if(this.isBinding) {
105105
this.lastValue = this.value;
106-
return;
106+
return newVal;
107107
}
108108

109109
if(this.value !== this.lastValue) {
@@ -123,6 +123,7 @@ canReflect.assignMap(ResolverObservable.prototype, {
123123
);
124124
queues.batch.stop();
125125
}
126+
return newVal;
126127
},
127128
update: function(){
128129

@@ -247,7 +248,7 @@ canReflect.assignSymbols(ResolverObservable.prototype, {
247248
this.priority = newPriority;
248249
},
249250
"can.valueHasDependencies": ResolverObservable.prototype.hasDependencies,
250-
"can.getValueDependencies": ResolverObservable.prototype.getValueDependencies
251+
"can.getValueDependencies": ResolverObservable.prototype.getValueDependencies
251252
});
252253

253254

0 commit comments

Comments
 (0)