sproutcore 1.0.1046 → 1.0.1049.pre.1

data/frameworks/sproutcore/frameworks/forms/views/form_row.js

@@ -0,0 +1,188 @@
+// ==========================================================================
+// Project:   Forms.FormRowView
+// Copyright: ©2009 Alex Iskander and TPSi.
+// ==========================================================================
+/*globals Forms */
+
+/** @class
+	Represents a single row in a form. Rows have label and any number of other child views.
+
+	
+	@extends SC.FormView
+	@author Alex Iskander
+*/
+require("mixins/auto_hide");
+require("mixins/edit_mode");
+SC.FormRowView = SC.View.extend(SC.FlowedLayout, SC.FormsAutoHide, SC.FormsEditMode,
+/** @scope Forms.FormRowView.prototype */ {
+  flowSize: { widthPercentage: 1 },
+
+  rowFlowSpacing: SC.FROM_THEME,
+  rowFlowSpacingDefault: { right: 15, left: 0, top: 0, bottom: 0 },
+  
+  rowFlowPadding: SC.FROM_THEME,
+  rowFlowPaddingDefault: { right: 0, left: 0, top: 0, bottom: 0 },
+  
+  defaultFlowSpacing: function() {
+    return this.themed("rowFlowSpacing");
+  }.property("rowFlowSpacing", "theme"),
+  
+  flowPadding: function() {
+    return this.themed("rowFlowPadding");
+  }.property("rowFlowPadding", "theme"),
+  
+  classNames: ["sc-form-row-view"],
+  
+  /**
+    Walks like a duck.
+  */
+	isFormRow: YES,
+	
+	/**
+	  The label for the row (string label)
+	*/
+	label: "",
+	
+	/**
+	  The current size of the labels.
+	*/
+	rowLabelSize: 0,
+	
+	/**
+	  The current measured size of the label.
+	*/
+	rowLabelMeasuredSize: 0,
+	
+	/**
+	  If NO, the label will not automatically measure itself.
+	*/
+	shouldMeasureLabel: YES,
+	
+	/**
+	  A value set so that FormView knows to tell us about the row label size change.
+	*/
+	hasRowLabel: YES,
+	
+	/**
+	  The label view.
+	*/
+	labelView: null,
+	
+	/**
+	  Direction of the flow.
+	*/
+	layoutDirection: SC.LAYOUT_HORIZONTAL,
+	
+  /**
+  Updates keys, content, etc. on fields. Also, handles our "special" field (only-one case)
+  */
+  createChildViews: function()
+  {
+    // keep array of keys so we can pass on key to child.
+    var cv = SC.clone(this.get("childViews"));
+    
+    // add label
+    if (this.labelView.isClass) {
+      this.labelView = this.createChildView(this.labelView, {
+        value: this.get("label")
+      });
+      this.labelView.addObserver("measuredSize", this, "labelSizeDidChange");
+      this.labelView.bind("shouldMeasureSize", this, "shouldMeasureLabel");
+      this.get("childViews").unshift(this.labelView);
+    }
+    
+    var content = this.get("content");
+    
+    sc_super();
+    
+    // now, do the actual passing it
+    var idx, len = cv.length, key, v;
+    for (idx = 0; idx < len; idx++) {
+      key = cv[idx];
+      
+      // if the view was originally declared as a string, then we have something to give it
+      if (SC.typeOf(key) === SC.T_STRING) {
+        // try to get the actual view
+        v = this.get(key);
+        
+        // see if it does indeed exist, and if it doesn't have a value already
+        if (v && !v.isClass) {
+          if (!v.get("contentValueKey")) {
+            //
+            // NOTE: WE HAVE A SPECIAL CASE
+            //       If this is the single field, pass through our contentValueKey
+            if (key === "_singleField")  {
+              v.set("contentValueKey", this.get("contentValueKey"));
+            } else {
+              v.set("contentValueKey", key);
+            }
+          }
+          if (!v.get("content")) {
+            v.bind('content', '.owner.content') ;
+          }
+          // Bind the value property of the view to the 'contentValueKey' property of content.
+          var vKey = v.get('contentValueKey') ;
+          if (vKey && !v.get('value')) {
+            v.bind('value', '.content.'+vKey) ;
+          }
+        }
+        
+      }
+    }
+    
+
+  },
+  
+  labelDidChange: function() {
+    this.get("labelView").set("value", this.get("label"));
+  }.observes("label"),
+  
+  labelSizeDidChange: function() {
+    var size = this.get("labelView").get("measuredSize");
+    this.set("rowLabelMeasuredSize", size.width);
+    
+    // alert parent view if it is a row delegate
+    var pv = this.get("parentView");
+    if (pv && pv.get("isRowDelegate")) pv.rowLabelMeasuredSizeDidChange(this, size);
+  },
+  
+  rowLabelSizeDidChange: function() {
+    this.get("labelView").adjust({
+      "width": this.get("rowLabelSize")
+    });
+  }.observes("rowLabelSize"),
+  
+  
+  //
+  // RENDERING
+  //
+  createRenderer: function(t) { return t.formRow(); },
+  updateRenderer: function(r) {}
+  
+});
+
+SC.FormRowView.mixin({
+	row: function(label, fieldType, ext)
+	{
+	  if (label.isClass) {
+	    ext = fieldType;
+	    fieldType = label;
+	    label = null;
+	  }
+		// now, create a hash (will be used by the parent form's exampleRow)
+		if (!ext) ext = {};
+		ext.label = label;
+		ext.childViews = ["_singleField"];
+		ext._singleField = fieldType;
+		return ext;
+	},
+	
+	LabelView: SC.LabelView.extend(SC.AutoResize, {
+	  shouldAutoResize: NO, // only change the measuredSize so we can update.
+	  layout: { left:0, top:0, width: 0, height: 18 },
+	  fillHeight: YES,
+	  classNames: ["sc-form-label"]
+	})
+});
+
+SC.FormRowView.prototype.labelView = SC.FormRowView.LabelView.design();

data/frameworks/sproutcore/frameworks/foundation/TESTING

@@ -22,7 +22,7 @@ WHERE TO ADD NEW UNIT TESTS
 If you find a bug and reduce the problem down to a particular API method that
 is not responding in the way you might expect, then the best place to add a 
 test for this is in the API unit tests.  This will effectively make your unit
-test part of the API "specification" that must be satisified for all future
+test part of the API "specification" that must be satisfied for all future
 releases.
 
 Often times, however, you will find bugs that are not due to a particular 
@@ -34,13 +34,13 @@ test file and add it there.
 
 HOW TO WRITE API UNIT TESTS VS INTEGRATION
 
-The purpose of an API unit test is to excercise individual methods in the API
+The purpose of an API unit test is to exercise individual methods in the API
 in isolation of the rest of the API.  You should swap out methods, mock objects, or make any other temporary modifications to the framework needed to
 make the method run as isolated as possible from other methods.
 
 Integration tests, on the other hand, are about testing API usage in place.
-Avoid mocking parts of the framework unless necessary.  Try to run the 
-framework code in its natural state to ensure the full stack is excercised 
-just as it would be in production code.
+Avoid mocking parts of the framework unless necessary. Try to run the
+framework code in its natural state to ensure the full stack is exercised just
+as it would be in production code.
 
 

data/frameworks/sproutcore/frameworks/foundation/controllers/array.js

@@ -376,9 +376,17 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
     if (!func) {  
       len = orderBy.get('length');
       func = function(a,b) {
-        var idx=0, status=0, key, aValue, bValue;
+        var idx=0, status=0, key, aValue, bValue, descending;
         for(idx=0;(idx<len)&&(status===0);idx++) {
           key = orderBy.objectAt(idx);
+          descending = NO;
+          
+          if (key.indexOf('ASC') > -1) {
+            key = key.split('ASC ')[1];
+          } else if (key.indexOf('DESC') > -1) {
+            key = key.split('DESC ')[1];
+            descending = YES;
+          }
         
           if (!a) aValue = a ;
           else if (a.isObservable) aValue = a.get(key);
@@ -389,8 +397,9 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
           else bValue = b[key];
         
           status = SC.compare(aValue, bValue);
+          if (descending) status = (-1) * status;
         }
-        return status ; 
+        return status ;
       };
     }
 

data/frameworks/sproutcore/frameworks/foundation/controllers/controller.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /**
@@ -40,5 +40,5 @@ SC.Controller = SC.Object.extend(
     @property {Boolean}
   */
   isEditable: YES
-  
+
 });

data/frameworks/sproutcore/frameworks/foundation/controllers/object.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 require('controllers/controller') ;
@@ -247,21 +247,41 @@ SC.ObjectController = SC.Controller.extend(
   /** @private - setup observer on init if needed. */
   init: function() {
     sc_super();
-    if (this.get('observableContent')) this._scoc_contentDidChange();
+    if (this.get('content')) this._scoc_contentDidChange();
+    if (this.get('observableContent')) this._scoc_observableContentDidChange();
   },
 
+  _scoc_contentDidChange: function () {
+    var last = this._scoc_content,
+        cur  = this.get('content');
+        
+    if (last !== cur) {
+      this._scoc_content = cur;
+      var func = this._scoc_enumerableContentDidChange;
+      if (last && last.isEnumerable) {
+        //console.log('no longer observing [] on last');
+        last.removeObserver('[]', this, func);
+      }
+      if (cur && cur.isEnumerable) {
+        //console.log('observing [] on cur');
+        cur.addObserver('[]', this, func);
+      }
+    }
+  }.observes("content"),
+  
   /**  @private
     
     Called whenever the observable content property changes.  This will setup
     observers on the content if needed.
   */
-  _scoc_contentDidChange: function() {
+  _scoc_observableContentDidChange: function() {
     var last = this._scoc_observableContent,
         cur  = this.get('observableContent'),
         func = this.contentPropertyDidChange,
         efunc= this._scoc_enumerableContentDidChange;
 
     if (last === cur) return this; // nothing to do
+    //console.log('observableContentDidChange');
     
     this._scoc_observableContent = cur; // save old content
     

data/frameworks/sproutcore/frameworks/foundation/core.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /**
@@ -38,6 +38,35 @@ SC.DROP_AFTER = 0x04 ;
 */
 SC.DROP_ANY = 0x07 ;
 
+/**
+  Indicates that the content should be aligned to the left.
+*/
+SC.ALIGN_LEFT = 'left';
+
+/**
+  Indicates that the content should be aligned to the right.
+*/
+SC.ALIGN_RIGHT = 'right';
+
+/**
+  Indicates that the content should be aligned to the center.
+*/
+SC.ALIGN_CENTER = 'center';
+
+/**
+  Indicates that the content should be aligned to the top.
+*/
+SC.ALIGN_TOP = 'top';
+
+/**
+  Indicates that the content should be aligned to the middle.
+*/
+SC.ALIGN_MIDDLE = 'middle';
+
+/**
+  Indicates that the content should be aligned to the bottom.
+*/
+SC.ALIGN_BOTTOM = 'bottom';
 
 /**
   This variable is here to make the tab focus behavior work like safari's.
@@ -141,8 +170,10 @@ SC.mixin(Function.prototype, /** @scope Function.prototype */ {
       var args = SC.$A(arguments).slice(2,arguments.length);
       args.unshift(target);
       // f = f.bind.apply(f, args) ;
-      var that = this, func = f ;
-      f = function() { return func.apply(that, args.slice(1)); } ;
+      var func = f ;
+      // Use "this" in inner func because it get its scope by 
+      // outer func f (=target). Could replace "this" with target for clarity.
+      f = function() { return func.apply(this, args.slice(1)); } ;
     }
     return SC.Timer.schedule({ target: target, action: f, interval: interval });
   }    

data/frameworks/sproutcore/frameworks/foundation/debug/control_test_pane.js

@@ -1,8 +1,8 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: �2006-2009 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            portions copyright @2009 Apple Inc.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 sc_require('panes/pane');
@@ -191,4 +191,3 @@ SC.ControlTestPane.show = function() {
     SC.RunLoop.end();
   });
 };
-

data/frameworks/sproutcore/frameworks/foundation/english.lproj/bootstrap.rhtml

@@ -3,7 +3,7 @@
 # Project:   SproutCore - JavaScript Application Framework
 # Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 #            Portions ©2008-2009 Apple Inc. All rights reserved.
-# License:   Licened under MIT license (see license.js)
+# License:   Licensed under MIT license (see license.js)
 # ==========================================================================
 #
 # IMPORTANT: This bootstrap code is DEPRECATED.  Instead see the bootstrap 
@@ -13,6 +13,7 @@
 <% content_for('bootstrap') do %>
 var SC = SC || { BUNDLE_INFO: {}, LAZY_INSTANTIATION: {} };
 SC.browser = (function() {
+  // THIS CODE IS DEPRECATED AND IS NO LONGER MAINTAINED
   var userAgent = navigator.userAgent.toLowerCase();
   var version = (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [])[1] ;
 

data/frameworks/sproutcore/frameworks/foundation/english.lproj/button_view.css

@@ -34,3 +34,7 @@
   top: -2px;
   left: -2px;
 }
+
+.ie7 .sc-button-view {
+  display: inline;
+}

data/frameworks/sproutcore/frameworks/foundation/english.lproj/core.css

@@ -1,7 +1,9 @@
 .sc-view {
 	font-family: "Lucida Sans", "Lucida Grande", Verdana, Arial, sans-serif;
 	font-size: 12px;
-	line-height: 1.4
+	line-height: 1.4;
+  -webkit-touch-callout: none;
+  -webkit-tap-highlight-color: rgba(0,0,0,0);
 }
 
 .ellipsis {
@@ -14,32 +16,41 @@
 
 /* YUI reset*/
 
+body {
+  position: absolute;
+  margin: 0px;
+  top:0px;
+  bottom: 0px;
+  left:0px;
+  right:0px;
+}
+
 .sc-view body,
-div,
-dl,
-dt,
-dd,
-ul,
-ol,
-li,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-pre,
-code,
-form,
-fieldset,
-legend,
-input,
-button,
-textarea,
-p,
-blockquote,
-th,
-td {
+.sc-view div,
+.sc-view dl,
+.sc-view dt,
+.sc-view dd,
+.sc-view ul,
+.sc-view ol,
+.sc-view li,
+.sc-view h1,
+.sc-view h2,
+.sc-view h3,
+.sc-view h4,
+.sc-view h5,
+.sc-view h6,
+.sc-view pre,
+.sc-view code,
+.sc-view form,
+.sc-view fieldset,
+.sc-view legend,
+.sc-view input,
+.sc-view button,
+.sc-view textarea,
+.sc-view p,
+.sc-view blockquote,
+.sc-view th,
+.sc-view td {
 	margin: 0;
 	padding: 0;
 }
@@ -55,15 +66,15 @@ td {
 }
 
 .sc-view address,
-caption,
-cite,
-code,
-dfn,
-em,
-strong,
-th,
-var,
-optgroup {
+.sc-view caption,
+.sc-view cite,
+.sc-view code,
+.sc-view dfn,
+.sc-view em,
+.sc-view strong,
+.sc-view th,
+.sc-view var,
+.sc-view optgroup {
 	font-style: inherit;
 	font-weight: inherit;
 }
@@ -78,27 +89,27 @@ optgroup {
 }
 
 .sc-view caption,
-th {
+.sc-view th {
 	text-align: left;
 }
 
 .sc-view h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
+.sc-view h2,
+.sc-view h3,
+.sc-view h4,
+.sc-view h5,
+.sc-view h6 {
 	font-size: 100%;
 	font-weight: normal;
 }
 
 .sc-view q:before,
-q:after {
+.sc-view q:after {
 	content: '';
 }
 
 .sc-view abbr,
-acronym {
+.sc-view acronym {
 	border: 0;
 	font-variant: normal;
 }
@@ -117,11 +128,11 @@ acronym {
 }
 
 .sc-view input,
-button,
-textarea,
-select,
-optgroup,
-option {
+.sc-view button,
+.sc-view textarea,
+.sc-view select,
+.sc-view optgroup,
+.sc-view option {
 	font-family: inherit;
 	font-size: inherit;
 	font-style: inherit;
@@ -131,9 +142,9 @@ option {
 /*@purpose To enable resizing for IE */
 /*@branch For IE6-Win, IE7-Win */
 .sc-view input,
-button,
-textarea,
-select {
+.sc-view button,
+.sc-view textarea,
+.sc-view select {
 	font-size: 100%;
 }
 
@@ -174,10 +185,9 @@ version: 2.7.0
  * Nudge down to get to 13px equivalent for these form elements
  */ 
 .sc-view select,
-input,
-button,
-textarea,
-button {
+.sc-view input,
+.sc-view textarea,
+.sc-view button {
 	font:99% "Lucida Sans", "Lucida Grande", Verdana, Arial, sans-serif;
 }
 
@@ -193,10 +203,10 @@ button {
  * Bump up IE to get to 13px equivalent for these fixed-width elements
  */
 .sc-view pre,
-code,
-kbd,
-samp,
-tt {
+.sc-view code,
+.sc-view kbd,
+.sc-view samp,
+.sc-view tt {
 	font-family:monospace;
 	*font-size:108%;
 	line-height:100%;
@@ -240,12 +250,21 @@ version: 2.7.0
 	font-size: 108%;
 }
 
-.sc-view h1,h2,h3 {
+.sc-view h1,
+.sc-view h2,
+.sc-view h3 {
 	/* Top & bottom margin based on font size. */
-	margin: 1em 0;
+	margin: 0em 0;
 }
 
-.sc-view h1,h2,h3,h4,h5,h6,strong,dt {
+.sc-view h1,
+.sc-view h2,
+.sc-view h3,
+.sc-view h4,
+.sc-view h5,
+.sc-view h6,
+.sc-view strong,
+.sc-view dt {
 	/* Bringing boldness back to headers and the strong element. */
 	font-weight: bold;
 }
@@ -253,7 +272,8 @@ version: 2.7.0
 	font-weight:normal;
 }
 
-.sc-view abbr,acronym {
+.sc-view abbr,
+.sc-view acronym {
 	/* Indicating to users that more info is available. */
 	border-bottom: 1px dotted #000;
 	cursor: help;
@@ -269,32 +289,35 @@ version: 2.7.0
 	text-decoration: line-through;
 }
 
-.sc-view blockquote,ul,ol,dl {
+.sc-view blockquote,
+.sc-view ul,
+.sc-view ol,
+.sc-view dl {
 	/* Giving blockquotes and lists room to breath. */
 	margin: 1em;
 }
 
-.sc-view ol,ul,dl {
+.sc-view ol,
+.sc-view ul,
+.sc-view dl {
 	/* Bringing lists on to the page with breathing room. */
 	margin-left: 2em;
 }
-
+/*
 .sc-view ol li {
-	/* Giving OL's LIs generated numbers. */
-	list-style: decimal outside;
+  list-style: decimal outside;
 }
 
 .sc-view ul li {
-	/* Giving UL's LIs generated disc markers. */
-	list-style: disc outside;
+  list-style: disc outside;
 }
 
 .sc-view dl dd {
-	/* Giving UL's LIs generated numbers. */
-	margin-left: 1em;
+  margin-left: 1em;
 }
-
-.sc-view th,td {
+*/
+.sc-view th,
+.sc-view td {
 	/* Borders and padding to make the table readable. */
 	border: 1px solid #000;
 	padding: .5em;
@@ -324,18 +347,18 @@ version: 2.7.0
 }
 
 .sc-view p,
-fieldset,
-table,
-pre {
+.sc-view fieldset,
+.sc-view table,
+.sc-view pre {
 	/* So things don't run into each other. */
 	margin-bottom: 1em;
 }
 /* Opera requires 1px of passing to render with contemporary native chrome */
 .sc-view button,
-input[type="checkbox"],
-input[type="radio"],
-input[type="reset"],
-input[type="submit"] {
+.sc-view input[type="checkbox"],
+.sc-view input[type="radio"],
+.sc-view input[type="reset"],
+.sc-view input[type="submit"] {
 	padding:1px;
 }
 
@@ -443,4 +466,9 @@ input[type="submit"] {
 }
 
 
+.no-min-width {
+  min-width: 20px !important;
+}
+
+
 /* @end */