sproutcore 1.5.0.rc.2 → 1.5.0

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/render.js

@@ -49,6 +49,84 @@ test("default implementation invokes renderChildViews if firstTime = YES", funct
 
 });
 
+test("default implementation does not invoke renderChildViews if explicitly rendered in render method", function() {
+
+  var rendered = 0, updated = 0, parentRendered = 0, parentUpdated = 0 ;
+  var view = SC.View.create({
+    displayProperties: ["triggerRenderProperty"],
+    childViews: ["child"],
+
+    render: function(context) {
+      this.renderChildViews(context);
+      parentRendered++;
+    },
+
+    update: function(jquery) {
+      parentUpdated++;
+    },
+
+    child: SC.View.create({
+      render: function(context) {
+        rendered++;
+      },
+
+      update: function(jquery) {
+        updated++;
+      }
+    })
+  });
+
+  view.createLayer();
+  equals(rendered, 1, 'rendered the child once');
+  equals(parentRendered, 1);
+  equals(view.$('div').length, 1);
+
+  view.updateLayer();
+  equals(rendered, 1, 'didn\'t call render again');
+  equals(parentRendered, 1, 'didn\'t call the parent\'s render again');
+  equals(parentUpdated, 1, 'called the parent\'t update');
+  equals(updated, 0, 'didn\'t call the child\'s update');
+
+});
+
+test("should invoke renderChildViews if layer is destroyed then re-rendered", function() {
+
+  var rendered = 0, updated = 0, parentRendered = 0, parentUpdated = 0 ;
+  var view = SC.View.create({
+    displayProperties: ["triggerRenderProperty"],
+    childViews: ["child"],
+
+    render: function(context) {
+      parentRendered++;
+    },
+
+    update: function(jquery) {
+      parentUpdated++;
+    },
+
+    child: SC.View.create({
+      render: function(context) {
+        rendered++;
+      },
+
+      update: function(jquery) {
+        updated++;
+      }
+    })
+  });
+
+  view.createLayer();
+  equals(rendered, 1, 'rendered the child once');
+  equals(parentRendered, 1);
+  equals(view.$('div').length, 1);
+
+  view.destroyLayer();
+  view.createLayer();
+  equals(rendered, 2, 'rendered the child twice');
+  equals(parentRendered, 2);
+  equals(view.$('div').length, 1);
+
+});
 // .......................................................
 // renderChildViews()
 //

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/static_layout.js

@@ -24,5 +24,5 @@ test("Background color", function() {
 
   view.createLayer();
 
-  ok(view.$().css('background-color') == "red", "backgroundColor sets the CSS background-color class");
+  equals(view.get('layer').style.backgroundColor, "red", "backgroundColor sets the CSS background-color class");
 });

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

@@ -6,6 +6,18 @@ SC.TemplateCollectionView = SC.TemplateView.extend({
   template: SC.Handlebars.compile(''),
   emptyView: null,
 
+  /**
+    @private
+    When the view is initialized, set up array observers on the content array.
+
+    @returns SC.TemplateCollectionView
+  */
+  init: function() {
+    var templateCollectionView = sc_super();
+    this._sctcv_contentDidChange();
+    return templateCollectionView;
+  },
+
   // In case a default content was set, trigger the child view creation
   // as soon as the empty layer was created
   didCreateLayer: function() {
@@ -81,10 +93,6 @@ SC.TemplateCollectionView = SC.TemplateView.extend({
     needed.
   */
   _sctcv_contentDidChange: function() {
-    this.get('childViews').forEach(function() {
-      this.removeChild(view);
-      view.destroy();
-    }, this);
 
     this.$().empty();
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view.js

@@ -11,7 +11,7 @@ sc_require('system/cursor');
 sc_require('system/responder') ;
 sc_require('system/theme');
 
-sc_require('mixins/string') ;
+sc_require('system/string') ;
 sc_require('views/view/base') ;
 
 
@@ -42,7 +42,7 @@ SC.EMPTY_CHILD_VIEWS_ARRAY.needsClone = YES;
 SC.CoreView.reopen(
 /** @scope SC.View.prototype */ {
 
-  concatenatedProperties: 'outlets displayProperties classNames renderMixin didCreateLayerMixin willDestroyLayerMixin'.w(),
+  concatenatedProperties: ['outlets', 'displayProperties', 'classNames', 'renderMixin', 'didCreateLayerMixin', 'willDestroyLayerMixin'],
 
   /**
     The current pane.
@@ -428,6 +428,13 @@ SC.CoreView.reopen(
       // invalidate it.
       childView.notifyPropertyChange('layer');
 
+      // A strange case, that a childView's frame won't be correct before
+      // we have a layer, if the childView doesn't have a fixed layout
+      // and we are using static layout
+      if (this.get('useStaticLayout')) {
+        if (!childView.get('isFixedLayout')) { childView.viewDidResize(); }
+      }
+
       childView._notifyDidCreateLayer() ;
     }
   },
@@ -486,6 +493,31 @@ SC.CoreView.reopen(
     this.updateLayerLocation();
   },
 
+  /**
+    Set to YES when the view's layer location is dirty.  You can call
+    updateLayerLocationIfNeeded() to clear this flag if it is set.
+
+    @property {Boolean}
+  */
+  layerLocationNeedsUpdate: NO,
+
+  /**
+    Calls updateLayerLocation(), but only if the view's layer location
+    currently needs to be updated.  This method is called automatically at
+    the end of a run loop if you have called parentViewDidChange() at some
+    point.
+
+    @property {Boolean} force This property is ignored.
+    @returns {SC.View} receiver
+    @test in updateLayerLocation
+  */
+  updateLayerLocationIfNeeded: function(force) {
+    if (this.get('layerLocationNeedsUpdate')) {
+      this.updateLayerLocation() ;
+    }
+    return this ;
+  },
+
   /**
     This method is called when a view changes its location in the view
     hierarchy.  This method will update the underlying DOM-location of the
@@ -615,7 +647,12 @@ SC.CoreView.reopen(
       }
     }
 
+    // If we've made it this far and renderChildViews() was never called,
+    // render any child views now.
     if (firstTime && !this._didRenderChildViews) { this.renderChildViews(context, firstTime); }
+    // Reset the flag so that if the layer is recreated we re-render the child views
+    this._didRenderChildViews = NO;
+
 
     if (mixins = this.renderMixin) {
       len = mixins.length;
@@ -689,6 +726,8 @@ SC.CoreView.reopen(
       view.renderToContext(context, firstTime);
       context = context.end() ;
     }
+    this._didRenderChildViews = YES;
+
     return context;
   },
 
@@ -776,7 +815,7 @@ SC.CoreView.reopen(
   */
   displayToolTip: function() {
     var ret = this.get('toolTip');
-    return (ret && this.get('localize')) ? ret.loc() : (ret || '');
+    return (ret && this.get('localize')) ? SC.String.loc(ret) : (ret || '');
   }.property('toolTip','localize').cacheable(),
 
   /**
@@ -1145,15 +1184,18 @@ SC.CoreView.reopen(
     }
 
     attrs.owner = attrs.parentView = this ;
+
+    // We need to set isVisibleInWindow before the init method is called on the view
+    // The prototype check is a bit hackish and should be revisited - PDW
+    if (view.isClass && view.prototype.hasVisibility) {
+      attrs.isVisibleInWindow = this.get('isVisibleInWindow');
+    }
+
     if (!attrs.page) { attrs.page = this.page ; }
 
     // Now add this to the attributes and create.
     if (view.isClass) { view = view.create(attrs); }
 
-    if (view.hasVisibility) {
-      view.set('isVisibleInWindow', this.get('isVisibleInWindow'));
-    }
-
     return view ;
   },
 
@@ -1372,7 +1414,7 @@ SC.CoreView.mixin(/** @scope SC.View.prototype */ {
     while(--idx>=0) {
       viewClass = childViews[idx];
       loc = childLocs[idx];
-      if (loc && viewClass && viewClass.loc) viewClass.loc(loc) ;
+      if (loc && viewClass && typeof viewClass === SC.T_STRING) SC.String.loc(viewClass, loc);
     }
 
     return this; // done!
@@ -1419,8 +1461,8 @@ SC.CoreView.unload = function() {
   }
 } ;
 
-/** 
-  @class 
+/**
+  @class
 
   Base class for managing a view.  Views provide two functions:
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/layout.js

@@ -8,7 +8,7 @@ SC.LAYOUT_HORIZONTAL = 'sc-layout-horizontal';
 SC.LAYOUT_VERTICAL = 'sc-layout-vertical';
 
 /** @private */
-SC._VIEW_DEFAULT_DIMS = 'marginTop marginLeft'.w();
+SC._VIEW_DEFAULT_DIMS = ['marginTop', 'marginLeft'];
 
 /**
   Layout properties to take up the full width of a parent view.
@@ -176,7 +176,7 @@ SC.View.reopen(
   },
 
   /**
-    The layout describes how you want your view to be positions on the
+    The layout describes how you want your view to be positioned on the
     screen.  You can define the following properties:
 
      - left: the left edge
@@ -212,6 +212,39 @@ SC.View.reopen(
   */
   layout: { top: 0, left: 0, bottom: 0, right: 0 },
 
+  /**
+    Returns whether the layout is 'fixed' or not.  A fixed layout has a fixed
+    left & top position within its parent's frame as well as a fixed width and height.
+    Fixed layouts are therefore unaffected by changes to their parent view's
+    layout.
+
+    @returns {Boolean} YES if fixed, NO otherwise
+    @test in layoutStyle
+  */
+  isFixedLayout: function() {
+    var layout = this.get('layout'),
+        ret;
+
+    // Layout is fixed if it has width + height !== SC.LAYOUT_AUTO and left + top
+    ret = (
+      ((layout.width !== undefined) && (layout.height !== undefined)) &&
+      ((layout.width !== SC.LAYOUT_AUTO) && (layout.height !== SC.LAYOUT_AUTO)) &&
+      ((layout.left !== undefined) && (layout.top !== undefined))
+    );
+
+    // The layout may appear fixed, but only if none of the values are percentages
+    if (ret) {
+      ret = (
+        !SC.isPercentage(layout.top) &&
+        !SC.isPercentage(layout.left) &&
+        !SC.isPercentage(layout.width) &&
+        !SC.isPercentage(layout.height)
+      );
+    }
+
+    return ret;
+  }.property('layout').cacheable(),
+
   /**
     Converts a frame from the receiver's offset to the target offset.  Both
     the receiver and the target must belong to the same pane.  If you pass
@@ -227,7 +260,7 @@ SC.View.reopen(
     @param {Rect} frame the source frame
     @param {SC.View} targetView the target view to convert to
     @returns {Rect} converted frame
-    @test in converFrames
+    @test in convertFrames
   */
   convertFrameToView: function(frame, targetView) {
     var myX=0, myY=0, targetX=0, targetY=0, view = this, f ;
@@ -346,14 +379,18 @@ SC.View.reopen(
     @returns {Rect} the computed frame
   */
   computeFrameWithParentFrame: function(original, pdim) {
-    var layout = this.get('layout');
+    var f, layout = this.get('layout');
 
+    // We can't predict the frame for static layout, so just return the view's
+    // current frame (see original computeFrameWithParentFrame in views/view.js)
     if (this.get('useStaticLayout')) {
-      var f = original(pdim);
+      f = original();
       return f ? this._adjustForBorder(f, layout) : null;
+    } else {
+      f = {};
     }
 
-    var f = {} , error, layer, AUTO = SC.LAYOUT_AUTO,
+    var error, layer, AUTO = SC.LAYOUT_AUTO,
         pv = this.get('parentView'),
         dH, dW, //shortHand for parentDimensions
         lR = layout.right,
@@ -572,39 +609,12 @@ SC.View.reopen(
     @test in viewDidResize
   */
   parentViewDidResize: function() {
-    var frameMayHaveChanged, layout, isFixed, isPercentageFunc, isPercentage;
+    var frameMayHaveChanged;
 
     // If this view uses static layout, our "do we think the frame changed?"
-    // logic is not applicable and we simply have to assume that the frame may
-    // have changed.
-    if (this.useStaticLayout) {
-      frameMayHaveChanged = YES;
-    }
-    else {
-      layout = this.get('layout');
-
-      // only resizes if the layout does something other than left/top - fixed
-      // size.
-      isFixed = (
-        (layout.left !== undefined) && (layout.top !== undefined) &&
-        (layout.width !== undefined) && (layout.height !== undefined)
-      );
-
-
-      // If it's fixed, our frame still could have changed if it's fixed to a
-      // percentage of the parent.
-      if (isFixed) {
-        isPercentageFunc = SC.isPercentage;
-        isPercentage = (isPercentageFunc(layout.left) ||
-                        isPercentageFunc(layout.top) ||
-                        isPercentageFunc(layout.width) ||
-                        isPercentageFunc(layout.right) ||
-                        isPercentageFunc(layout.centerX) ||
-                        isPercentageFunc(layout.centerY));
-      }
-
-      frameMayHaveChanged = (!isFixed || isPercentage);
-    }
+    // result of isFixedLayout is not applicable and we simply have to assume
+    // that the frame may have changed.
+    frameMayHaveChanged = this.useStaticLayout || !this.get('isFixedLayout');
 
     // Do we think there's a chance our frame will have changed as a result?
     if (frameMayHaveChanged) {

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/layout_style.js

@@ -1,3 +1,5 @@
+
+sc_require('ext/string');
 sc_require('views/view');
 sc_require('views/view/animation');
 
@@ -179,7 +181,9 @@ SC.View.LayoutStyleCalculator = SC.Object.extend({
 
     var start, finish, size, maxSize, margin,
         hasStart, hasFinish, hasSize, hasMaxSize,
-        startBorderVal, finishBorder, sizeNum;
+        startBorder, startBorderVal,
+        finishBorder, finishBorderVal,
+        sizeNum;
 
     if (direction === 'x') {
       start      = 'left';
@@ -244,7 +248,9 @@ SC.View.LayoutStyleCalculator = SC.Object.extend({
 
   _calculateCenter: function(direction) {
     var ret = this.ret,
-        size, center, start, finish, margin, startBorderVal, finishBorderVal;
+        size, center, start, finish, margin,
+        startBorder, startBorderVal,
+        finishBorder, finishBorderVal;
 
     if (direction === 'x') {
         size   = 'width';
@@ -572,11 +578,11 @@ SC.View.LayoutStyleCalculator = SC.Object.extend({
 
     if (propertyName === '-'+SC.platform.cssPrefix+'-transform' && this._animatedTransforms && this._animatedTransforms.length > 0) {
       for(idx=0; idx < this._animatedTransforms.length; idx++) {
-        delete layout['animate'+this._animatedTransforms[idx].capitalize()];
+        delete layout['animate' + SC.String.capitalize(this._animatedTransforms[idx])];
       }
       this._animatedTransforms = null;
     }
-    delete layout['animate'+propertyName.capitalize()];
+    delete layout['animate' + SC.String.capitalize(propertyName)];
 
     if (!isPending) { delete this._activeAnimations[propertyName]; }
   }

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/manipulation.js

@@ -87,31 +87,6 @@ SC.View.reopen({
   // LAYER LOCATION
   //
 
-  /**
-    Set to YES when the view's layer location is dirty.  You can call
-    updateLayerLocationIfNeeded() to clear this flag if it is set.
-
-    @property {Boolean}
-  */
-  layerLocationNeedsUpdate: NO,
-
-  /**
-    Calls updateLayerLocation(), but only if the view's layer location
-    currently needs to be updated.  This method is called automatically at
-    the end of a run loop if you have called parentViewDidChange() at some
-    point.
-
-    @property {Boolean} force This property is ignored.
-    @returns {SC.View} receiver
-    @test in updateLayerLocation
-  */
-  updateLayerLocationIfNeeded: function(force) {
-    if (this.get('layerLocationNeedsUpdate')) {
-      this.updateLayerLocation() ;
-    }
-    return this ;
-  },
-
   /**
     Insert the view into the the receiver's childNodes array.