sproutcore 1.4.2-java → 1.4.3-java

data/lib/frameworks/sproutcore/frameworks/foundation/mixins/button.js

@@ -219,17 +219,17 @@ SC.Button = {
 
     var valueKey = this.getDelegateProperty('contentValueKey', del) ;
     if (valueKey && (key === valueKey || key === '*')) {
-      this.set('value', content ? content.get(valueKey) : null) ;
+      this.set('value', content ? (content.get ? content.get(valueKey) : content[valueKey]) : null) ;
     }
 
     var titleKey = this.getDelegateProperty('contentTitleKey', del) ;
     if (titleKey && (key === titleKey || key === '*')) {
-      this.set('title', content ? content.get(titleKey) : null) ;
+      this.set('title', content ? (content.get ? content.get(titleKey) : content[titleKey]) : null) ;
     }
 
     var iconKey = this.getDelegateProperty('contentIconKey', del);
     if (iconKey && (key === iconKey || key === '*')) {
-      this.set('icon', content ? content.get(iconKey) : null) ;
+      this.set('icon', content ? (content.get ? content.get(iconKey) : content[iconKey]) : null) ;
     }
     
     return this ;

data/lib/frameworks/sproutcore/frameworks/foundation/mixins/inline_text_field.js

@@ -54,7 +54,7 @@ sc_require('views/text_field') ;
   editor expects your source view to implement the InlineTextFieldViewDelegate
   protocol.
 
-  h2. Commiting or Discarding Changes
+  h2. Committing or Discarding Changes
   
   Normally the editor will automatically commit or discard its changes 
   whenever the user exits the edit mode.  If you need to force the editor to
@@ -66,13 +66,13 @@ sc_require('views/text_field') ;
   }}}
   
   Both methods will try to end the editing context and will call the 
-  relevent delegate methods on the delegate you passed to beginEditing().
+  relevant delegate methods on the delegate you passed to beginEditing().
   
   Note that it is possible an editor may not be able to commit editing 
   changes because either the delegate disallowed it or because its validator
   failed.  In this case commitEditing() will return NO.  If you want to
   end editing anyway, you can discard the editing changes instead by calling
-  discardEditing().  This method will generally suceed unless your delegate
+  discardEditing().  This method will generally succeed unless your delegate
   refuses it as well.
   
   @extends SC.TextFieldView
@@ -133,7 +133,9 @@ SC.InlineTextFieldView = SC.TextFieldView.extend(SC.DelegateSupport,
       throw "At least frame and delegate options are required for inline editor";
     }
     
-    this._originalValue = options.value || '' ;
+    this._originalValue = options.value;
+    if (SC.none(this._originalValue))
+      this._originalValue = "";
     this._multiline = (options.multiline !== undefined) ? options.multiline : NO ;
     if (this._multiline) {
       this.set('isTextArea', YES);
@@ -420,10 +422,11 @@ SC.InlineTextFieldView = SC.TextFieldView.extend(SC.DelegateSupport,
   // editable, begins editing.
   /** @private */
   insertTab: function(evt) {
+    var delegate = this._delegate; // removed by commitEditing()
     this.resignFirstResponder();
     this.commitEditing() ;
-    if(this._delegate){
-      var next = this._delegate.nextValidKeyView();
+    if(delegate){
+      var next = delegate.get('nextValidKeyView');
       if(next && next.beginEditing) next.beginEditing();
     }
     return YES ;
@@ -431,10 +434,12 @@ SC.InlineTextFieldView = SC.TextFieldView.extend(SC.DelegateSupport,
 
   /** @private */
   insertBacktab: function(evt) {
+    var delegate = this._delegate; // removed by commitEditing()
+    this.resignFirstResponder();
     this.commitEditing() ;
-    if(this._delegate){
-      var prev = this._delegate.previousValidKeyView();
-      if(prev) prev.beginEditing();
+    if(delegate){
+      var prev = delegate.get('previousValidKeyView');
+      if(prev && prev.beginEditing) prev.beginEditing();
     }
     return YES ;
   },

data/lib/frameworks/sproutcore/frameworks/foundation/system/datetime.js

@@ -893,7 +893,9 @@ SC.DateTime.mixin(SC.Comparable,
     @returns {DateTime} the DateTime corresponding to the string parameter
   */
   parse: function(str, fmt) {
-    var re = /(?:\%([aAbBcdHIjmMpSUWwxXyYZ\%])|(.))/g;
+    // Declared as an object not a literal since in some browsers the literal
+    // retains state across function calls
+    var re = new RegExp('(?:%([aAbBcdHIjmMpSUWwxXyYZ%])|(.))', "g");
     var d, parts, opts = {}, check = {}, scanner = SC.Scanner.create({string: str});
     
     if (SC.none(fmt)) fmt = SC.DATETIME_ISO8601;

data/lib/frameworks/sproutcore/frameworks/foundation/system/root_responder.js

@@ -1808,29 +1808,37 @@ SC.RootResponder = SC.Object.extend({
        } else {
          var lh = this._lastHovered || [] , nh = [] , exited, loc, len,
              view = this.targetViewForEvent(evt) ;
-
-         // work up the view chain.  Notify of mouse entered and
-         // mouseMoved if implemented.
-         while(view && (view !== this)) {
+         
+         // first collect all the responding view starting with the 
+         // target view from the given mouse move event
+         while (view && (view !== this)) {
+           nh.push(view);
+           view = view.get('nextResponder');
+         }
+        
+         // next exit views that are no longer part of the 
+         // responding chain
+         for (loc=0, len=lh.length; loc < len; loc++) {
+           view = lh[loc] ;
+           exited = view.respondsTo('mouseExited');
+           if (exited && nh.indexOf(view) === -1) {
+             view.tryToPerform('mouseExited', evt);
+           }
+         }
+         
+         // finally, either perform mouse moved or mouse entered depending on
+         // whether a responding view was or was not part of the last
+         // hovered views
+         for (loc=0, len=nh.length; loc < len; loc++) {
+           view = nh[loc];
            if (lh.indexOf(view) !== -1) {
              view.tryToPerform('mouseMoved', evt);
-             nh.push(view) ;
            } else {
              view.tryToPerform('mouseEntered', evt);
-             nh.push(view) ;
-           }
-
-           view = view.get('nextResponder');
-         }
-         // now find those views last hovered over that were no longer found
-         // in this chain and notify of mouseExited.
-         for(loc=0, len=lh.length; loc < len; loc++) {
-           view = lh[loc] ;
-           exited = view.respondsTo('mouseExited') ;
-           if (exited && !(nh.indexOf(view) !== -1)) {
-             view.tryToPerform('mouseExited',evt);
            }
          }
+
+         // Keep track of the view that were last hovered
          this._lastHovered = nh;
 
          // also, if a mouseDownView exists, call the mouseDragged action, if

data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_text_field/beginEditing.js

@@ -6,7 +6,7 @@
 // ==========================================================================
 /*global module test htmlbody ok equals same stop start Q$ */
 
-var pane, optionsForLabel1, optionsForLabel2, delegate;
+var pane, optionsForLabel1, optionsForLabel2, delegate, optionsForLabelFromView;
 
 pane = SC.ControlTestPane.design().add("label1", SC.LabelView, {
   value: 'Some Text',
@@ -50,6 +50,30 @@ pane.resetView = function(view) {
   view.set('notifiedDidBegin', NO);
 };
 
+
+optionsForLabelFromView = function(view) {
+  var el = view.$(),
+  f = SC.viewportOffset(el[0]),
+  frameTemp = view.convertFrameFromView(view.get('frame'), null);
+
+  f.width = frameTemp.width;
+  f.height = frameTemp.height;
+
+  var optionsForLabel = {
+    frame: f,
+    delegate: view,
+    exampleElement: view.$(),
+    value: view.get('value'),
+    multiline: view.get('isInlineEditorMultiline'),
+    isCollection: NO,
+    validator: view.get('validator'),
+    exampleInlineTextFieldView: view.get('exampleInlineTextFieldView')
+  };
+
+  return optionsForLabel;
+};
+
+
 /**
   
 */
@@ -64,41 +88,8 @@ module("Test the beginEditing() function of SC.InlineTextFieldView", {
     // Reset view1 delegate functions
     pane.resetView(view1);
 
-    var el = view1.$(),
-    f = SC.viewportOffset(el[0]),
-    frameTemp = view1.convertFrameFromView(view1.get('frame'), null);
-
-    f.width = frameTemp.width;
-    f.height = frameTemp.height;
-
-    optionsForLabel1 = {
-      frame: f,
-      delegate: view1,
-      exampleElement: view1.$(),
-      value: view1.get('value'),
-      multiline: view1.get('isInlineEditorMultiline'),
-      isCollection: NO,
-      validator: view1.get('validator'),
-      exampleInlineTextFieldView: view1.get('exampleInlineTextFieldView')
-    };
-
-    el = view2.$();
-    f = SC.viewportOffset(el[0]);
-    frameTemp = view2.convertFrameFromView(view2.get('frame'), null);
-
-    f.width = frameTemp.width;
-    f.height = frameTemp.height;
-
-    optionsForLabel2 = {
-      frame: f,
-      delegate: view2,
-      exampleElement: view2.$(),
-      value: view2.get('value'),
-      multiline: view2.get('isInlineEditorMultiline'),
-      isCollection: NO,
-      validator: view2.get('validator'),
-      exampleInlineTextFieldView: view2.get('exampleInlineTextFieldView')
-    };
+    optionsForLabel1 = optionsForLabelFromView(view1);
+    optionsForLabel2 = optionsForLabelFromView(view2);
   },
 
   teardown: function() {
@@ -225,3 +216,22 @@ function() {
 
   ok(view1.get('notifiedDidBegin'), "the delegate should have been notified of begin editing at this point");
 });
+
+test("inline editor does not display the defaultValue if the label's value is the number 0",
+function() {
+  var view1 = pane.view('label1');;
+  view1.set('value', 0);
+  optionsForLabel1 = optionsForLabelFromView(view1);
+
+  SC.RunLoop.begin();
+  SC.InlineTextFieldView.beginEditing(optionsForLabel1);
+  SC.RunLoop.end();
+
+  // The inline editor is the last view appended to the pane
+  var length = pane._pane.childViews.length,
+  editor = pane._pane.childViews[length - 1];
+  same(editor.get('value'), 0, "editor should have number 0 as value");
+  editor.blurEditor();
+
+  same(view1.get('value'), 0, "view should still have number 0 as value");
+});

data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/validatable/ui.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2010 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)
 // ==========================================================================
 
 /*global module test htmlbody ok equals same stop start */

data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/datetime.js

@@ -302,6 +302,11 @@ test('parse without a format uses default ISO8601', function() {
   equals(SC.DateTime.parse("2010-09-17T18:35:08Z").toISO8601(), "2010-09-17T18:35:08+00:00");
 });
 
+test('bad parsing', function() {
+  equals(SC.DateTime.parse(SC.DateTime.parse("foo")), null);
+  equals(SC.DateTime.parse("2010-09-17T18:35:08Z", SC.DATETIME_ISO8601).toISO8601(), "2010-09-17T18:35:08+00:00");
+});
+
 test('binding', function() {
   var fromObject = SC.Object.create({value: dt});
   var toObject = SC.Object.create({value: ''});

data/lib/frameworks/sproutcore/frameworks/foundation/tests/validators/not_empty.js

@@ -0,0 +1,56 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2010 Apple Inc. and contributors.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/*global module test equals context ok same */
+var notEmptyValidator, field;
+
+module("SC.Validator.NotEmpty", {
+    setup: function () {
+        notEmptyValidator = SC.Validator.NotEmpty.create();
+        field = SC.Object.create();
+    },
+    teardown: function () {
+        notEmptyValidator.destroy();
+        notEmptyValidator = null;
+    }
+});
+
+test("Recognizes a non-empty string as valid",function(){
+    field.set('fieldValue', "fnord");
+    var isValid = notEmptyValidator.validate(undefined, field);
+    ok(isValid, "Not empty string is valid");
+});
+
+test("Recognizes empty string as invalid",function(){
+    field.set('fieldValue', "");
+    var isValid = notEmptyValidator.validate(undefined, field);
+    ok( ! isValid, "Empty string is not valid");
+});
+
+test("Recognizes null as empty",function(){
+    field.set('fieldValue', null);
+    var isValid = notEmptyValidator.validate(undefined, field);
+    ok( ! isValid, "null string is not valid");
+});
+
+test("Recognizes undefined as empty",function(){
+    field.set('fieldValue', undefined);
+    var isValid = notEmptyValidator.validate(undefined, field);
+    ok( ! isValid, "null string is not valid");
+});
+
+test("Recognizes some number as non-empty",function(){
+    field.set('fieldValue', 42);
+    var isValid = notEmptyValidator.validate(undefined, field);
+    ok(isValid, "42 string is not empty");
+});
+
+test("Recognizes zero as non-empty",function(){
+    field.set('fieldValue', 0);
+    var isValid = notEmptyValidator.validate(undefined, field);
+    ok(isValid, "0 string is not empty");
+});
+

data/lib/frameworks/sproutcore/frameworks/foundation/validators/date_time.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 require('validators/validator');

data/lib/frameworks/sproutcore/frameworks/foundation/validators/not_empty.js

@@ -20,9 +20,13 @@ SC.Validator.NotEmpty = SC.Validator.extend(
   
   validate: function(form, field) {
     var value = field.get('fieldValue'); 
-    var ret = !!value ;
-    if (ret && value.length) ret = value.length > 0 ;
-    return ret ;
+    if (SC.none(value))
+      return NO;
+
+    if (! SC.none(value.length))
+      return value.length > 0;
+
+    return YES;
   },
   
   validateError: function(form, field) {

data/lib/frameworks/sproutcore/frameworks/foundation/views/label.js

@@ -208,7 +208,7 @@ SC.LabelView = SC.View.extend(SC.Control,
     if (!this.get('isEditable')) return NO ;
 
     var el = this.$(),
-        value = this.get('value') || '',
+        value = this.get('value'),
         f = SC.viewportOffset(el[0]),
         frameTemp = this.convertFrameFromView(this.get('frame'), null) ;
     f.width=frameTemp.width;

data/lib/frameworks/sproutcore/frameworks/media/views/audio.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 sc_require('views/controls');

data/lib/frameworks/sproutcore/frameworks/media/views/controls.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 /*globals SC */
 

data/lib/frameworks/sproutcore/frameworks/media/views/media_slider.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 /*globals SC */
 

data/lib/frameworks/sproutcore/frameworks/media/views/mini_controls.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 /*globals SC */
 

data/lib/frameworks/sproutcore/frameworks/media/views/simple_controls.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 /*globals SC */
 

data/lib/frameworks/sproutcore/frameworks/media/views/video.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 

data/lib/frameworks/sproutcore/frameworks/runtime/private/observer_set.js

@@ -51,7 +51,7 @@ SC.ObserverSet = {
     // context is really useful sometimes but not used that often so this
     // implementation is intentionally lazy.
     if (context !== undefined) {
-      if (!methods.contexts) context = methods.contexts = {} ;
+      if (!methods.contexts) methods.contexts = {} ;
       methods.contexts[SC.guidFor(method)] = context ;
     }
 

data/lib/frameworks/sproutcore/frameworks/runtime/system/object.js

@@ -782,6 +782,7 @@ function findClassNames() {
   SC._object_foundObjectClassNames = true ;
 
   var seen = [] ;
+  var detectedSC = false;
   var searchObject = function(root, object, levels) {
     levels-- ;
 
@@ -792,7 +793,12 @@ function findClassNames() {
     for(var key in object) {
       if (key == '__scope__') continue ;
       if (key == 'superclass') continue ;
+      if (key == '__SC__') key = 'SC' ;
       if (!key.match(/^[A-Z0-9]/)) continue ;
+      if (key == 'SC') {
+        if (detectedSC) continue;
+        detectedSC = true;
+      }
 
       var path = (root) ? [root,key].join('.') : key ;
       var value = object[key] ;
@@ -818,29 +824,18 @@ function findClassNames() {
     }
   } ;
 
+  // Fix for IE 7 and 8 in order to detect the SC global variable. When you create
+  // a global variable in IE, it is not added to the window object like in other
+  // browsers. Therefore the searchObject method will not pick it up. So we have to
+  // update the window object to have a reference to the global variable. And
+  // doing window['SC'] does not work since the global variable already exists. For
+  // any object that you create that is used act as a namespace, be sure to create it
+  // like so:
+  //
+  //   window.MyApp = window.MyApp || SC.Object.create({ ... })
+  //
+  window['__SC__'] = SC;
   searchObject(null, window, 2) ;
-
-  // Internet Explorer doesn't loop over global variables...
-  /*if ( SC.browser.isIE ) {
-    searchObject('SC', SC, 2) ; // get names for the SC classes
-
-    // get names for the model classes, including nested namespaces (untested)
-    for ( var i = 0; i < SC.Server.servers.length; i++ ) {
-      var server = SC.Server.servers[i];
-      if (server.prefix) {
-        for (var prefixLoc = 0; prefixLoc < server.prefix.length; prefixLoc++) {
-          var prefixParts = server.prefix[prefixLoc].split('.');
-          var namespace = window;
-          var namespaceName;
-          for (var prefixPartsLoc = 0; prefixPartsLoc < prefixParts.length; prefixPartsLoc++) {
-            namespace = namespace[prefixParts[prefixPartsLoc]] ;
-            namespaceName = prefixParts[prefixPartsLoc];
-          }
-          searchObject(namespaceName, namespace, 2) ;
-        }
-      }
-    }
-  }*/
 }
 
 /**  
@@ -875,7 +870,7 @@ SC.kindOf = function(scObject, scClass) {
   This method is used to allow classes to determine their own name.
 */
 SC._object_className = function(obj) {
-  if (!SC.isReady) return ''; // class names are not available until ready
+  if (SC.isReady === NO) return ''; // class names are not available until ready
   if (!obj._object_className) findClassNames() ;
   if (obj._object_className) return obj._object_className ;