sproutcore 0.9.10 → 0.9.11

data/frameworks/sproutcore/models/record.js

@@ -593,7 +593,7 @@ SC.Record.Date = function(value,direction) {
   } else if (typeof(value) == "string") {
     // try to parse date. trim any decimal numbers at end since Rails sends
     // this sometimes.
-    var ret = Date.parseDate(value.replace(/\.\d+$/,'')) ;
+    var ret = Date.parse(value.replace(/\.\d+$/,'')) ;
     if (ret) value = ret ;
   }
   return value ;

data/frameworks/sproutcore/tests/views/view/innerFrame.rhtml

@@ -10,91 +10,91 @@
 
 <script>
 
-Test.context("CASE 1: Auto-layout view with no padding & no border", {
-  
-  // IMPORTANT:  This test validates that innerFrame works even on elements in
-  // IE when hasLayout = false.  Make sure you do not edit the CSS or other
-  // properties for this test in such a way that it would give the test 
-  // element hasLayout.  
-  "frame should == innerFrame": function() {
-
-    // verify hasLayout is false in IE.
-    if (SC.Platform.IE) {
-      var hasLayout = v.rootElement.currentStyle.hasLayout ;
-      assertEqual(hasLayout, false, 'element.hasLayout MUST be false in IE');
-    }
-    
-    SC.rectsEqual(v.get('frame'), v.get('innerFrame')).shouldEqual(true) ;
-  },
-  
-  "frame & innerFrame should change when CSS changed and viewFrameDidChange() is called": function() {
-    var origFrame = this.v.get('frame') ;
-    var origInnerFrame = this.v.get('innerFrame') ;
-    
-    this.v.addClassName('half') ;
-    this.v.viewFrameDidChange() ;
-    
-    SC.rectsEqual(this.v.get('frame'), origFrame).shouldEqual(false) ;    
-    SC.rectsEqual(this.v.get('innerFrame'), origInnerFrame).shouldEqual(false) ;   
-    
-    this.v.removeClassName('half') ; //reset 
-  },
-  
-  setup: function() { this.v = SC.page.get('case1'); }
-  
-});
-
-
-// CASE 2: Auto-layout of view with padding
-// - same as Case 1, except innerFrame = frame less padding
-CASE2_OFFSET = 2;
-Test.context("CASE 2: Auto-layout view with padding & border", {
-  
-  "innerFrame should == frame less border": function() {
-    var f = v.get('frame') ;
-    f.x += CASE2_OFFSET; f.y += CASE2_OFFSET;
-    f.width -= (CASE2_OFFSET*2); f.height -= (CASE2_OFFSET*2) ;
-    //console.log('f: %@ if: %@'.fmt($H(f).inspect(), $H(this.v.get('innerFrame')).inspect()));
-    
-    SC.rectsEqual(f, v.get('innerFrame')).shouldEqual(true) ;
-  },
-  
-  "frame & innerFrame should change when CSS changed and viewFrameDidChange is called.; innerFrame should maintain proportion": function() {
-    var origFrame = v.get('frame') ;
-    var origInnerFrame = v.get('innerFrame') ;
-
-    // verify that frames change
-    v.addClassName('half') ;
-    v.viewFrameDidChange() ;
-    
-    SC.rectsEqual(v.get('frame'), origFrame).shouldEqual(false) ;    
-    SC.rectsEqual(v.get('innerFrame'), origInnerFrame).shouldEqual(false) ;    
-
-    // verify that innerFrame changes correctly.
-    var f = this.v.get('frame') ;
-    f.x += CASE2_OFFSET; f.y += CASE2_OFFSET;
-    f.width -= (CASE2_OFFSET*2); f.height -= (CASE2_OFFSET*2) ;
-    SC.rectsEqual(f, v.get('innerFrame')).shouldEqual(true) ;
-    
-    v.removeClassName('half') ;
-    
-  },
-  
-  "changing border should change innerFrame": function() {
-    v.setStyle({ border: '5px red solid' }) ;
-    v.viewFrameDidChange() ;
-    var f = v.get('frame') ;
-    f.x += 5; f.y += 5;
-    f.width -= 10; f.height -= 10 ;
-    
-    var got = v.get('innerFrame') ;
-    console.log('expected: %@ got: %@'.fmt($H(f).inspect(), $H(got).inspect()));
-    SC.rectsEqual(f, got).shouldEqual(true) ;
-  },
-  
-  setup: function() { this.v = SC.page.get('case2'); }
-  
-});
+// Test.context("CASE 1: Auto-layout view with no padding & no border", {
+//   
+//   // IMPORTANT:  This test validates that innerFrame works even on elements in
+//   // IE when hasLayout = false.  Make sure you do not edit the CSS or other
+//   // properties for this test in such a way that it would give the test 
+//   // element hasLayout.  
+//   "frame should == innerFrame": function() {
+// 
+//     // verify hasLayout is false in IE.
+//     if (SC.Platform.IE) {
+//       var hasLayout = v.rootElement.currentStyle.hasLayout ;
+//       assertEqual(hasLayout, false, 'element.hasLayout MUST be false in IE');
+//     }
+//     
+//     SC.rectsEqual(v.get('frame'), v.get('innerFrame')).shouldEqual(true) ;
+//   },
+//   
+//   "frame & innerFrame should change when CSS changed and viewFrameDidChange() is called": function() {
+//     var origFrame = this.v.get('frame') ;
+//     var origInnerFrame = this.v.get('innerFrame') ;
+//     
+//     this.v.addClassName('half') ;
+//     this.v.viewFrameDidChange() ;
+//     
+//     SC.rectsEqual(this.v.get('frame'), origFrame).shouldEqual(false) ;    
+//     SC.rectsEqual(this.v.get('innerFrame'), origInnerFrame).shouldEqual(false) ;   
+//     
+//     this.v.removeClassName('half') ; //reset 
+//   },
+//   
+//   setup: function() { this.v = SC.page.get('case1'); }
+//   
+// });
+// 
+// 
+// // CASE 2: Auto-layout of view with padding
+// // - same as Case 1, except innerFrame = frame less padding
+// CASE2_OFFSET = 2;
+// Test.context("CASE 2: Auto-layout view with padding & border", {
+//   
+//   "innerFrame should == frame less border": function() {
+//     var f = v.get('frame') ;
+//     f.x += CASE2_OFFSET; f.y += CASE2_OFFSET;
+//     f.width -= (CASE2_OFFSET*2); f.height -= (CASE2_OFFSET*2) ;
+//     //console.log('f: %@ if: %@'.fmt($H(f).inspect(), $H(this.v.get('innerFrame')).inspect()));
+//     
+//     SC.rectsEqual(f, v.get('innerFrame')).shouldEqual(true) ;
+//   },
+//   
+//   "frame & innerFrame should change when CSS changed and viewFrameDidChange is called.; innerFrame should maintain proportion": function() {
+//     var origFrame = v.get('frame') ;
+//     var origInnerFrame = v.get('innerFrame') ;
+// 
+//     // verify that frames change
+//     v.addClassName('half') ;
+//     v.viewFrameDidChange() ;
+//     
+//     SC.rectsEqual(v.get('frame'), origFrame).shouldEqual(false) ;    
+//     SC.rectsEqual(v.get('innerFrame'), origInnerFrame).shouldEqual(false) ;    
+// 
+//     // verify that innerFrame changes correctly.
+//     var f = this.v.get('frame') ;
+//     f.x += CASE2_OFFSET; f.y += CASE2_OFFSET;
+//     f.width -= (CASE2_OFFSET*2); f.height -= (CASE2_OFFSET*2) ;
+//     SC.rectsEqual(f, v.get('innerFrame')).shouldEqual(true) ;
+//     
+//     v.removeClassName('half') ;
+//     
+//   },
+//   
+//   "changing border should change innerFrame": function() {
+//     v.setStyle({ border: '5px red solid' }) ;
+//     v.viewFrameDidChange() ;
+//     var f = v.get('frame') ;
+//     f.x += 5; f.y += 5;
+//     f.width -= 10; f.height -= 10 ;
+//     
+//     var got = v.get('innerFrame') ;
+//     console.log('expected: %@ got: %@'.fmt($H(f).inspect(), $H(got).inspect()));
+//     SC.rectsEqual(f, got).shouldEqual(true) ;
+//   },
+//   
+//   setup: function() { this.v = SC.page.get('case2'); }
+//   
+// });
 
 // CASE 3: Manual-layout view with some padding and border
 // - innerFrame should update at frame is changed.
@@ -104,12 +104,12 @@ CASE3_OFFSET_THICK = 5 ;
 Test.context("CASE 3: manual-layout view with some padding and no border", {
   
   "innerFrame should == frame less border": function() {
-    var f = this.v.get('frame') ;
-    f.x += CASE3_OFFSET; f.y += CASE3_OFFSET;
-    f.width -= (CASE3_OFFSET*2); f.height -= (CASE3_OFFSET*2) ;
-    
-    SC.rectsEqual(f, this.v.get('innerFrame')).shouldEqual(true) ;
-  },
+     var f = this.v.get('frame') ;
+     f.x += CASE3_OFFSET; f.y += CASE3_OFFSET;
+     f.width -= (CASE3_OFFSET*2); f.height -= (CASE3_OFFSET*2) ;
+     
+     SC.rectsEqual(f, this.v.get('innerFrame')).shouldEqual(true) ;
+   },
 
   "after frame change, innerFrame should == frame less border, viewFrameDidChange is not required.": function() {
     var f ;
@@ -117,16 +117,18 @@ Test.context("CASE 3: manual-layout view with some padding and no border", {
     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()));
+    
+    console.log('f: %@ if: %@'.fmt($H(f).inspect(), $H(this.v.get('innerFrame')).inspect()));
+    console.log('v=%@'.fmt(v.rootElement)) ;
     
     SC.rectsEqual(f, this.v.get('innerFrame')).shouldEqual(true) ;
   },
-
+  
   "changing CSS to change width should not impact innerFrame if viewFrameDidChange is called": function() {
     var f = this.v.get('frame') ;
     f.x += CASE3_OFFSET; f.y += CASE3_OFFSET;
     f.width -= (CASE3_OFFSET*2); f.height -= (CASE3_OFFSET*2) ;
-
+  
     this.v.addClassName('half') ;
     this.v.viewFrameDidChange() ;
     
@@ -134,20 +136,20 @@ Test.context("CASE 3: manual-layout view with some padding and no border", {
     
     SC.rectsEqual(f, this.v.get('innerFrame')).shouldEqual(true) ;
   },
-
+  
   "changing CSS to change border width should impact innerFrame if viewFrameDidChange() is called": function() {
-
+  
     this.v.get('frame') ;
     this.v.get('innerFrame'); // make sure the old value is cached.
     
     this.v.addClassName('thick-border') ;
     this.v.viewFrameDidChange() ;
-
+  
     // calculate the expected new value
     var f = this.v.get('frame') ;
     f.x += CASE3_OFFSET_THICK; f.y += CASE3_OFFSET_THICK;
     f.width -= (CASE3_OFFSET_THICK*2); f.height -= (CASE3_OFFSET_THICK*2) ;
-
+  
     console.log('f: %@ if: %@'.fmt($H(f).inspect(), $H(this.v.get('innerFrame')).inspect()));
     
     SC.rectsEqual(f, this.v.get('innerFrame')).shouldEqual(true) ;
@@ -275,7 +277,7 @@ main = function() { SC.page.awake(); };
 
 .half { width: 50%; }
 
-.case2, .case3 { padding: 10px; border: 2px blue solid; }
+.case2, .case3 { padding: 10px; border: 2px blue solid; position: absolute; }
 
 .case.thick-border { border: 5px green solid; }
 

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

@@ -74,7 +74,7 @@ SC.GridView = SC.CollectionView.extend(
   },
 
   layoutItemView: function(itemView, contentIndex, firstLayout) {
-    if (!itemView) debugger ;
+    //if (!itemView) debugger ;
     SC.Benchmark.start('SC.GridView.layoutItemViewsFor') ;
 
     var rowHeight = this.get('rowHeight') || 0 ;

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

@@ -50,7 +50,7 @@ SC.TableView = SC.CollectionView.extend(
   
   /** @private */
   layoutItemView: function(itemView, contentIndex, firstLayout) {
-    if (!itemView) debugger ;
+    //if (!itemView) debugger ;
     SC.Benchmark.start('SC.TableView.layoutItemViewsFor') ;
     
     var rowHeight = this.get('rowHeight') || 0 ;

data/frameworks/sproutcore/views/list_item.js

@@ -2,7 +2,7 @@
 // SC.ListItemView
 // ==========================================================================
 
-require('Core') ;
+require('core') ;
 require('views/view') ;
 require('mixins/control');
 require('mixins/inline_editor_delegate');

data/frameworks/sproutcore/views/progress.js

@@ -20,8 +20,8 @@ require('views/view') ;
   Style the progress bar with the following CSS classes:
 
   .progress.indeterminate = to show an indeterminate progress. inner will 
-      hide.
-  .progress.disabled = show as disabled.
+      be set to fill 100%
+  .progress.disabled = show as disabled. 
 
   @extends SC.View
 */
@@ -41,14 +41,19 @@ SC.ProgressView = SC.View.extend({
   */
   maximum: 1.0,
 
-  // Bind this to the current value of the progress bar.  Note that by default an
-  // empty value will disable the progress bar and a multiple value too make it
-  // indeterminate.
+  /**
+    Bind this to the current value of the progress bar.  Note that by default an
+    empty value will disable the progress bar and a multiple value too make it
+    indeterminate.
+  */
   value: 0.50,
   valueBindingDefault: SC.Binding.SingleNotEmpty,
   
-  // set to true if the item in progress is indeterminate.  This may be overridden
-  // by the actual value.
+  /** 
+    Set to true if the item in progress is indeterminate.  This may be overridden
+    by the actual value.
+    @returns {Boolean} 
+  */
   isIndeterminate: function(key,value) {
     if (value !== undefined) {
       this._isIndeterminate = value ;
@@ -56,7 +61,10 @@ SC.ProgressView = SC.View.extend({
     return this._isIndeterminate && (this.value != SC.Binding.EMPTY_PLACEHOLDER) ;
   }.property(),
   
-  // set to false to disable the progress bar
+  /**
+   Set to false to disable the progress bar.
+   @returns {Boolean}
+  */
   isEnabled: function(key, value) {
     if (value !== undefined) {
       this._isEnabled = value ;
@@ -88,11 +96,13 @@ SC.ProgressView = SC.View.extend({
       Element.setClassName(this,'indeterminate',isIndeterminate) ;
       Element.setClassName(this,'disabled',!isEnabled) ;
       
-      // compute value
+      // compute value for setting the width of the inner progress
       var value ;
-      if (isIndeterminate || !isEnabled) {
+      if (!isEnabled) {
         value = 0.0 ;
-      } else {
+      } else if (isIndeterminate) {
+        value = 1.0;
+      }else {
         var minimum = this.get('minimum') || 0.0 ;
         var maximum = this.get('maximum') || 1.0 ;
         value = this.get('value') || 0.0 ;

data/frameworks/sproutcore/views/segmented.js

@@ -5,27 +5,52 @@
 
 require('views/view') ;
 
-// SegmentView shows an array of buttons that can have mutually exclusive
-// select states.  You can change the value property to the state you
-// want to reflect and a button with the matching name 'xxxButton' will have
-// its select state set.
-//
-// Also, on configure, if the buttons in the segment view do not have actions
-// set, then the button will be configured to change the select state.
-SC.SegmentedView = SC.View.extend({
+/**
+  @class
   
-  value: null, // set to the currently value button.
+  SegmentView shows an array of buttons that can have mutually exclusive
+  select states.  You can change the value property to the state you
+  want to reflect and a button with the matching name 'xxxButton' will have
+  its select state set.
 
-  segments: null, // contains the array of buttons after init.
+  Also, on configure, if the buttons in the segment view do not have actions
+  set, then the button will be configured to change the select state.
+
+  @extends SC.View
+  @since SproutCore 1.0
+*/
+SC.SegmentedView = SC.View.extend(
+/** @scope SC.SegmentedView.prototype */ {
   
-  // changes all buttons to enabled/disabled.  You can also change buttons
-  // individually.
+  /**
+    The value of the segmented view.
+    
+    The SegmentedView's value will always be the value of the currently
+    selected button.  Setting this value will change the selected button. 
+    If you set this value to something that has no matching button, then
+    no buttons will be selected.
+    
+    @field {Object}
+  */
+  value: null,
+
+  /**
+    Contains an array of buttons after init.
+  */
+  segments: null, 
+
+  /**
+    Set to YES to enabled the segmented view, NO to disabled it.
+  */
   isEnabled: true, 
-  
-  // if true, clicking on a button again will deselect it (using the
-  // standard action)
+
+  /**
+    If YES, clicking a selected button again will deselect it, setting the
+    segmented views value to null.  Defaults to NO.
+  */
   allowsEmptySelection: false,  
 
+  /** @private */
   init: function() {
     arguments.callee.base.call(this) ;
     

data/lib/sproutcore/bundle.rb

@@ -453,9 +453,9 @@ module SproutCore
           
 
         # OK, looks like this is ready to be built.  
-        if entry.use_symlink?
-          SC.logger.debug("~ Creating Symlink: #{entry.filename}")
-          BuildTools.build_symlink(entry, self) 
+        # if the entry is served directly from source
+        if entry.use_source_directly?
+          SC.logger.debug("~ No Build Required: #{entry.filename} (will be served directly)")
         else
           SC.logger.debug("~ Building #{entry.type.to_s.capitalize}: #{entry.filename}")
           BuildTools.send("build_#{entry.type}".to_sym, entry, self)

data/lib/sproutcore/bundle_manifest.rb

@@ -254,17 +254,17 @@ module SproutCore
       # efficient than doing it later.
       url_root = (src_path == 'index.html') ? bundle.index_root : bundle.url_root
       cache_link = nil
-      use_symlink =false
+      use_source_directly =false
       
       # Note: you can only access real resources via the cache.  If the entry 
       # is a composite then do not go through cache.
       if (self.build_mode == :development) && composite.nil?
         cache_link = '_cache' if CACHED_TYPES.include?(src_type)
-        use_symlink = true if SYMLINKED_TYPES.include?(src_type)
+        use_source_directly = true if SYMLINKED_TYPES.include?(src_type)
       end
 
-      ret.use_symlink = use_symlink
-      if use_symlink
+      ret.use_source_directly = use_source_directly
+      if use_source_directly
         ret.build_path = File.join(bundle.build_root, '_src', src_path)
         ret.url = [url_root, '_src', src_path].join('/')
       else
@@ -301,11 +301,11 @@ module SproutCore
   # type::         the top-level category
   # original_path:: save the original path used to build this entry
   # hidden::       if true, this entry is needed internally, but otherwise should not be used
-  # use_symlink::  if true, then this entry should be handled via the build symlink 
+  # use_source_directly::  if true, then this entry should be handled via the build symlink 
   # language::     the language in use when this entry was created
   # composite::    If set, this will contain the filenames of other resources that should be combined to form this resource.  
   #
-  class ManifestEntry < Struct.new(:filename, :ext, :source_path, :url, :build_path, :type, :original_path, :hidden, :use_symlink, :language, :composite)
+  class ManifestEntry < Struct.new(:filename, :ext, :source_path, :url, :build_path, :type, :original_path, :hidden, :use_source_directly, :language, :composite)
     def to_hash
       ret = {}
       self.members.zip(self.values).each { |p| ret[p[0]] = p[1] }
@@ -313,7 +313,7 @@ module SproutCore
     end
     
     def hidden?; !!hidden; end
-    def use_symlink?; !!use_symlink; end
+    def use_source_directly?; !!use_source_directly; end
     def composite?; !!composite; end
     
     def localized?; !!source_path.match(/\.lproj/); end