@@ -119,9 +119,9 @@ SC.runLoop = SC.Object.create({ _flushInvokeQueue: function() { var queue = this._invokeQueue, hadContent = NO, len, idx, handler ; - if (queue && queue.length > 0) { + if (queue && queue.targets > 0) { this._invokeQueue = null; // reset queue. - hadContent = queue.targets>0; // has targets? + hadContent = YES; // has targets! if (hadContent) queue.invokeMethods(); } return hadContent ; application/run_loop.js @@ -190,7 +190,7 @@ SC.mixin(/** @scope SC */ { var len = (obj ? obj.length : null), type = SC.typeOf(obj); return !(SC.none(len) || ((type === SC.T_FUNCTION) && !(obj instanceof NodeList)) || - (type === SC.T_STRING) || obj.setInterval) || obj.objectAt ; + (type === SC.T_STRING) || obj.setInterval) || (obj && obj.objectAt) ; }, /** core.js @@ -628,6 +628,7 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate, */ _collection_isDirtyDidChange: function() { if (this.get('isVisibleInWindow') && this.get('isDirty')) { + console.log('%@:_collection_isDirtyDidChange()'.fmt(this)); this.invokeOnce(this._fullUpdateChildren); } }.observes('isDirty', 'isVisibleInWindow'), @@ -817,7 +818,8 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate, Overrides the default view implementation. Calls layoutResize() first to give you the chance to relayout your children. The notifies children. */ - viewDidResize: function() { + viewDidResize: function() { + console.log('viewDidResize') ; this.layoutResize(); return sc_super(); }.observes('layout'), desktop.platform/views/collection.js @@ -64,7 +64,7 @@ SC.ListView = SC.CollectionView.extend( You can override this as you wish. */ - exampleView: SC.ListItemView, + exampleView: SC.LabelView, /** The default layout for the list view simply fills the entire parentView. @@ -170,11 +170,12 @@ SC.ListView = SC.CollectionView.extend( The default version of this property is set to YES unless you set a delegate or a contentRowHeightKey. */ - hasUniformRowHeights: function(key, value) { - if (value !== undefined) this._list_hasUniformRowHeights = value ; - value = this._list_hasUniformRowHeights; - return SC.none(value) ? !((this.delegate && this.delegate.collectionViewHeightForRowAtContentIndex) || this.contentRowHeightKey) : value ; - }.property('delegate', 'contentRowHeightKey').cacheable(), + hasUniformRowHeights: YES, + // function(key, value) { + // if (value !== undefined) this._list_hasUniformRowHeights = value ; + // value = this._list_hasUniformRowHeights; + // return SC.none(value) ? !((this.delegate && this.delegate.collectionViewHeightForRowAtContentIndex) || this.contentRowHeightKey) : value ; + // }.property('delegate', 'contentRowHeightKey').cacheable(), /** Calculates the offset for the row at the specified index. Based on the @@ -327,7 +328,9 @@ SC.ListView = SC.CollectionView.extend( }, insertionPointClass: SC.View.extend({ - emptyElement: '<div class="list-insertion-point"><span class="anchor"></span></div>' + emptyElement: '<div><span class="anchor"></span></div>', + styleClass: 'sc-list-insertion-point', + layout: SC.merge(SC.FULL_WIDTH, { top: 0, height: 5 }) }), showInsertionPoint: function(itemView, dropOperation) { desktop.platform/views/list.js @@ -25,12 +25,30 @@ SC.SparseArray = function(length) { return this ; } ; -SC.SparseArray.prototype = { +SC.SparseArray.prototype = SC.merge(SC.Observable, SC.Enumerable, SC.Array, SC.DelegateSupport, { + + /** + Use this method to update the content at a specified index. This will + note that the array content has changed without notifying the delegate + again of a change. + + @param {Number} index the index to alter + @param {Object} obj the object to insert + @returns {SC.SparseArray} reciever + */ + provideContentAtIndex: function(index, obj) { + var content = this._sa_content ; + if (!content) content = this._sa_content = [] ; + content[index] = obj; + this.enumerableContentDidChange() ; + return this ; + }, + /** @private */ replace: function(idx, amt, objects) { - var content = this._content ; - if (!content) content = this._content = [] ; + var content = this._sa_content ; + if (!content) content = this._sa_content = [] ; content.replace(idx, amt, objects) ; this.invokeDelegateMethod(this.delegate, 'sparseArrayDidReplace', this, idx. amt, objects) ; this.enumerableContentDidChange() ; @@ -39,33 +57,29 @@ SC.SparseArray.prototype = { /** @private */ objectAt: function(idx) { - var content = this._content ; - if (!content) content = this._content = [] ; - var ret= content[idx] ; + var content = this._sa_content, ret ; + if (!content) content = this._sa_content = [] ; + ret= content[idx] ; if (ret === undefined) { - // call method to load this object. this.invokeDelegateMethod(this.delegate, 'sparseArrayDidRequestIndex', this, idx) ; } - var ret= content[idx] ; + ret = content[idx]; return ret ; }, // removes content array flush: function() { - this_content = null ; + this._sa_content = null ; this.enumerableContentDidChange() ; - // call sparseArrayDidFlush(this) ; + this.invokeDelegateMethod(this.delegate, 'sparseArrayDidFlush', this); return this ; }, /** TODO: explain */ delegate: null, - _content: null + _sa_content: null - -} ; - -SC.mixin(SC.SparseArray.prototype, SC.Observable, SC.Enumerable, SC.Array, SC.Delegate) ; +}) ; SC.SparseArray.create = function(len) { return new SC.SparseArray(len); }; \ No newline at end of file system/sparse_array.js @@ -187,7 +187,7 @@ SC.Control = { if (content === undefined) content = this.get('content'); // get actual content key - contentKey = this.get(contentKey); + contentKey = this[contentKey] ? this.get(contentKey) : this.getDelegateProperty(this.displayDelegate, contentKey); if (contentKey && (all || key === contentKey)) { var v = (content) ? (content.get ? content.get(contentKey) : content[contentKey]) : null ; this.set(prop, v); views/mixins/control.js 5ce30d175448030a4486f0891a0b715ed29b674a Charles Jolley charles@sproutit.com http://github.com/sproutit/sproutcore/commit/3b75cbff93f4c88a0380004b8279df8ad1e52cb2 3b75cbff93f4c88a0380004b8279df8ad1e52cb2 2008-12-22T10:13:31-08:00 2008-12-22T10:13:31-08:00 latest testing for collection views 093569419f8998486d1f0361952ef4943508a877 Charles Jolley charles@sproutit.com