@@ -146,7 +146,7 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport, // create clone of content array if needed var contentClone = this.get('contentClone') ; if (!contentClone) { - contentClone = this.set('contentClone', content.clone()); + this.set('contentClone', contentClone = content.clone()) ; } // now, record the removed objects. This may be used later. controllers/array.js @@ -162,7 +162,8 @@ SC.Binding = SC.Object.extend({ this._lastFromValue = value ; // send along to the 'from' source. - var result = tuple[0].set(tuple[1],value) ; + tuple[0].set(tuple[1],value) ; + var result = tuple[0].get(tuple[1]); if (result) this._lastFromPropertyRevision = result.propertyRevision ; // now that it has been set, the FROM object might not allow some foundation/binding.js @@ -104,7 +104,9 @@ SC.Scrollable = { // compute new sf var newSf = { x: sf.x - (amount.x || 0), y: sf.y - (amount.y || 0) } ; - newSf = this.set('scrollFrame', newSf) ; + this.set('scrollFrame', newSf) ; + newSf = this.get('scrollFrame') ; + return { x: newSf.x - sf.x, y: newSf.y - sf.y }; }, mixins/scrollable.js @@ -112,7 +112,9 @@ Test.context("CASE 3: manual-layout view with some padding and no border", { }, "after frame change, innerFrame should == frame less border, viewFrameDidChange is not required.": function() { - var f = this.v.set('frame', { width: 50, x: 10, y: 10, height: 50 }) ; + var f ; + + this.v.set('frame', f = { width: 50, x: 10, y: 10, height: 50 }) ; f.x += CASE3_OFFSET; f.y += CASE3_OFFSET; f.width -= (CASE3_OFFSET*2); f.height -= (CASE3_OFFSET*2) ; //console.log('f: %@ if: %@'.fmt($H(f).inspect(), $H(this.v.get('innerFrame')).inspect())); tests/views/view/innerFrame.rhtml e15dc7f2cc3486dd898424233823fd731e5e0ff4 Charles Jolley charles@sproutit.com http://github.com/sproutit/sproutcore/commit/caf64c1c95cd643204cf4d58287721f1fddde880 caf64c1c95cd643204cf4d58287721f1fddde880 2008-06-11T23:18:46-07:00 2008-06-11T23:18:46-07:00 Convert some private uses of set() to reflect new model. All tests pass in Safari now. Some are failing in Firefox3 but I think that is a problem with FF3 that needs to be addressed. a423ced029cbf14848b935321ed1a675a873ffea Charles Jolley charles@sproutit.com