sproutcore 1.9.2 → 1.10.0.rc.1

data/lib/frameworks/sproutcore/frameworks/statechart/tests/statechart/respond_to_event.js

@@ -398,4 +398,20 @@ test("try to perform 'yellow' on statechart -- current states X and Y", function
   ok(!stateY.get('handledEvent'), 'state Y did not handle event yellow');
   ok(!stateZ.get('handledEvent'), 'state Z did not handle event yellow');
   ok(!root.get('handledEvent'), 'root not did handle event yellow');
-});
+});
+
+test("Check destroyed statechart does not respond to events", function() {
+  ok(statechart.respondsTo('foo'), 'statechart should respond to foo before destroyed');
+  ok(statechart.respondsTo('eventA'), 'statechart should respond to eventA before destroyed');
+  ok(statechart.respondsTo('eventB'), 'statechart should respond to eventB before destroyed');
+  ok(!statechart.respondsTo('foox'), 'statechart should not respond to foox before destroyed');
+  ok(!statechart.respondsTo('eventC'), 'statechart should not respond to eventC before destroyed');
+
+  statechart.destroy();
+
+  ok(!statechart.respondsTo('foo'), 'statechart should not respond to foo after destroyed');
+  ok(!statechart.respondsTo('eventA'), 'statechart should not respond to eventA after destroyed');
+  ok(!statechart.respondsTo('eventB'), 'statechart should not respond to eventB after destroyed');
+  ok(!statechart.respondsTo('foox'), 'statechart should not respond to foox after destroyed');
+  ok(!statechart.respondsTo('eventC'), 'statechart should not respond to eventC after destroyed');
+});

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

@@ -12,43 +12,43 @@ sc_require('views/table_header');
 
   The head of a `SC.TableView`. It's a special row of the table that holds
   the column header cells.
-  
+
   @extends SC.View
   @since SproutCore 1.1
 */
-SC.TableHeadView = SC.View.extend({  
+SC.TableHeadView = SC.View.extend({
 /** @scope SC.TableHeadView.prototype */
-  
+
   layout: { height: 18, left: 0, right: 0, top: 0 },
 
   classNames: ['sc-table-head'],
 
   cells: [],
-  
+
   acceptsFirstResponder: YES,
 
   dragOrder: null,
-  
+
   init: function() {
     sc_super();
     this._scthv_handleChildren();
   },
-    
+
   columns: function() {
     return this.get('parentView').get('columns');
-  }.property(),  
-  
+  }.property(),
+
   renderChildViews: function(context, firstTime) {
     var cells = this.get('cells'), cell, idx;
     for (idx = 0; idx < cells.get('length'); idx++) {
       cell = cells.objectAt(idx);
       context = context.begin(cell.get('tagName'));
-      cell.prepareContext(context, firstTime);
+      cell.render(context, firstTime);
       context = context.end();
     }
     return context;
   },
-  
+
   layoutChildViews: function() {
     var cells = this.get('cells'), cell, idx;
     for (idx = 0; idx < cells.get('length'); idx++) {
@@ -58,77 +58,77 @@ SC.TableHeadView = SC.View.extend({
     }
   },
 
-  
+
   // ..........................................................
   // INTERNAL SUPPORT
   //
-  
+
   _scthv_enterDragMode: function() {
     var order = [], columns = this.get('columns'), idx;
-    
+
     for (idx = 0; idx < columns.get('length'); idx++) {
       order.push(columns.objectAt(idx).get('key'));
     }
-    
+
     this.set('dragOrder', order);
   },
-  
+
   _scthv_changeDragOrder: function(draggedColumnIndex, leftOfIndex) {
     var dragOrder = this.get('dragOrder'),
      draggedColumn = dragOrder.objectAt(draggedColumnIndex);
-    
+
     dragOrder.removeAt(idx);
     dragOrder.insertAt(leftOfIndex, draggedColumn);
   },
-  
+
   _scthv_reorderDragColumnViews: function() {
-    
+
   }.observes('dragOrder'),
-  
-  
+
+
   _scthv_columnContentFromTableContent: function(tableContent, columnIndex) {
     var column = this.get('columns').objectAt(columnIndex),
         key = column.get('key'),
         ret = [],
         idx;
-        
+
     if (!tableContent) return ret;
-        
+
     var tableView = this.get('parentView'),
         length = tableContent.get('length');
         // visibleIndexes = tableView.contentIndexesInRect(
         //     tableView.get('frame')).toArray();
-            
+
     for (idx = 0; idx < length; idx++) {
       //visibleIndex = visibleIndexes.objectAt(idx);
       ret.push(tableContent.objectAt(idx).get(key));
     }
-    
+
     return ret;
   },
-  
+
   _scthv_layoutForHeaderAtColumnIndex: function(index) {
     var columns = this.get('columns'),
         rowHeight = this.get('parentView').get('rowHeight'),
         layout = {},
         left = 0, idx;
-        
+
     for (idx = 0; idx < index; idx++) {
       left += columns.objectAt(idx).get('width');
     }
-    
+
     return {
       left:   left,
       width:  columns.objectAt(index).get('width'),
       height: rowHeight
     };
   },
-  
+
   _scthv_handleChildren: function() {
     var columns = this.get('columns');
     var tableView = this.get('parentView');
     var tableContent = tableView.get('content');
-    
+
     var column, key, label, content, cells = [], cell, idx;
     for (idx = 0; idx < columns.get('length'); idx++) {
       column = columns.objectAt(idx);
@@ -142,7 +142,7 @@ SC.TableHeadView = SC.View.extend({
     if (cells.length > 0)
       this.replaceAllChildren(cells);
   },
-  
+
   _scthv_createTableHeader: function(column, label, content, idx) {
     var tableView = this.get('parentView');
     var cell = SC.TableHeaderView.create({

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

@@ -6,7 +6,7 @@
 // ==========================================================================
 
 /** @class
-  
+
   The default example view for a table row. Belongs to a SC.TableView.
 
   @extends SC.View
@@ -14,114 +14,114 @@
 */
 
 SC.TableRowView = SC.View.extend({
-/** @scope SC.TableRowView.prototype */ 
+/** @scope SC.TableRowView.prototype */
 
   //layout: { height: 18, left: 0, right: 0, top: 0 },
-  
+
   // ..........................................................
   // PROPERTIES
   //
-  
+
   classNames: ['sc-table-row'],
-  
+
   cells: [],
 
   acceptsFirstResponder: YES,
-  
+
   /**
     A reference to the row's encompassing TableView.
-    
+
     @property
     @type SC.TableView
   */
   tableView: null,
-  
+
   // ..........................................................
   // METHODS
-  // 
-  
+  //
+
   init: function() {
     sc_super();
     this._sctrv_handleChildren();
   },
-  
+
   /**
     A collection of `SC.TableColumn` objects.
-    
+
     @property
     @type Array
   */
   columns: function() {
     return this.get('tableView').get('columns');
   }.property(),
-  
-  prepareContext: function(context, firstTime) {
+
+  render: function(context, firstTime) {
     sc_super();
     context.setClass('sel', this.get('isSelected'));
   },
-  
+
   render: function(context, firstTime) {
     var classArray = [];
-    
+
     classArray.push((this.get('contentIndex')%2 === 0) ? 'even' : 'odd');
     context.addClass(classArray);
-    
+
     sc_super();
   },
-  
+
   renderChildViews: function(context, firstTime) {
     var cells = this.get('cells'), cell, idx;
     for (idx = 0; idx < cells.get('length'); idx++) {
       cell = cells.objectAt(idx);
       context = context.begin(cell.get('tagName'));
-      cell.prepareContext(context, firstTime);
+      cell.render(context, firstTime);
       context = context.end();
     }
     return context;
   },
-  
+
   layoutChildViews: function() {
     var cells = this.get('cells'), columns = this.get('columns'),
         cell, column, idx;
     var left = 0, width, rowHeight = this.get('tableView').get('rowHeight');
-    
+
     for (idx = 0; idx < cells.get('length'); idx++) {
       cell = cells.objectAt(idx);
       column = columns.objectAt(idx);
       width = column.get('width');
-      
+
       cell.adjust({
         left: left,
         width: width,
         height: rowHeight
       });
-      
+
       left += width;
       cell.updateLayout();
     }
   },
-  
+
   // ..........................................................
   // INTERNAL SUPPORT
-  // 
-  
+  //
+
   _sctrv_layoutForChildAtColumnIndex: function(index) {
     var columns = this.get('columns'),
         rowHeight = this.get('tableView').get('rowHeight'),
         layout = {},
         left = 0, idx;
-        
+
     for (idx = 0; idx < index; idx++) {
       left += columns.objectAt(idx).get('width');
     }
-    
+
     return {
       left:   left,
       width:  columns.objectAt(index).get('width'),
       height: rowHeight
     };
-  },  
-  
+  },
+
   _sctrv_createTableCell: function(column, value) {
     var cell = SC.TableCellView.create({
       column:  column,
@@ -129,15 +129,15 @@ SC.TableRowView = SC.View.extend({
     });
     return cell;
   },
-  
+
   // The row needs to redraw when the selection state changes.
   _sctrv_handleSelection: function() {
     this.displayDidChange();
   }.observes('isSelected'),
-  
+
   _sctrv_handleChildren: function() {
     var content = this.get('content'), columns = this.get('columns');
-    
+
     this.removeAllChildren();
     var column, key, value, cells = [], cell, idx;
     for (idx = 0; idx < columns.get('length'); idx++) {
@@ -148,7 +148,7 @@ SC.TableRowView = SC.View.extend({
       cells.push(cell);
       this.appendChild(cell);
     }
-    
+
     this.set('cells', cells);
   }
 });

data/lib/frameworks/sproutcore/frameworks/template_view/ext/handlebars/bind.js

@@ -104,7 +104,7 @@ sc_require('ext/handlebars');
         }
       } );
     } else {
-      throw "Cannot use boundIf helper without a block.";
+      throw new Error("Cannot use boundIf helper without a block.");
     }
   });
 })();

data/lib/frameworks/sproutcore/frameworks/template_view/ext/handlebars/collection.js

@@ -14,9 +14,9 @@ Handlebars.registerHelper('collection', function(path, options) {
 
   // @if (debug)
   if (!collectionClass) {
-    throw "%@ #collection: Could not find %@".fmt(data.view, path);
+    throw new Error("%@ #collection: Could not find %@".fmt(data.view, path));
   } else if (!SC.kindOf(collectionClass, SC.TemplateCollectionView)) {
-    throw "You must use a subclass of SC.TemplateCollectionView when using the #collection Handlebars helper";
+    throw new Error("You must use a subclass of SC.TemplateCollectionView when using the #collection Handlebars helper");
   }
   // @endif
 

data/lib/frameworks/sproutcore/frameworks/template_view/ext/handlebars/view.js

@@ -12,7 +12,7 @@ SC.Handlebars.ViewHelper = SC.Object.create({
     if (path.isClass || path.isObject) {
       newView = path;
       if (!newView) {
-        throw "Null or undefined object was passed to the #view helper. Did you mean to pass a property path string?";
+        throw new Error("Null or undefined object was passed to the #view helper. Did you mean to pass a property path string?");
       }
     } else {
       // Path is relative, look it up with this view as the root
@@ -25,7 +25,7 @@ SC.Handlebars.ViewHelper = SC.Object.create({
           newView = SC.getPath(path);
         }
       }
-      if (!newView) { throw "Unable to find view at path '" + path + "'"; }
+      if (!newView) { throw new Error("Unable to find view at path '" + path + "'"); }
     }
 
     if (hash.id) { hash.layerId = hash.id; }
@@ -53,7 +53,6 @@ SC.Handlebars.ViewHelper = SC.Object.create({
     // Set the template of the view to the passed block if we got one
     if (fn) { childView.template = fn; }
 
-
     childViews.pushObject(childView);
 
     var context = SC.RenderContext(childView.get('tagName'));
@@ -61,9 +60,8 @@ SC.Handlebars.ViewHelper = SC.Object.create({
     // Add id and class names passed to view helper
     this.applyAttributes(contextOptions, childView, context);
 
-    childView.applyAttributesToContext(context);
     // tomdale wants to make SproutCore slow
-    childView.render(context, YES);
+    childView.renderToContext(context);
 
     return new Handlebars.SafeString(context.join());
   },

data/lib/frameworks/sproutcore/frameworks/template_view/tests/panes/template.js

@@ -16,6 +16,7 @@ test("Template panes append a main pane to the document body", function() {
   equals(pane.$('#template-panes-are-so-cool').length, 1, "creates a view with the passed id");
 
   pane.remove();
+  pane.destroy();
 });
 
 test("Template panes should be awoken", function(){
@@ -32,4 +33,5 @@ test("Template panes should be awoken", function(){
   SC.MainPane.prototype.awake = originalAwake;
 
   ok(didAwake, "should have awoken the pane");
+  pane.destroy();
 });

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

@@ -79,7 +79,7 @@ test("should add a 'sc-hidden' class to a template view when isVisible is true",
 
   view.set('template', function() { return "foo"; });
 
-  view.createLayer();
+  view.createLayer()._doAttach(document.body);
   ok(!view.$().hasClass('sc-hidden'), "does not have hidden class applied");
 
   SC.run(function() { view.set('isVisible', NO); });
@@ -98,7 +98,7 @@ test("should add a 'sc-hidden' class to template views if isVisible is false bef
 
   view.set('template', function() { return "foo"; });
 
-  view.createLayer();
+  view.createLayer()._doAttach(document.body);
   ok(view.$().hasClass('sc-hidden'), "adds hidden class when rendering");
   $(document.body).append(view.$());
   ok(!view.$().is(':visible'), "should be hidden when hidden class is added");