sproutcore 0.9.11 → 0.9.12

data/frameworks/sproutcore/tests/models/model.rhtml

@@ -0,0 +1,360 @@
+<% # ========================================================================
+   # Model Unit Test
+   # ========================================================================
+%>
+<% content_for('final') do %>
+
+<script>
+
+//
+//  core.js stub
+//
+ModelTest = SC.Object.create({
+
+  server: SC.Server.create({ prefix: ['ModelTest'] }),
+
+  FIXTURES: []
+  
+}) ;
+
+//
+//  fixtures stub
+//
+ModelTest.FIXTURES = ModelTest.FIXTURES.concat([
+  
+  { guid: 1, 
+    type: 'Todo', 
+    name: "Something to do",
+    todoList: 1 // the guid of the todo list object this todo is related to
+  },
+
+  { guid: 2, 
+    type: 'Todo', 
+    name: "Something else to do",
+    todoList: 1
+  },
+
+  { guid: 3, 
+    type: 'Todo', 
+    name: "Gee, I'm busy.",
+    todoList: 2
+  }
+
+]);
+
+ModelTest.FIXTURES = ModelTest.FIXTURES.concat([
+  
+  { guid: 1,
+    type: 'TodoList', 
+    name: "My List"
+  },
+
+  { guid: 2,
+    type: 'TodoList', 
+    name: "My List 2"
+  }
+  
+]);
+
+//
+// model classes
+//
+ModelTest.Todo = SC.Record.extend({
+  
+  todoListType: 'ModelTest.TodoList'
+  
+}) ;
+
+ModelTest.TodoList = SC.Record.extend({
+  
+  todos: SC.Record.hasMany('ModelTest.Todo', 'todoList')
+  
+}) ;
+
+//
+// main.js stub
+//
+ModelTest.server.preload(ModelTest.FIXTURES) ;
+
+Test.context("Test model comparisons with numeric guids", {
+  
+  setup: function()
+  {
+    this.todoList1 = ModelTest.TodoList.find(1);
+    this.todoList2 = ModelTest.TodoList.find(2);
+    this.todo1 = ModelTest.Todo.find(1);
+    this.todo2 = ModelTest.Todo.find(2);
+    this.todo3 = ModelTest.Todo.find(3);
+  },
+  
+  teardown: function()
+  {
+    delete this.todoList;
+    delete this.todo1;
+    delete this.todo2;
+  },
+
+  "Objects should exist in Store": function()
+  {
+    assertNotNull(this.todoList1);
+    assertNotNull(this.todoList2);
+    assertNotNull(this.todo1);
+    assertNotNull(this.todo2);
+    assertNotNull(this.todo3);
+  },
+  
+  "Todo 1 and 2 should be related to TodoList 1": function()
+  {
+    assertIdentical(this.todoList1, this.todo1.get('todoList'));
+    assertIdentical(this.todoList1, this.todo2.get('todoList'));
+  },
+
+  "Todo 3 should not be related to TodoList 1": function()
+  {
+    assertNotIdentical(this.todoList1, this.todo3.get('todoList'));
+  },
+
+  "Todo 3 should be related to TodoList 2": function()
+  {
+    assertIdentical(this.todoList2, this.todo3.get('todoList'));
+  },
+
+  "Todo 1 and 2 should not be related to TodoList 2": function()
+  {
+    assertNotIdentical(this.todoList2, this.todo1.get('todoList'));
+    assertNotIdentical(this.todoList2, this.todo2.get('todoList'));
+  },
+  
+  "TodoList 1 should be related to Todo 1 and 2": function()
+  {
+    var records = this.todoList1.get('todos').get('records');
+    var todosWeWanted = SC.Set.create([this.todo1, this.todo2]);
+    var todosWeGot = SC.Set.create();
+    var loc = records.length;
+    
+    while(--loc >= 0) {
+      var obj = records[loc];
+      
+      assert( todosWeGot.add(obj), "should be no duplicates" );
+      assert( todosWeWanted.contains(obj), "should be in set of objects we're expecting to get" ); 
+    }
+  },
+
+  "TodoList 2 should be related to Todo 3": function()
+  {
+    var records = this.todoList2.get('todos').get('records');
+    var todosWeWanted = SC.Set.create([this.todo3]);
+    var todosWeGot = SC.Set.create();
+    var loc = records.length;
+    
+    while(--loc >= 0) {
+      var obj = records[loc];
+      
+      assert( todosWeGot.add(obj), "should be no duplicates" );
+      assert( todosWeWanted.contains(obj), "should be in set of objects we're expecting to get" ); 
+    }
+  },
+
+  "Todos should be collectable using guids": function()
+  {
+    var c = SC.Collection.create({ recordType: ModelTest.Todo, conditions: { todoList: 1 } });
+    c.refresh();
+    var records = c.records();
+    var todosWeWanted = SC.Set.create([this.todo1, this.todo2]);
+    var todosWeGot = SC.Set.create();
+    var loc = records.length;
+    
+    while(--loc >= 0) {
+      var obj = records[loc];
+      
+      assert( todosWeGot.add(obj), "should be no duplicates" );
+      assert( todosWeWanted.contains(obj), "should be in set of objects we're expecting to get" ); 
+    }
+  },
+
+  "toString() should show model class name": function()
+  {
+    var re = /^ModelTest.Todo/;
+    assert( this.todo1.toString().match(re), "Todo 1 toString() should start with ModelTest.Todo" );
+  }
+
+});
+
+</script>
+
+<script>
+
+//
+//  core.js stub
+//
+ModelTest2 = SC.Object.create({
+
+  server: SC.Server.create({ prefix: ['ModelTest2'] }),
+
+  FIXTURES: []
+  
+}) ;
+
+//
+//  fixtures stub
+//
+ModelTest2.FIXTURES = ModelTest2.FIXTURES.concat([
+  
+  { guid: '1', 
+    type: 'Todo', 
+    name: "Something to do",
+    todoList: '1' // the guid of the todo list object this todo is related to
+  },
+
+  { guid: '2', 
+    type: 'Todo', 
+    name: "Something else to do",
+    todoList: '1'
+  },
+
+  { guid: '3', 
+    type: 'Todo', 
+    name: "Gee, I'm busy.",
+    todoList: '2'
+  }
+
+]);
+
+ModelTest2.FIXTURES = ModelTest2.FIXTURES.concat([
+  
+  { guid: '1',
+    type: 'TodoList', 
+    name: "My List"
+  },
+
+  { guid: '2',
+    type: 'TodoList', 
+    name: "My List 2"
+  }
+  
+]);
+
+//
+// model classes
+//
+ModelTest2.Todo = SC.Record.extend({
+  
+  todoListType: 'ModelTest2.TodoList'
+  
+}) ;
+
+ModelTest2.TodoList = SC.Record.extend({
+  
+  todos: SC.Record.hasMany('ModelTest2.Todo', 'todoList')
+  
+}) ;
+
+//
+// main.js stub
+//
+ModelTest2.server.preload(ModelTest2.FIXTURES) ;
+
+Test.context("Test model comparisons with string guids", {
+  
+  setup: function()
+  {
+    this.todoList1 = ModelTest2.TodoList.find(1);
+    this.todoList2 = ModelTest2.TodoList.find(2);
+    this.todo1 = ModelTest2.Todo.find(1);
+    this.todo2 = ModelTest2.Todo.find(2);
+    this.todo3 = ModelTest2.Todo.find(3);
+  },
+  
+  teardown: function()
+  {
+    delete this.todoList;
+    delete this.todo1;
+    delete this.todo2;
+  },
+
+  "Objects should exist in Store": function()
+  {
+    assertNotNull(this.todoList1);
+    assertNotNull(this.todoList2);
+    assertNotNull(this.todo1);
+    assertNotNull(this.todo2);
+    assertNotNull(this.todo3);
+  },
+  
+  "Todo 1 and 2 should be related to TodoList 1": function()
+  {
+    assertIdentical(this.todoList1, this.todo1.get('todoList'));
+    assertIdentical(this.todoList1, this.todo2.get('todoList'));
+  },
+
+  "Todo 3 should not be related to TodoList 1": function()
+  {
+    assertNotIdentical(this.todoList1, this.todo3.get('todoList'));
+  },
+
+  "Todo 3 should be related to TodoList 2": function()
+  {
+    assertIdentical(this.todoList2, this.todo3.get('todoList'));
+  },
+
+  "Todo 1 and 2 should not be related to TodoList 2": function()
+  {
+    assertNotIdentical(this.todoList2, this.todo1.get('todoList'));
+    assertNotIdentical(this.todoList2, this.todo2.get('todoList'));
+  },
+  
+  "TodoList 1 should be related to Todo 1 and 2": function()
+  {
+    var records = this.todoList1.get('todos').get('records');
+    var todosWeWanted = SC.Set.create([this.todo1, this.todo2]);
+    var todosWeGot = SC.Set.create();
+    var loc = records.length;
+    
+    // assert( todosWeWanted.contains(this.todo1), "verify SC.Set works properly" );
+    // assert( todosWeWanted.contains(this.todo2), "verify SC.Set works properly" );
+    
+    while(--loc >= 0) {
+      var obj = records[loc];
+      
+      assert( todosWeGot.add(obj), "should be no duplicates" );
+      assert( todosWeWanted.contains(obj), "should be in set of objects we're expecting to get" ); 
+    }
+  },
+
+  "TodoList 2 should be related to Todo 3": function()
+  {
+    var records = this.todoList2.get('todos').get('records');
+    var todosWeWanted = SC.Set.create([this.todo3]);
+    var todosWeGot = SC.Set.create();
+    var loc = records.length;
+    
+    while(--loc >= 0) {
+      var obj = records[loc];
+      
+      assert( todosWeGot.add(obj), "should be no duplicates" );
+      assert( todosWeWanted.contains(obj), "should be in set of objects we're expecting to get" ); 
+    }
+  },
+
+  "Todos should be collectable using guids": function()
+  {
+    var c = SC.Collection.create({ recordType: ModelTest2.Todo, conditions: { todoList: '1' } });
+    c.refresh();
+    var records = c.records();
+    var todosWeWanted = SC.Set.create([this.todo1, this.todo2]);
+    var todosWeGot = SC.Set.create();
+    var loc = records.length;
+
+    while(--loc >= 0) {
+      var obj = records[loc];
+
+      assert( todosWeGot.add(obj), "should be no duplicates" );
+      assert( todosWeWanted.contains(obj), "should be in set of objects we're expecting to get" ); 
+    }
+  }
+
+});
+
+</script>
+
+<% end %>

data/frameworks/sproutcore/views/button/button.js

@@ -367,19 +367,40 @@ SC.ButtonView = SC.View.extend(SC.Control,
       
   }.observes('isDefault', 'isCancel'),
     
+    
+  isMouseDown: false, 
+    
   // on mouse down, set active only if enabled.  
   /** @private */
   mouseDown: function(evt) {
     this.setClassName('active',this.get('isEnabled')) ;
+    this._isMouseDown = true;
     return true ;
   },
   
+  // remove the active class on mouse down as well
+  /** @private */
+  
+  mouseOut: function(evt)
+  {
+    this.setClassName('active', false);
+    return true;
+  },
+  
+  // add the active class name if the mouse is down
+  // this covers a scenario where the user drags out and back on to a button
+  mouseOver: function(evt)
+  {
+    this.setClassName('active', this._isMouseDown) ;
+    return true;
+  },
+  
   // on mouse up, trigger the action only if we are enabled and the mouse
   // was released inside the view.
   /** @private */
   mouseUp: function(evt) {
     this.setClassName('active', false) ;
-    
+    this._isMouseDown = false;
     var tgt = Event.element(evt) ;
     var inside = false ;
     while(tgt && (tgt != this.rootElement)) tgt = tgt.parentNode;

data/frameworks/sproutcore/views/collection/collection.js

@@ -634,7 +634,6 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate,
     
   */
   updateChildren: function(fullUpdate) {
-
     var f ;
 
     // if the collection is not presently visible in the window, then there is 
@@ -670,6 +669,11 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate,
     // later but the frame has not actually changed, we don't want to run
     // updateChildren again.
     var clippingFrame = this._lastClippingFrame = this.get('clippingFrame') ;
+	
+	// this is a workaround for the clippingFrame bug in ie7 clippingFrame is always returning dimensions 0,0
+	if(clippingFrame.width==0 && clippingFrame.height==0){
+		clippingFrame = this._lastClippingFrame = f;
+	}
     
     // STEP 2: Calculate the new range of content to display in 
     // the clipping frame.  Determine if we need to do a full update or
@@ -1476,7 +1480,7 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate,
       var content = Array.from(this.get('content')) ;
       var contentIndex = content.indexOf(record) ;
       var groupBy = this.get('groupBy');
-      itemView = this._insertItemViewFor(itemView, groupBy, contentIndex); 
+      itemView = this._insertItemViewFor(record, groupBy, contentIndex); 
     }
     if (itemView) this.scrollToItemView(itemView);
   },

data/frameworks/sproutcore/views/collection/list.js

@@ -4,6 +4,7 @@
 
 require('views/collection/collection') ;
 require('views/label');
+require('views/list_item') ;
 
 /** @class
 

data/frameworks/sproutcore/views/collection/source_list.js

@@ -5,6 +5,7 @@
 require('views/collection/collection') ;
 require('views/button/disclosure');
 require('views/source_list_group');
+require('views/list_item') ;
 
 SC.BENCHMARK_SOURCE_LIST_VIEW = NO ;
 

data/frameworks/sproutcore/views/field/text_field.js

@@ -192,8 +192,17 @@ SC.TextFieldView = SC.FieldView.extend(SC.Editable,
   _focusOnVisible: function() {
     if (this.get('isVisibleInWindow') && this._isFocused) {
       this.rootElement.focus() ;
-      this.rootElement.select.bind(this.rootElement).delay(0.05);
-    }  
+      
+      if(SC.isIE()){
+        var selector = function() {
+          Element.select(arguments.callee.it);
+        };
+        selector.it = this.rootElement;
+        setTimeout(selector,0.05);
+      } else{
+        this.rootElement.select.bind(this.rootElement).delay(0.05);  
+      }
+    }
   }.observes('isVisibleInWindow'),
   
   // THESE ARE DUMMY IMPLEMENTATIONS OF THE REPONDER METHODS FOR KEYBOARD

data/frameworks/sproutcore/views/inline_text_field.js

@@ -6,6 +6,7 @@
 require('views/view') ;
 require('mixins/delegate_support') ;
 require('views/field/text_field') ;
+require('views/field/textarea_field') ;
 require('mixins/inline_editor_delegate');
 
 /**
@@ -289,7 +290,7 @@ SC.InlineTextFieldView = SC.View.extend(SC.DelegateSupport, SC.InlineEditorDeleg
   /** 
     The actual text field view used for editing.
   */
-  field: SC.TextFieldView.extend({
+  field: SC.TextareaFieldView.extend({
 
     // handle mouseDown event if we are currently editing so that events
     // don't go any further?
@@ -331,7 +332,7 @@ SC.InlineTextFieldView = SC.View.extend(SC.DelegateSupport, SC.InlineEditorDeleg
     // then allow the newine to proceed.  Otherwise, try to commit the 
     // edit.
     insertNewline: function(evt) { 
-      if (this.owner_multiline) {
+      if (this.owner._multiline) {
         return arguments.callee.base.call(this, evt) ;
       } else {
         this.owner.commitEditing() ;

data/frameworks/sproutcore/views/menu_item.js

@@ -76,6 +76,7 @@ SC.MenuItemView = SC.ButtonView.extend({
   mouseOut: function(evt)
   {
     this.set('isDefault', false);
+    this.setClassName('active', false);
   },
   
   mouseUp: function(evt)

data/frameworks/sproutcore/views/pagination.js

@@ -5,6 +5,7 @@
 
 require('views/view') ;
 require('controllers/collection') ;
+require('views/button/button') ;
 
 /**
 

data/frameworks/sproutcore/views/view.js

@@ -1442,7 +1442,10 @@ SC.View = SC.Responder.extend(SC.PathModule,  SC.DelegateSupport,
     if (!isVisibleInWindow) {
       if (pnParent) {
         pnParent.insertBefore(pn, pnSib) ;
-      } else SC.window.rootElement.removeChild(pn) ;
+      } else {
+        if(pn.parentNode)
+          SC.window.rootElement.removeChild(pn) ;
+      }
     }  
     
     return ret;

data/lib/sproutcore/build_tools/html_builder.rb

@@ -3,68 +3,68 @@ require 'sproutcore/helpers'
 require 'sproutcore/view_helpers'
 
 module SproutCore
-  
+
   module BuildTools
 
-    # Whenever you build an HTML file for a SproutCore client, an instance of 
-    # this class is created to actually process and build the HTML using 
-    # Erubus.  If you want to add more methods to use in your HTML files, just 
+    # Whenever you build an HTML file for a SproutCore client, an instance of
+    # this class is created to actually process and build the HTML using
+    # Erubus.  If you want to add more methods to use in your HTML files, just
     # include them in HtmlContext.
     #
-    class HtmlContext 
+    class HtmlContext
 
       include SproutCore::Helpers::TagHelper
       include SproutCore::Helpers::TextHelper
       include SproutCore::Helpers::CaptureHelper
       include SproutCore::Helpers::StaticHelper
       include SproutCore::ViewHelpers
-      
+
       attr_reader :entry, :bundle, :entries, :filename, :language, :library
-      
+
       def initialize(entry, bundle, deep=true)
         @entry = nil
         @language = entry.language
         @bundle = bundle
         @library = bundle.library
 
-        # Find all of the entries that need to be included.  If deep is true, 
-        # the include required bundles.  Example composite entries to include 
+        # Find all of the entries that need to be included.  If deep is true,
+        # the include required bundles.  Example composite entries to include
         # their members.
         if deep
-          @entries = bundle.all_required_bundles.map do |cur_bundle| 
+          @entries = bundle.all_required_bundles.map do |cur_bundle|
             ret = (cur_bundle == bundle) ? [entry] : cur_bundle.entries_for(:html, :language => language, :hidden => :include)
             ret.map do |e|
-              e.composite? ? e.composite.map { |c| cur_bundle.entry_for(c, :hidden => :include) } : [e]
+              e.composite? ? e.composite : [e]
             end
           end
           @entries = @entries.flatten.compact.uniq
         else
-          @entries = entry.composite? ? entry.composite.map { |c| x.entry_for(c) } : [entry]
+          @entries = entry.composite? ? entry.composite : [entry]
         end
-        
-        # Clean out any composites we might have collected.  They have already 
+
+        # Clean out any composites we might have collected.  They have already
         # been expanded.  Also clean out any non-localized rhtml files.
         @entries.reject! { |entry| entry.composite? || (entry.type == :html && !entry.localized?) }
-        
+
         # Load any helpers before we continue
         bundle.all_required_bundles.each do |cur_bundle|
           require_helpers(nil, cur_bundle)
         end
-          
+
       end
 
-      # Actually builds the HTML file from the entry (actually from any 
+      # Actually builds the HTML file from the entry (actually from any
       # composite entries)
       def build
 
         @layout_path = bundle.layout_path
-        
-        # Render each filename.  By default, the output goes to the resources 
+
+        # Render each filename.  By default, the output goes to the resources
         # string
         @content_for_resources = ''
         entries.each { |fn| _render_one(fn) }
-        
-        # Finally, render the layout.  This should produce the final output to 
+
+        # Finally, render the layout.  This should produce the final output to
         # return
         input = File.read(@layout_path)
         return eval(Erubis::Eruby.new.convert(input))
@@ -77,29 +77,29 @@ module SproutCore
 
         # avoid double render of layout path
          return if @entry.source_path == @layout_path
-        
+
         # render. Result goes into @content_for_resources
         input = File.read(@entry.source_path)
         @content_for_resources += eval(Erubis::Eruby.new.convert(input))
-        
+
         @filename =nil
         @entry = nil
       end
-      
-      
-      # Returns the current bundle name.  Often useful for generating titles, 
+
+
+      # Returns the current bundle name.  Often useful for generating titles,
       # etc.
       def bundle_name; bundle.bundle_name; end
 
-      #### For Rails Compatibility.  render() does not do anything useful 
-      # since the new build system is nice about putting things into the right 
+      #### For Rails Compatibility.  render() does not do anything useful
+      # since the new build system is nice about putting things into the right
       # place for output.
       def render; ''; end
-      
+
     end
-    
-    # Builds an html file for the specified entry.  If deep is true, then this 
-    # will also find all of the html entries for any required bundles and 
+
+    # Builds an html file for the specified entry.  If deep is true, then this
+    # will also find all of the html entries for any required bundles and
     # include them in the built html file.
     def self.build_html(entry, bundle, deep=true)
       context = HtmlContext.new(entry, bundle, deep)
@@ -109,12 +109,12 @@ module SproutCore
       f = File.open(entry.build_path, 'w')
       f.write(output)
       f.close
-      
+
     end
-    
+
     # Building a test is just like building a single page except that we do not include
     # all the other html templates in the project
     def self.build_test(entry, bundle); build_html(entry, bundle, false); end
-    
+
   end
-end
+end