sproutcore 1.10.0.rc.2 → 1.10.0.rc.3

data/lib/frameworks/sproutcore/frameworks/table/views/table_header.js

@@ -7,53 +7,43 @@
 
 sc_require('views/table');
 
-/** @class
-  The views that make up the column header cells in a typical `SC.TableView`.
-  
-  In addition, this view is in charge of rendering the _entire_ table column
-  (both header and body) when the table is in the "drag-reorder" state. This
-  is the state that occurs when the user clicks and holds on a table header,
-  then drags that header horizontally.
-
-  @extends SC.View
-  @since SproutCore 1.1
-*/
+
 SC.TableHeaderView = SC.View.extend({
-  
+
   classNames: ['sc-table-header'],
-  
+
   displayProperties: ['sortState', 'isInDragMode'],
-  
+
   acceptsFirstResponder: YES,
-  
+
   isInDragMode: NO,
-  
+
   hasHorizontalScroller: NO,
   hasVerticalScroller: NO,
-  
+
   childViews: ['dragModeView'],
-  
-  
+
+
   /**
     The view that is visible when the column is in drag mode.
   */
   dragModeView: SC.ListView.extend({
     isVisible: NO,
-    
+
     layout: { left: 0, right: 0, bottom: 0 },
-    
+
     init: function() {
       sc_super();
 
       var tableHeaderView = this.get('parentView');
-      
+
       if (tableHeaderView) {
         tableHeaderView.addObserver('isInDragMode', this,
             '_scthv_dragModeDidChange');
       }
-      
+
     },
-    
+
     _scthv_dragModeDidChange: function() {
       // var isInDragMode = this.get('tableHeaderView').get('isInDragMode');
       // this.set('isVisible', isInDragMode);
@@ -64,7 +54,7 @@ SC.TableHeaderView = SC.View.extend({
     The SC.TableColumn object this header cell is bound to.
   */
   column:  null,
-  
+
   render: function(context, firstTime) {
     var column = this.get('column'), icon = column.get('icon'), html;
     var span = context.begin('span');
@@ -76,7 +66,7 @@ SC.TableHeaderView = SC.View.extend({
     }
     span.end();
   },
-    
+
   // ========================================================
   // = For the column we look after, set up some observers. =
   // ========================================================
@@ -89,76 +79,76 @@ SC.TableHeaderView = SC.View.extend({
     column.addObserver('minWidth',  this, '_scthv_layoutDidChange');
     column.addObserver('sortState', this, '_scthv_sortStateDidChange');
     column.addObserver('tableContent', this, '_scthv_tableContentDidChange');
-    
+
     // var tableContent = column.get('tableContent');
     // var columnContent = this._scthv_columnContentFromTableContent(tableContent);
     // this.set('content', columnContent);
   },
-  
+
   /**
     The sortState of the header view's column.
   */
   sortState: function() {
     return this.get('column').get('sortState');
   }.property(),
-  
+
   mouseDown: function(evt) {
-    var tableView = this.get('tableView');    
+    var tableView = this.get('tableView');
     return tableView ? tableView.mouseDownInTableHeaderView(evt, this) :
      sc_super();
   },
-  
+
   mouseUp: function(evt) {
     var tableView = this.get('tableView');
     return tableView ? tableView.mouseUpInTableHeaderView(evt, this) :
      sc_super();
   },
-  
+
   mouseDragged: function(evt) {
     var tableView = this.get('tableView');
     return tableView ? tableView.mouseDraggedInTableHeaderView(evt, this) :
      sc_super();
   },
-  
+
   _scthv_dragViewForHeader: function() {
     var dragLayer = this.get('layer').cloneNode(true);
     var view = SC.View.create({ layer: dragLayer, parentView: this });
-    
+
     // cleanup weird stuff that might make the drag look out of place
     SC.$(dragLayer).css('backgroundColor', 'transparent')
       .css('border', 'none')
-      .css('top', 0).css('left', 0);      
-    
+      .css('top', 0).css('left', 0);
+
     return view;
   },
-  
+
   _scthv_enterDragMode: function() {
     this.set('isInDragMode', YES);
   },
-  
+
   _scthv_exitDragMode: function() {
     this.set('isInDragMode', NO);
   },
-  
-  // _scthv_hideViewInDragMode: function() {    
+
+  // _scthv_hideViewInDragMode: function() {
   //   var shouldBeVisible = !this.get('isInDragMode'), layer = this.get('layer');
   //   console.log('should be visible: %@'.fmt(!this.get('isInDragMode')));
   //   SC.RunLoop.begin();
   //   SC.$(layer).css('display', shouldBeVisible ? 'block' : 'none');
   //   SC.RunLoop.end();
   // }.observes('isInDragMode'),
-  
+
   // _scthv_setupDragMode: function() {
   //   var isInDragMode = this.get('isInDragMode');
   //   if (isInDragMode) {
-  //     });      
+  //     });
   //   } else {
   //     //
   //   }
-  //   
-  //   
+  //
+  //
   // }.observes('isInDragMode'),
-  
+
   _scthv_dragModeViewDidChange: function() {
     var dragModeView = this.get('dragModeView');
     if (dragModeView && dragModeView.set) {
@@ -166,45 +156,45 @@ SC.TableHeaderView = SC.View.extend({
       dragModeView.set('tableView', this.get('tableView'));
     }
   }.observes('dragModeView'),
-  
+
   _scthv_layoutDidChange: function(sender, key, value, rev) {
     var pv = this.get('parentView');
     pv.invokeOnce(pv.layoutChildViews);
-    
+
     // Tell the container view how tall the header is so that it can adjust
     // itself accordingly.
-    var layout = this.get('layout');    
+    var layout = this.get('layout');
     //this.get('dragModeView').adjust('top', layout.height);
   },
-  
+
   // When our column's tableContent property changes, we need to go back and get our column content
   _scthv_tableContentDidChange: function() {
-    var tableContent = this.get('column').get('tableContent');    
+    var tableContent = this.get('column').get('tableContent');
     var columnContent = this.get('parentView')._scthv_columnContentFromTableContent(tableContent, this.get('columnIndex'));
     this.set('content', columnContent);
   },
-  
+
   _scthv_sortStateDidChange: function() {
     SC.RunLoop.begin();
     var sortState  = this.get('column').get('sortState');
     var classNames = this.get('classNames');
-    
+
     classNames.removeObject('sc-table-header-sort-asc');
     classNames.removeObject('sc-table-header-sort-desc');
     classNames.removeObject('sc-table-header-sort-active');
-    
+
     if (sortState !== null) {
       classNames.push('sc-table-header-sort-active');
     }
-    
+
     if (sortState === SC.SORT_ASCENDING) {
       classNames.push('sc-table-header-sort-asc');
     }
-    
+
     if (sortState === SC.SORT_DESCENDING) {
       classNames.push('sc-table-header-sort-desc');
     }
-    
+
     // TODO: Figure out why it's not enough to simply call
     // `displayDidChange` here.
     this.displayDidChange();

data/lib/frameworks/sproutcore/frameworks/table/views/table_row.js

@@ -5,13 +5,7 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-/** @class
 
-  The default example view for a table row. Belongs to a SC.TableView.
-
-  @extends SC.View
-  @since SproutCore 1.1
-*/
 
 SC.TableRowView = SC.View.extend({
 /** @scope SC.TableRowView.prototype */

data/lib/frameworks/sproutcore/frameworks/template_view/tests/views/template/collection.js

@@ -165,7 +165,9 @@ test("should give its item views the classBinding specified by itemClassBinding"
     template: SC.Handlebars.compile('{{#collection "TemplateTests.itemClassBindingTestCollectionView" itemClassBinding="content.isBaz"}}foo{{/collection}}')
   });
 
-  view.createLayer();
+  SC.run(function () {
+    view.createLayer();
+  });
   equals(view.$('ul li.is-baz').length, 2, "adds class on initial rendering");
 
   SC.run(function() {
@@ -188,7 +190,9 @@ test("should pass item* property when created with a block", function() {
   var view = SC.TemplateView.create({
     template: SC.Handlebars.compile('{{#collection TemplateTests.CollectionTestView itemFoo="bar"}}baz{{/collection}}')
   });
-  view.createLayer();
+  SC.run(function () {
+    view.createLayer();
+  });
 
   var childViews = view.getPath('childViews.firstObject.childViews');
   childViews.forEach(function(childView, index) {
@@ -203,7 +207,9 @@ test("should pass item* property when created without a block", function() {
   var view = SC.TemplateView.create({
     template: SC.Handlebars.compile('{{collection TemplateTests.CollectionTestView itemFoo="bar"}}')
   });
-  view.createLayer();
+  SC.run(function () {
+    view.createLayer();
+  });
 
   var childViews = view.getPath('childViews.firstObject.childViews');
   childViews.forEach(function(childView, index) {
@@ -222,7 +228,9 @@ test("should work inside a bound {{#if}}", function() {
     shouldDisplay: true
   });
 
-  view.createLayer();
+  SC.run(function () {
+    view.createLayer();
+  });
   equals(view.$('ul li').length, 3, "renders collection when conditional is true");
 
   SC.run(function() { view.set('shouldDisplay', NO); });

data/lib/frameworks/sproutcore/frameworks/template_view/views/bindable_span.js

@@ -162,8 +162,8 @@ SC._BindableSpan = SC.TemplateView.extend(
     len = childViews.get('length');
     for (idx = len-1; idx >= 0; idx--){
       childView = childViews[idx];
-      childView.$().remove();
-      childView.removeFromParent();
+      // childView.$().remove();
+      // childView.removeFromParent();
       childView.destroy();
     }
 
@@ -175,6 +175,7 @@ SC._BindableSpan = SC.TemplateView.extend(
     this.$().replaceWith(elem);
     this.set('layer', elem);
     this._rendered();
+    this._callOnChildViews('_parentDidRender');
   }
 });
 

data/lib/frameworks/sproutcore/frameworks/template_view/views/template_collection.js

@@ -46,7 +46,7 @@ SC.TemplateCollectionView = SC.TemplateView.extend(
   */
   init: function() {
     var templateCollectionView = sc_super();
-
+    this._sctcv_contentDidChange();
     return templateCollectionView;
   },
 
@@ -173,6 +173,7 @@ SC.TemplateCollectionView = SC.TemplateView.extend(
     needed.
   */
   _sctcv_contentDidChange: function() {
+
     var oldContent = this._content, oldLen = 0;
     var content = this.get('content'), newLen = 0;
 
@@ -249,7 +250,7 @@ SC.TemplateCollectionView = SC.TemplateView.extend(
       // each item.
       itemOptions = this.get('itemViewOptions') || {};
 
-      // insertAtElement = elem.find('li')[start-1] || null;
+      insertAtElement = elem.find('li')[start-1] || null;
       len = addedObjects.get('length');
 
       // TODO: This logic is duplicated from the view helper. Refactor
@@ -284,8 +285,13 @@ SC.TemplateCollectionView = SC.TemplateView.extend(
           childView.set('context', childView.get(contextProperty));
         }
 
-        // Have to create child views manually.
-        childView.createLayer()._doAttach(elem[0]);
+        itemElem = childView.createLayer().$();
+        if (!insertAtElement) {
+          elem.append(itemElem);
+        } else {
+          itemElem.insertAfter(insertAtElement);
+        }
+        insertAtElement = itemElem;
 
         addedViews.push(childView);
       }
@@ -300,10 +306,7 @@ SC.TemplateCollectionView = SC.TemplateView.extend(
         content: this
       }));
       this.set('emptyView', childView);
-
-      // Have to create child views manually.
-      childView.createLayer()._doAttach(elem[0]);
-
+      childView.createLayer().$().appendTo(elem);
       this.childViews = [childView];
     }
 

data/lib/frameworks/sproutcore/tests/phantomjs_runner.phantomjs

@@ -171,7 +171,6 @@ var urls=[
     {url:'sproutcore/foundation/en/current/tests/mixins/validatable/ui.html'},
     {url:'sproutcore/foundation/en/current/tests/mixins/content_value_support/content.html'},
     {url:'sproutcore/foundation/en/current/tests/mixins/inline_text_field/api.html'},
-    {url:'sproutcore/foundation/en/current/tests/mixins/inline_text_field/beginEditing.html'},
     {url:'sproutcore/foundation/en/current/tests/mixins/content_display.html'},
     {url:'sproutcore/foundation/en/current/tests/controllers/tree/selection_support.html'},
     {url:'sproutcore/foundation/en/current/tests/controllers/tree/outline_case.html'},

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sproutcore
 version: !ruby/object:Gem::Version
-  version: 1.10.0.rc.2
+  version: 1.10.0.rc.3
 platform: ruby
 authors:
 - Strobe, Inc., Apple Inc. and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -1275,6 +1275,7 @@ files:
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/isVisibleInWindow.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/keyboard.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/layer.js
+- lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/layout.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/layoutChildViews.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/layoutDidChange.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/layoutStyle.js
@@ -1858,7 +1859,6 @@ files:
 - lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_editor/commitEditing.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_editor/discardEditing.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_text_field/api.js
-- lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_text_field/beginEditing.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/staticLayout.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/validatable/ui.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/private/tree_item_observer/flat_case.js

data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_text_field/beginEditing.js

@@ -1,235 +0,0 @@
-// ==========================================================================
-// Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            portions copyright @2011 Apple Inc.
-// License:   Licensed under MIT license (see license.js)
-// ==========================================================================
-/*global module test htmlbody ok equals same stop start Q$ */
-
-var pane, optionsForLabel1, optionsForLabel2, delegate, optionsForLabelFromView;
-
-pane = SC.ControlTestPane.design().add("label1", SC.LabelView, {
-  value: 'Some Text',
-  notifiedWillBegin: NO,
-  notifiedDidBegin: NO,
-
-  inlineEditorShouldBeginEditing: function(inlineEditor) {
-    return YES;
-  },
-
-  inlineEditorWillBeginEditing: function(inlineEditor) {
-    this.set('notifiedWillBegin', YES);
-
-    // The inline editor is the last view appended to the parent
-    var parentView = this.get('parentView'),
-      length = parentView.childViews.length,
-      editor = parentView.childViews[length - 1];
-
-    ok(!editor.get('isFirstResponder'), "should not be first responder yet");
-
-    sc_super();
-  },
-
-  inlineEditorDidBeginEditing: function(inlineEditor) {
-    this.set('notifiedDidBegin', YES);
-
-    // The inline editor is the last view appended to the parent
-    var parentView = this.get('parentView'),
-      length = parentView.childViews.length,
-      editor = parentView.childViews[length - 1];
-
-    ok(editor.get('isFirstResponder'), "should be first responder now");
-
-    sc_super();
-  }
-}).add("label2", SC.LabelView, {
-  value: 'Can\'t Touch This',
-
-  inlineEditorShouldBeginEditing: function(inlineEditor) {
-    return NO;
-  }
-});
-
-pane.resetView = function(view) {
-  view.set('notifiedWillBegin', NO);
-  view.set('notifiedDidBegin', NO);
-};
-
-
-optionsForLabelFromView = function(view) {
-  var el = view.$(),
-  f = SC.offset(el[0]),
-  frameTemp = view.convertFrameFromView(view.get('frame'), null);
-
-  f.width = frameTemp.width;
-  f.height = frameTemp.height;
-
-  var optionsForLabel = {
-    frame: f,
-    delegate: view,
-    exampleElement: view.$(),
-    value: view.get('value'),
-    multiline: view.get('isInlineEditorMultiline'),
-    validator: view.get('validator'),
-    exampleInlineTextFieldView: view.get('exampleInlineTextFieldView')
-  };
-
-  return optionsForLabel;
-};
-
-
-/**
-
-*/
-module("Test the beginEditing() function of SC.InlineTextFieldView", {
-  setup: function() {
-
-    pane.standardSetup().setup();
-
-    var view1 = pane.view('label1'),
-    view2 = pane.view("label2");
-
-    // Reset view1 delegate functions
-    pane.resetView(view1);
-
-    optionsForLabel1 = optionsForLabelFromView(view1);
-    optionsForLabel2 = optionsForLabelFromView(view2);
-  },
-
-  teardown: function() {
-    optionsForLabel1 = optionsForLabel2 = null;
-    SC.InlineTextFieldView.discardEditing();
-    pane.standardSetup().teardown();
-
-  }
-});
-
-test("fails when required options are missing",
-function() {
-  try {
-    optionsForLabel1["frame"] = null;
-    ok(SC.InlineTextFieldView.beginEditing(optionsForLabel1) === NO, "should fail if frame missing");
-  } catch(e1) {
-    ok(YES, "should fail if frame missing: %@".fmt(e1));
-  }
-
-  try {
-    optionsForLabel1["delegate"] = null;
-    ok(SC.InlineTextFieldView.beginEditing(optionsForLabel1) === NO, "should fail if delegate missing");
-  } catch(e2) {
-    ok(YES, "should fail if delegate missing: %@".fmt(e2));
-  }
-
-  try {
-    optionsForLabel1["exampleElement"] = null;
-    ok(SC.InlineTextFieldView.beginEditing(optionsForLabel1) === NO, "should fail if exampleElement missing");
-  } catch(e3) {
-    ok(YES, "should fail if exampleElement missing: %@".fmt(e3));
-  }
-});
-
-test("value of inline editor same as label",
-function() {
-
-  SC.RunLoop.begin();
-  SC.InlineTextFieldView.beginEditing(optionsForLabel1);
-  SC.RunLoop.end();
-
-  // The inline editor is the last view appended to the parent
-  var view = pane.view('label1'),
-    parentView = view.get('parentView'),
-    length = parentView.childViews.length,
-    editor = parentView.childViews[length - 1];
-
-  equals(editor.get('value'), view.get('value'), "editor should have the same initial value as its label");
-});
-
-test("use input element when options.multiline is set to NO",
-function() {
-  SC.RunLoop.begin();
-  SC.InlineTextFieldView.beginEditing(optionsForLabel1);
-  SC.RunLoop.end();
-
-  // The inline editor is the last view appended to the parent
-  var view = pane.view('label1'),
-    parentView = view.get('parentView'),
-    length = parentView.childViews.length,
-    editor = parentView.childViews[length - 1];
-
-  ok(editor.$("input").length > 0, "should be using an input element");
-});
-
-test("use textarea element when options.multiline is set to YES",
-function() {
-  optionsForLabel1["multiline"] = YES;
-
-  SC.RunLoop.begin();
-  SC.InlineTextFieldView.beginEditing(optionsForLabel1);
-  SC.RunLoop.end();
-
-  // The inline editor is the last view appended to the parent
-  var view = pane.view('label1'),
-    parentView = view.get('parentView'),
-    length = parentView.childViews.length,
-    editor = parentView.childViews[length - 1];
-
-  ok(editor.$("textarea").length > 0, "should be using a textarea element");
-});
-/* TODO: move these to inlineEditorDelegate tests
-test("inline editor aborts if delegate returns NO to inlineEditorShouldBeginEditing()",
-function() {
-  SC.InlineTextFieldView.beginEditing(optionsForLabel2);
-
-  // The inline editor is the last view appended to the pane
-  var length = pane._pane.childViews.length,
-  editor = pane._pane.childViews[length - 1];
-
-  ok(!editor.get('isEditing'), "editor should have isEditing set to NO");
-});
-
-test("inline editor notifies delegate with inlineEditorWillBeginEditing() before becoming responder",
-function() {
-  var view1 = pane.view('label1');
-
-  SC.RunLoop.begin();
-  ok(!view1.get('notifiedWillBegin'), "the delegate should not have been notified of begin editing at this point");
-  SC.InlineTextFieldView.beginEditing(optionsForLabel1);
-  ok(view1.get('notifiedWillBegin'), "the delegate should have been notified of begin editing at this point");
-  SC.RunLoop.end();
-});
-*/
-test("inline editor notifies delegate with inlineEditorDidBeginEditing() after becoming responder",
-function() {
-  var view1 = pane.view('label1');
-
-  // Start a run loop because the notification isn't invoked until the beginning of the next run loop
-  SC.RunLoop.begin();
-
-  ok(!view1.get('notifiedDidBegin'), "the delegate should not have been notified of begin editing at this point");
-  SC.InlineTextFieldView.beginEditing(optionsForLabel1);
-  SC.RunLoop.end();
-
-  ok(view1.get('notifiedDidBegin'), "the delegate should have been notified of begin editing at this point");
-});
-
-test("inline editor does not display the defaultValue if the label's value is the number 0",
-function() {
-  var view1 = pane.view('label1');
-  view1.set('value', 0);
-  optionsForLabel1 = optionsForLabelFromView(view1);
-
-  SC.RunLoop.begin();
-  SC.InlineTextFieldView.beginEditing(optionsForLabel1);
-  SC.RunLoop.end();
-
-  // The inline editor is the last view appended to the parent
-  var view = pane.view('label1'),
-    parentView = view.get('parentView'),
-    length = parentView.childViews.length,
-    editor = parentView.childViews[length - 1];
-
-  same(editor.get('value'), 0, "editor should have number 0 as value");
-  editor.blurEditor();
-
-  same(view1.get('value'), 0, "view should still have number 0 as value");
-});