sproutcore 1.5.0.pre.4 → 1.5.0.pre.4.1

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

@@ -160,15 +160,6 @@ SC.AutoResize = {
     this.measureSizeLater();
   },
   
-  /**
-    @private
-    When the view is appended to the document, various factors (such as class names)
-    could have changed, so it will need to be remeasured.
-  */
-  didAppendToDocument: function(){
-    this.measureSizeLater();
-  },
-  
   /**
     @private
     When the layer is first created, measurement will need to take place.

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

@@ -41,7 +41,7 @@
 */
 SC.Editable = {
   editorDelegate: null,
-  
+
   /**
     Indicates whether a view is editable or not.  You can optionally 
     implement the methods in this mixin to disallow editing is isEditable is

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

@@ -157,6 +157,7 @@ SC.FlowedLayout = {
     c.addObserver('useAbsoluteLayout', this, '_scfl_layoutPropertyDidChange');
     c.addObserver('calculatedWidth', this, '_scfl_layoutPropertyDidChange');
     c.addObserver('calculatedHeight', this, '_scfl_layoutPropertyDidChange');
+    c.addObserver('startsNewRow', this, '_scfl_layoutPropertyDidChange');
   },
   
   /**
@@ -168,6 +169,7 @@ SC.FlowedLayout = {
     c.removeObserver('useAbsoluteLayout', this, '_scfl_layoutPropertyDidChange');
     c.removeObserver('calculatedWidth', this, '_scfl_layoutPropertyDidChange');
     c.removeObserver('calculatedHeight', this, '_scfl_layoutPropertyDidChange');
+    c.removeObserver('startsNewRow', this, '_scfl_layoutPropertyDidChange');
   },
   
   /**

data/lib/frameworks/sproutcore/frameworks/foundation/render_delegates/canvas_image.js

@@ -68,7 +68,7 @@ SC.BaseTheme.canvasImageRenderDelegate = SC.RenderDelegate.create({
   update: function(dataSource, jquery) {
     var elem = jquery[0],
         image = dataSource.get('image'),
-        frame = dataSource.get('frame'),
+        frame = dataSource.view.get('frame'),
         frameWidth = frame.width,
         frameHeight = frame.height,
         innerFrame = dataSource.get('innerFrame'),

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

@@ -38,6 +38,13 @@ SC.BaseTheme.labelRenderDelegate = SC.RenderDelegate.create({
   name: 'label',
   
   render: function(dataSource, context) {
+    var view = dataSource.get('view'),
+        ariaLabeledBy;
+
+    if(view) {
+      ariaLabeledBy = view.get('ariaLabeledBy');
+    }
+
     // CONSIDER DEPRECATING THESE PROPERTIES BECAUSE THEY ARE
     // ANNOYING PAINS IN THE BUTT THAT EVERYONE HATES
     context.addStyle({
@@ -47,6 +54,11 @@ SC.BaseTheme.labelRenderDelegate = SC.RenderDelegate.create({
     
     context.setClass('ellipsis', dataSource.get('needsEllipsis') || NO);
     context.setClass('icon', dataSource.get('icon') || NO);
+
+    //addressing accessibility
+    if(ariaLabeledBy && ariaLabeledBy !== "") {
+      context.attr('aria-labelledby', ariaLabeledBy);
+    }
     
     var html = this._htmlForTitleAndIcon(dataSource);
     context.push(html);
@@ -58,6 +70,13 @@ SC.BaseTheme.labelRenderDelegate = SC.RenderDelegate.create({
   },
   
   update: function(dataSource, jquery) {
+    var view = dataSource.get('view'),
+        ariaLabeledBy;
+
+    if(view) {
+      ariaLabeledBy = view.get('ariaLabeledBy');
+    }
+
     // CONSIDER DEPRECATING THESE PROPERTIES BECAUSE THEY ARE
     // ANNOYING PAINS IN THE BUTT THAT EVERYONE HATES
     jquery.css({
@@ -66,7 +85,12 @@ SC.BaseTheme.labelRenderDelegate = SC.RenderDelegate.create({
     });
     
     jquery.setClass('ellipsis', dataSource.get('needsEllipsis') || NO);
-    
+
+    //addressing accessibility
+    if(ariaLabeledBy && ariaLabeledBy !== "") {
+      jquery.attr('aria-labelledby', ariaLabeledBy);
+    }
+
     var html = this._htmlForTitleAndIcon(dataSource);
     if (dataSource.get('renderState')._lastHTMLForTitleAndIcon !== html) {
       jquery.html(html);

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

@@ -0,0 +1,64 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+sc_require("system/task_queue");
+
+SC.chance = {
+
+  preload_task: SC.Task.create({
+    run: function(queue) {
+      var bank = SC.chance.bank, idx, len = bank.length, images = SC.chance.images;
+      for (idx = 0; idx < len; idx++) {
+        if (images.length < 1) {
+          return SC.chance.didPreloadImages();
+        }
+
+        var img = images.pop();
+        bank[idx].className = img;
+      }
+
+      // to force a break:
+      setTimeout(function(){
+        SC.run(function() {
+          SC.backgroundTaskQueue.push(SC.chance.preload_task);
+        });
+      }, 0);
+    }
+  }),
+
+
+  images: [],
+  bank: [],
+  PRELOAD_CONCURRENCY: 50,
+
+  preloadImages: function() {
+    if (window.CHANCE_SLICES) {
+      this.images = window.CHANCE_SLICES;
+    }
+
+    var bank = this.bank, idx, con = this.PRELOAD_CONCURRENCY;
+    for (idx = 0; idx < con; idx++) {
+      var img = document.createElement('div');
+      document.body.appendChild(img);
+      bank.push(img);
+    }
+
+    SC.run(function(){
+      SC.backgroundTaskQueue.push(SC.chance.preload_task);
+    });
+  },
+
+  didPreloadImages: function() {
+    var bank = this.bank, idx, len = bank.length;
+    for (idx = 0; idx < len; idx++) {
+      document.body.removeChild(bank[idx]);
+      bank[idx] = undefined;
+    }
+  }
+};
+
+SC.ready(SC.chance, 'preloadImages');

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

@@ -279,9 +279,17 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
       el.setAttribute('type', "text/javascript") ;
       el.setAttribute('src', url) ;
 
-      el.onload = function() {
-        SC.Module._moduleDidLoad(moduleName);
-      };
+      if (SC.browser.isIE) {
+        el.onreadystatechange = function() {
+          if (this.readyState == 'complete' || this.readyState == 'loaded') {
+            SC.Module._moduleDidLoad(moduleName);
+          }
+        };
+      } else {
+        el.onload = function() {
+          SC.Module._moduleDidLoad(moduleName);
+        };
+      }
 
       document.body.appendChild(el) ;
     }
@@ -479,7 +487,6 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
     var dependenciesMet;
     var callbacks, targets;
 
-
     if (log) console.log("SC.Module: Module '%@' finished loading.".fmt(moduleName));
 
     if (!module) {
@@ -510,38 +517,38 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
     }
   },
 
-	/**
-  	@private
+  /**
+    @private
 
-  	If necessary, converts a property path into a target object.
+    If necessary, converts a property path into a target object.
 
-  	@param {String|Object} targetName the string or object representing the target
-  	@returns Object
+    @param {String|Object} targetName the string or object representing the target
+    @returns Object
   */
-	_targetForTargetName: function(targetName){
-		if (SC.typeOf(targetName) === SC.T_STRING) {
-			return SC.objectForPropertyPath(targetName);
-		}
+  _targetForTargetName: function(targetName){
+    if (SC.typeOf(targetName) === SC.T_STRING) {
+      return SC.objectForPropertyPath(targetName);
+    }
 
-		return targetName;
-	},
+    return targetName;
+  },
 
-	/**
-  	@private
+  /**
+    @private
 
-  	If necessary, converts a property path into a method object.
+    If necessary, converts a property path into a method object.
 
-  	@param {String|Object} methodName the string or object representing the method
-  	@param {Object} target the target from which to retrieve the method
-  	@returns Object
+    @param {String|Object} methodName the string or object representing the method
+    @param {Object} target the target from which to retrieve the method
+    @returns Object
   */
-	_methodForMethodNameInTarget: function(methodName, target){
-		if (SC.typeOf(methodName) === SC.T_STRING) {
-			return SC.objectForPropertyPath(methodName, target);
-		}
+  _methodForMethodNameInTarget: function(methodName, target){
+    if (SC.typeOf(methodName) === SC.T_STRING) {
+      return SC.objectForPropertyPath(methodName, target);
+    }
 
-		return methodName;
-	}
+    return methodName;
+  }
 });
 
 /**

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

@@ -0,0 +1,42 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Apple Inc. and contributors.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/*global module test equals context ok same */
+
+htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
+
+
+var pane = SC.ControlTestPane.design()
+  .add("aria-role", SC.FieldView.extend(SC.StaticLayout, SC.Editable, 
+    {
+      localize: YES
+    })
+  )
+
+  .add("aria-multiline", SC.FieldView.extend(SC.StaticLayout, SC.Editable, 
+    {
+      isTextArea: YES
+    })
+  );
+
+pane.show();
+module('SC.Editable ui', {
+  setup: function() {
+    var view = pane.view('aria-role');
+  }
+});
+
+test("should have role as textbox", function() {
+  var view = pane.view('aria-role');
+  var label = view.$();  
+  equals(label.attr('role'), 'textbox', 'role should be textbox');
+});
+
+test("should have aria-multiline as YES", function() {
+  var view = pane.view('aria-multiline');
+  var label = view.$();  
+  equals(label.attr('aria-multiline'), 'true', 'aria-multiline should be true');
+});

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

@@ -0,0 +1,62 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Apple Inc. and contributors.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/*global module test equals context ok same */
+
+htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
+
+
+var pane = SC.ControlTestPane.design()
+  .add("aria-role", SC.InlineTextFieldView.extend({
+      localize: YES
+    })
+  )
+
+  .add("aria-multiline", SC.InlineTextFieldView.extend({
+      isTextArea: YES
+    })
+  )
+  
+  .add("aria-disabled", SC.InlineTextFieldView.extend({
+      isEnabled: NO
+    })
+  )
+  
+  .add("aria-invalid", SC.InlineTextFieldView.extend({
+      value: SC.Error.create({errorValue:'Error Message'})
+    })
+  );
+pane.show();
+
+module('SC.InlineTextFieldView ui', {
+  setup: function() {
+    var view = pane.view('aria-role');
+  }
+});
+
+test("should have role as textbox", function() {
+  var view = pane.view('aria-role');
+  var label = view.$();  
+  equals(label.attr('role'), 'textbox', 'role should be textbox');
+});
+
+test("should have aria-multiline as YES", function() {
+  var view = pane.view('aria-multiline');
+  var label = view.$();  
+  equals(label.attr('aria-multiline'), 'true', 'aria-multiline should be true');
+});
+
+test("should have aria-disabled as YES", function() {
+  var view = pane.view('aria-disabled');
+  var label = view.$();  
+  equals(label.attr('aria-disabled'), 'true', 'aria-disabled should be true');
+});
+
+test("should have aria-invalid as YES", function() {
+  var view = pane.view('aria-invalid');
+  var label = view.$();
+  equals(label.attr('aria-invalid'), 'true', 'aria-invalid should be true');
+});

data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/image/ui.js

@@ -99,14 +99,6 @@ htmlbody('<style></style>');
     stop();
   });
 
-  test("Verify sprite image class", function() {
-    var imageView = pane.view('sprite_image'),
-        imgEl;
-
-    imgEl = imageView.$('img');
-
-    ok(imgEl.hasClass('sprite-class'), "The class value should be on the img element");
-  });
 
   test("Verify canvas rendering and properties", function() {
     var view = pane.view('image_canvas'),

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

@@ -71,6 +71,13 @@ var pane = SC.ControlTestPane.design()
   .add("editable", SC.LabelView, { 
      value: "double click me",
      isEditable: YES
+  })
+
+  .add("aria-labelledby", SC.LabelView, { 
+     value: "aria-labelledby",
+     fontWeight: SC.BOLD_WEIGHT,
+     height: 16,
+     ariaLabeledBy: 'Label View'
   });
 
 pane.show(); // add a test to show the test pane
@@ -90,6 +97,7 @@ test("Check that all Label are visible", function() {
   ok(pane.view('bold').get('isVisibleInWindow'), 'title,toolTip.isVisibleInWindow should be YES');
   ok(pane.view('bold height').get('isVisibleInWindow'), 'title,toolTip.isVisibleInWindow should be YES');
   ok(pane.view('editable').get('isVisibleInWindow'), 'title,toolTip.isVisibleInWindow should be YES');
+  ok(pane.view('aria-labelledby').get('isVisibleInWindow'), 'aria-labelledby isVisibleInWindow should be YES');
 });
   
 
@@ -154,4 +162,8 @@ test("Check that the title is set or not and if it is in the appropriate element
 
 });
 
+test("Check that the aria-labelledby is set to Label View", function() {
+  var viewElem=pane.view('aria-labelledby').$();
+  equals(viewElem.attr('aria-labelledby'), 'Label View', 'should have value set to Label view');
+});
 })();

data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/text_field/ui.js

@@ -54,9 +54,33 @@
     value: 'John Doe',
     isTextArea: YES,
     isEnabled: NO
-  });
+  })
   
+  .add("aria-role", SC.TextFieldView, {
+    hint: "Full Name", 
+    value: 'John Doe',
+    isTextArea: YES,
+    isEnabled: YES
+  })
+
+  .add("aria-multiline", SC.TextFieldView, {
+    hint: "Full Name", 
+    value: 'John Doe',
+    isTextArea: YES,
+    isEnabled: YES
+  })
   
+  .add("aria-disabled",SC.TextFieldView, {
+    hint: "Full Name", 
+    value: 'John Doe',
+    isTextArea: YES,
+    isEnabled: NO
+  })
+
+  .add("aria-invalid", SC.TextFieldView, {
+      value: SC.Error.create({errorValue:'Error Message'}),
+      isEnabled: YES
+  });
     
 pane.show(); // add a test to show the test pane
 
@@ -527,4 +551,27 @@ test("editing a field should not change the cursor position", function() {
   ok(selection.get('start') == 2 && selection.get('end') == 3, 'cursor position should be unchanged');
 });
 
+test("should have role as textbox", function() {
+  var view = pane.view('aria-role');
+  var label = view.$();  
+  equals(label.attr('role'), 'textbox', 'role should be textbox');
+});
+
+test("should have aria-multiline as YES", function() {
+  var view = pane.view('aria-multiline');
+  var label = view.$();  
+  equals(label.attr('aria-multiline'), 'true', 'aria-multiline should be true');
+});
+
+test("should have aria-disabled as YES", function() {
+  var view = pane.view('aria-disabled');
+  var label = view.$();  
+  equals(label.attr('aria-disabled'), 'true', 'aria-disabled should be true');
+});
+
+test("should have aria-invalid as YES", function() {
+  var view = pane.view('aria-invalid');
+  var label = view.$();
+  equals(label.attr('aria-invalid'), 'true', 'aria-invalid should be true');
+});
 })();