sproutcore 1.5.0.pre.3 → 1.5.0.pre.4

data/lib/frameworks/sproutcore/apps/greenhouse/states/ready.js

@@ -73,6 +73,31 @@ Greenhouse.mixin( /** @scope Greenhouse */{
         view.set('classNames', []);
         view.set('layout', SC.merge({centerX:0, centerY: 0}, s));
       }
+      // ..........................................................
+      // Wait for the view to re-draw and update the webViewFrame
+      // 
+      SC.run(function(){
+        var dropViewFrame,
+          webView = Greenhouse.appPage.get('webView'),
+          pv = webView.get('parentView'),
+          webViewFrame = webView.get('frame');
+          console.log(webViewFrame);
+          
+          webViewFrame = pv.convertFrameToView(webViewFrame, null);
+          
+          console.log(webViewFrame);
+          //add the drop container to the adjusted layout
+          pv = view.get('parentView');
+          dropViewFrame = pv.convertFrameToView(view.get('frame'), null);
+          if(dropViewFrame){
+            webViewFrame.x += dropViewFrame.x;
+            webViewFrame.y += dropViewFrame.y;
+          }
+          console.log(Greenhouse._webViewFrame);
+          //update 
+          Greenhouse._webViewFrame = webViewFrame;
+          console.log(Greenhouse._webViewFrame);
+      });
 
     },
     // ..........................................................
@@ -138,7 +163,8 @@ Greenhouse.mixin( /** @scope Greenhouse */{
         var designer = Greenhouse.designController.get('content');
 
         if(designer){
-          designer.designProperties.pushObject("newProperty"); //TODO: generate better name....
+          this._propertyCount = this._propertyCount ? this._propertyCount+1 : 1;
+          designer.designProperties.pushObject("newProperty"+this._propertyCount); //TODO: generate better name....
           designer.propertyDidChange('editableProperties');
         }
       },

data/lib/frameworks/sproutcore/apps/greenhouse/tests/views/list_item.js

@@ -13,3 +13,4 @@ test("test description", function() {
   equals(result, expected, "test should equal test");
 });
 
+

data/lib/frameworks/sproutcore/apps/greenhouse/tests/views/plist_item.js

@@ -0,0 +1,20 @@
+// ==========================================================================
+// Project:   Greenhouse.PlistItem Unit Test
+// Copyright: ©2010 Mike Ball
+// ==========================================================================
+/*globals Greenhouse module test ok equals same stop start */
+require('views/plist_item');
+var pane = SC.ControlTestPane.design({ height: 32 })
+  .add("basic", SC.PlistItemView.design({ 
+  }));
+
+pane.show();
+
+window.pane = pane ;
+
+module("Greenhouse.PlistItem",pane.standardSetup());
+
+test("basic", function() {
+  var view = pane.view('basic');
+  ok(view.get('isVisibleInWindow'),"basic rendering");
+});

data/lib/frameworks/sproutcore/apps/greenhouse/theme.js

@@ -0,0 +1,25 @@
+// ==========================================================================
+// Project:   Greenhouse
+// Copyright: ©2011 Mike Ball
+// ==========================================================================
+/*globals Greenhouse */
+Greenhouse.Theme = SC.AceTheme.create({
+ 
+  // This name will identify the theme. Make it good. :)
+  name: 'greenhouse'
+});
+ 
+// Tell SproutCore about your theme
+SC.Theme.addTheme(Greenhouse.Theme);
+ 
+// Make it the default theme
+SC.defaultTheme = 'greenhouse';
+
+
+Greenhouse.Theme.Well.containerRenderDelegate = SC.Object.create({
+  name: 'container',
+  
+  render: function(dataSource, context) {},
+  
+  update: function() {}
+});

data/lib/frameworks/sproutcore/apps/greenhouse/views/plist_item.js

@@ -8,32 +8,169 @@
   This class is here to receive custom editor events
   @extends SC.View
 */
-Greenhouse.PlistItemView = SC.ListItemView.extend(
+Greenhouse.PlistItemView = SC.View.extend(SC.Control,
 /** @scope Greenhouse.ListItem.prototype */ {
  
+  classNames: ['sc-list-item-view'],
  
- render: function(context, firstTime){
-   var content = this.get('content'),
-       del     = this.displayDelegate,
-       key, value;
-   
-   // handle label -- always invoke
-   key = this.getDelegateProperty('contentValueKey', del) ;
-   value = (key && content) ? (content.get ? content.get(key) : content[key]) : content ;
-   if (value && SC.typeOf(value) !== SC.T_STRING) value = value.toString();
-   if (this.get('escapeHTML')) value = SC.RenderContext.escapeHTML(value);
-   value = value + ": " + content.get('value');
-   
-   this.renderLabel(context, value);
-   
-   //this.renderValue(context, content);
- },
  
- renderValue: function(context, content){
-   
-   context.begin('span')
-     .addStyle({left: '50%'})
-     .push(content.get('value'))
-   .end();
- }
+  contentValueKey: 'key',
+ 
+  _valueStyle: {position: 'absolute', right: 5, top: '50%', height: 18, marginTop: -9, left: 'auto'},
+ 
+  render: function(context, firstTime){
+    var content = this.get('content'),
+       key, propertyKey, value, displayValue;
+    
+    if(firstTime){
+      // handle label -- always invoke
+      key = this.get('contentValueKey');
+      propertyKey = (key && content) ? (content.get ? content.get(key) : content[key]) : content ;
+      value = content.get('value');
+      
+      //do the label
+      context.begin('label').addStyle({paddingLeft: 5}).text(propertyKey).end();
+      if(value !== undefined){
+       if(SC.typeOf(value) === SC.T_STRING){
+          context.begin('span').addStyle(this._valueStyle).text(value).end();
+       }
+       else if(SC.typeOf(value) === SC.T_BOOL){
+         this.renderCheckbox(context,content.get('value'));
+         //context.begin('span').addStyle(this._valueStyle).text("bool").end();
+       }
+       else{
+         value = value.toString();
+         context.begin('span').addStyle(this._valueStyle).text(value).end();
+         
+       }
+      }
+      else{
+        console.log(value);
+        context.begin('span').addStyle(this._valueStyle).text("unknown").end();
+      }
+      
+    }
+    else{
+      if(this._checkboxRenderSource){
+        var source = this._checkboxRenderSource;
+        this._checkboxRenderDelegate.update(source, this.$('.sc-checkbox-view'));
+      }
+    }
+  },
+  
+  mouseDown: function(evt){
+    if (this._isInsideElementWithClassName('sc-checkbox-view',evt)) {
+      this._addCheckboxActiveState() ;
+      this._isMouseDownOnCheckbox = YES ;
+      this._isMouseInsideCheckbox = YES ;
+      return true ; 
+    }
+    return false;
+  },
+  
+  mouseUp: function(evt) {
+    var ret= false,  content, state, idx, set;
+
+    // if mouse was down in checkbox -- then handle mouse up, otherwise 
+    // allow parent view to handle event.
+    if (this._isMouseDownOnCheckbox) {
+
+      // update only if mouse inside on mouse up...
+      if (this._isInsideElementWithClassName('sc-checkbox-view',evt)) {
+        content = this.get('content') ;
+        if (content && content.view && content.view.get) {
+          var value = content.view.get(content.get('key')) ;
+          value = (value === SC.MIXED_STATE) ? YES : !value ;
+          content.view.set(content.get('key'), value); // update view
+          this._checkboxRenderSource.set('isSelected', value);
+          
+          this.displayDidChange(); // repaint view...
+        }
+        ret = true;
+      }
+      this._removeCheckboxActiveState() ;
+      
+    }
+    this._isMouseDownOnCheckbox = this._isMouseInsideCheckbox = false;
+    return ret;
+  },
+  // ..........................................................
+  // adapted from list item view
+  // 
+  renderCheckbox: function(context, state) {
+    var renderer = this.get('theme').checkboxRenderDelegate;
+
+    // note: checkbox-view is really not the best thing to do here; we should do
+    // sc-list-item-checkbox; however, themes expect something different, unfortunately.
+    context = context.begin('div')
+     .addStyle(this._valueStyle)
+     .addClass('sc-checkbox-view')
+     .addClass('sc-regular-size')
+     .addClass(this.get('theme').classNames)
+     .addClass(renderer.get('name'));
+
+    var source = this._checkboxRenderSource;
+    if (!source) {
+      source = this._checkboxRenderSource = 
+      SC.Object.create({ renderState: {}, theme: this.get('theme')});
+    }
+
+    source
+     .set('isSelected', state && (state !== SC.MIXED_STATE))
+     .set('isEnabled', this.get('isEnabled'))
+     .set('isActive', this._checkboxIsActive)
+     .set('title', '');
+
+    renderer.render(source, context);
+    context = context.end();
+
+    this._checkboxRenderDelegate = renderer;
+  },
+  /** 
+    Determines if the event occured inside an element with the specified
+    classname or not.
+  */
+  _isInsideElementWithClassName: function(className, evt) {
+    var layer = this.get('layer');
+    if (!layer) return NO ; // no layer yet -- nothing to do
+    
+    var el = SC.$(evt.target) ;
+    var ret = NO, classNames ;
+    while(!ret && el.length>0 && (el[0] !== layer)) {
+      if (el.hasClass(className)) ret = YES ;
+      el = el.parent() ;
+    }
+    el = layer = null; //avoid memory leaks
+    return ret ;
+  },
+  // ..........................................................
+  // checkbox helpers...
+  // 
+  _addCheckboxActiveState: function() {
+    if (this.get('isEnabled')) {
+      if (this._checkboxRenderDelegate) {
+        var source = this._checkboxRenderSource;
+
+        source.set('isActive', YES);
+        
+        this._checkboxRenderDelegate.update(source, this.$('.sc-checkbox-view'));
+      } else {
+        // for backwards-compatibility.
+        this.$('.sc-checkbox-view').addClass('active');
+      }
+    }
+  },
+  
+  _removeCheckboxActiveState: function() {
+    if (this._checkboxRenderSource) {
+      var source = this._checkboxRenderSource;
+
+      source.set('isActive', NO);
+      
+      this._checkboxRenderDelegate.update(source, this.$('.sc-checkbox-view'));
+    } else {
+      // for backwards-compatibility.
+      this.$('.sc-checkbox-view').removeClass('active');
+    }
+  }
 });

data/lib/frameworks/sproutcore/apps/greenhouse/views/tear_off_picker.js

@@ -26,7 +26,7 @@ Greenhouse.TearOffPicker = SC.PickerPane.extend(
       Greenhouse.eventBlocker.set('isVisible', NO);
       this._blockedIframe = NO;
     }
-    return sc_super();
+    return YES;
   },
   
   mouseDown: function(evt) {

data/lib/frameworks/sproutcore/frameworks/bootstrap/system/browser.js

@@ -5,31 +5,43 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-var SC = SC || { MODULE_INFO: {}, LAZY_INSTANTIATION: {} };
-
-SC._detectBrowser = function(rawUserAgent, language) {
-  if (rawUserAgent === undefined) rawUserAgent = navigator.userAgent;
-  if (language === undefined) language = navigator.language || navigator.browserLanguage;
-
-  var userAgent = rawUserAgent.toLowerCase(),
-      // Gibberish at the end is to determine when the browser version is done
-      version = (userAgent.match( /.*(?:rv|chrome|webkit|opera|ie)[\/: ](.+?)([ \);]|$)/ ) || [])[1],
-      webkitVersion = (userAgent.match( /webkit\/(.+?) / ) || [])[1];
-
-  var browser = {
-    version:      version,
-    safari:       /webkit/.test(userAgent) ? webkitVersion : 0,
-    opera:        /opera/.test(userAgent) ? version : 0,
-    msie:         /msie/.test(userAgent) && !/opera/.test(userAgent) ? version : 0,
-    mozilla:      /mozilla/.test( userAgent ) && !/(compatible|webkit)/.test(userAgent) ? version : 0,
-    mobileSafari: /apple.*mobile.*safari/.test(userAgent) ? version : 0,
-    chrome:       /chrome/.test( userAgent ) ? version : 0,
-    windows:      !!/windows/.test(userAgent),
-    mac:          !!/macintosh/.test(userAgent) || (/mac os x/.test(userAgent) && !/like mac os x/.test(userAgent)),
-    language:     language.split('-', 1)[0]
-  };
-
-  browser.current = browser.msie ? 'msie' : browser.mozilla ? 'mozilla' : browser.chrome ? 'chrome' : browser.safari ? 'safari' : browser.opera ? 'opera' : 'unknown' ;
+window.SC = window.SC || { MODULE_INFO: {}, LAZY_INSTANTIATION: {} };
+
+SC._detectBrowser = function(userAgent, language) {
+  var version, webkitVersion, browser = {};
+
+  userAgent = (userAgent || navigator.userAgent).toLowerCase();
+  language = language || navigator.language || navigator.browserLanguage;
+
+  // Gibberish at the end is to determine when the browser version is done
+  version = browser.version = (userAgent.match( /.*(?:rv|chrome|webkit|opera|ie)[\/: ](.+?)([ \);]|$)/ ) || [])[1];
+  webkitVersion = (userAgent.match( /webkit\/(.+?) / ) || [])[1];
+
+  // Platforms -- these should probably be moved to another object
+  // We test for these first because it is helpful when determining browsers below
+  browser.windows = !!/windows/.test(userAgent);
+  browser.mac = !!/macintosh/.test(userAgent) || (/mac os x/.test(userAgent) && !/like mac os x/.test(userAgent));
+  browser.iOS = !!/iphone|ipod|ipad/.test(userAgent);
+  browser.android = !!/android/.test(userAgent);
+
+  // IE-based browsers
+  browser.opera = /opera/.test(userAgent) ? version : 0;
+  browser.msie = /msie/.test(userAgent) && !browser.opera ? version : 0;
+
+  // Mozilla browsers
+  browser.mozilla = /mozilla/.test(userAgent) && !/(compatible|webkit|msie)/.test(userAgent) ? version : 0;
+
+  // Webkit-based browsers
+  browser.webkit = /webkit/.test(userAgent) ? webkitVersion : 0;
+  browser.chrome = /chrome/.test(userAgent) ? version: 0;
+  browser.mobileSafari = /apple.*mobile.*safari/.test(userAgent) && browser.iOS ? webkitVersion : 0;
+  // this is a stupid test -- anything that aren't the following doesn't necessarily mean Safari
+  browser.safari = browser.webkit && !browser.chrome && !browser.iOS && !browser.android ? webkitVersion : 0;
+
+  // Language
+  browser.language = language.split('-', 1)[0];
+
+  browser.current = browser.msie ? 'msie' : browser.mozilla ? 'mozilla' : browser.chrome ? 'chrome' : browser.safari ? 'safari' : browser.opera ? 'opera' : browser.mobileSafari ? 'mobile-safari' : 'unknown' ;
   return browser ;
 };
 

data/lib/frameworks/sproutcore/frameworks/bootstrap/tests/system/browser.js

@@ -5,47 +5,155 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
+var cleanBrowser = {
+  version: 0,
+  windows: 0,
+  mac: 0,
+  iOS: 0,
+  android: 0,
+  opera: 0,
+  msie: 0,
+  mozilla: 0,
+  webkit: 0,
+  chrome: 0,
+  mobileSafari: 0,
+  safari: 0
+};
+
+// quick and dirty function to combine passed browser props
+// with cleanBrowser
+function combine(hash) {
+  var ret = {},
+      key;
+  
+  for (key in cleanBrowser) {
+    if (!cleanBrowser.hasOwnProperty(key)) continue;
+    ret[key] = cleanBrowser[key];
+  }
+  
+  for (key in hash) {
+    if (!hash.hasOwnProperty(key)) continue;
+    ret[key] = hash[key];
+  }
+  
+  return ret;
+}
+
 function testUserAgent(userAgent, matchers) {
   var browser = SC._detectBrowser(userAgent), key;
-  for (key in matchers) equals(browser[key], matchers[key], "'"+key+"' should be '"+matchers[key]+"'");
+  matchers = combine(matchers);
+  for (key in matchers) equals(browser[key], matchers[key], "'" + key + "' should be '" + matchers[key] + "'");
 }
 
-test("Chrome", function() {
+test("Chrome Mac 9.0.572.1 with Webkit v534.12", function() {
   var userAgent = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_5; en-US) AppleWebKit/534.12 (KHTML, like Gecko) Chrome/9.0.572.1 Safari/534.12";
-  testUserAgent(userAgent, { version: '9.0.572.1', chrome: '9.0.572.1', safari: '534.12', current: 'chrome' });
+  testUserAgent(userAgent, { version: '9.0.572.1', chrome: '9.0.572.1', webkit: '534.12', current: 'chrome', mac: true });
 });
 
-test("Safari", function() {
+test("Safari Windows with Webkit v533.18.1", function() {
   var userAgent = "Mozilla/5.0 (Windows; U; Windows NT 6.1; zh-HK) AppleWebKit/533.18.1 (KHTML, like Gecko) Version/5.0.2 Safari/533.18.5";
-  testUserAgent(userAgent, { version: '533.18.1', safari: '533.18.1', current: 'safari' });
+  testUserAgent(userAgent, { version: '533.18.1', safari: '533.18.1', webkit: '533.18.1', current: 'safari', windows: true });
 });
 
-test("Opera", function() {
-  var userAgent;
-  userAgent = "Opera/9.00 (X11; Linux i686; U; pl)";
+test("Safari Mac with Webkit v533.19.4", function() {
+  var userAgent = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_6; en-us) AppleWebKit/533.19.4 (KHTML, like Gecko) Version/5.0.3 Safari/533.19.4";
+  testUserAgent(userAgent, { version: '533.19.4', safari: '533.19.4', webkit: '533.19.4', current: 'safari', mac: true });
+});
+
+test("Safari Windows with Webkit v533.19.4", function() {
+  var userAgent = "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-us) AppleWebKit/533.19.4 (KHTML, like Gecko) Version/5.0.3 Safari/533.19.4";
+  testUserAgent(userAgent, { version: '533.19.4', safari: '533.19.4', webkit: '533.19.4', current: 'safari', windows: true });
+});
+
+test("Opera Linux 9.0", function() {
+  var userAgent = "Opera/9.00 (X11; Linux i686; U; pl)";
   testUserAgent(userAgent, { version: '9.00', opera: '9.00', current: 'opera' });
+});
 
-  userAgent = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) Opera 8.65 [en]";
-  testUserAgent(userAgent, { version: '8.65', opera: '8.65', current: 'opera' });
+test("Opera Windows 8.65", function() {
+  var userAgent = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) Opera 8.65 [en]";
+  testUserAgent(userAgent, { version: '8.65', opera: '8.65', current: 'opera', windows: true });
 });
 
-test("MSIE", function() {
+test("Opera Mac 10.62", function() {
+  var userAgent = "Opera/9.80 (Macintosh; Intel Mac OS X; U; en) Presto/2.6.30 Version/10.62";
+  testUserAgent(userAgent, { version: '9.80', opera: '9.80', current: 'opera', mac: true });
+});
+
+test("Opera Windows 10.62", function() {
+  var userAgent = "Opera/9.80 (Windows NT 6.1; U; en) Presto/2.6.30 Version/10.62";
+  testUserAgent(userAgent, { version: '9.80', opera: '9.80', current: 'opera', windows: true });
+});
+
+test("Internet Explorer 7.0", function() {
+  var userAgent = "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)";
+  testUserAgent(userAgent, { version: '7.0', msie: '7.0', current: 'msie', windows: true });
+});
+
+test("Internet Explorer 8.0", function() {
+  var userAgent = "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0)";
+  testUserAgent(userAgent, { version: '8.0', msie: '8.0', current: 'msie', windows: true });
+});
+
+test("Internet Explorer 9.0", function() {
   var userAgent = "Mozilla/5.0 (Windows; U; MSIE 9.0; Windows NT 9.0; en-US))";
-  testUserAgent(userAgent, { version: '9.0', msie: '9.0', current: 'msie' });
+  testUserAgent(userAgent, { version: '9.0', msie: '9.0', current: 'msie', windows: true });
 });
 
-test("Mozilla", function() {
+test("Mozilla Windows 2.0b4", function() {
   var userAgent;
   userAgent = "Mozilla/5.0 (Windows; U; Windows NT 6.1; it; rv:2.0b4) Gecko/20100818";
-  testUserAgent(userAgent, { version: '2.0b4', mozilla: '2.0b4', current: 'mozilla' });
+  testUserAgent(userAgent, { version: '2.0b4', mozilla: '2.0b4', current: 'mozilla', windows: true });
+});
 
-  userAgent = "Mozilla/5.0 (Windows NT 6.1; rv:2.0b7pre) Gecko/20100921 Firefox/4.0b7pre";
-  testUserAgent(userAgent, { version: '2.0b7pre', mozilla: '2.0b7pre', current: 'mozilla' });
+test("Firefox Mac 3.5.13", function() {
+  var userAgent = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.1.13) Gecko/20100914 Firefox/3.5.13";
+  testUserAgent(userAgent, { version: '1.9.1.13', mozilla: '1.9.1.13', current: 'mozilla', mac: true });
 });
 
-test("Mobile Safari", function() {
+test("Firefox Windows 3.5.13", function() {
+  var userAgent = "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.13) Gecko/20100914 Firefox/3.5.13";
+  testUserAgent(userAgent, { version: '1.9.1.13', mozilla: '1.9.1.13', current: 'mozilla', windows: true });
+});
+
+test("Firefox Mac 3.6.10", function() {
+  var userAgent = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.10) Gecko/20100914 Firefox/3.6.10";
+  testUserAgent(userAgent, { version: '1.9.2.10', mozilla: '1.9.2.10', current: 'mozilla', mac: true });
+});
+
+test("Firefox Windows 3.6.10", function() {
+  var userAgent = "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.10) Gecko/20100914 Firefox/3.6.10";
+  testUserAgent(userAgent, { version: '1.9.2.10', mozilla: '1.9.2.10', current: 'mozilla', windows: true });
+});
+
+test("Firefox Windows 4.0b7pre", function() {
+  var userAgent = "Mozilla/5.0 (Windows NT 6.1; rv:2.0b7pre) Gecko/20100921 Firefox/4.0b7pre";
+  testUserAgent(userAgent, { version: '2.0b7pre', mozilla: '2.0b7pre', current: 'mozilla', windows: true });
+});
+
+test("Mobile Safari - iOS 3.2.2 iPad", function() {
+  var userAgent = "Mozilla/5.0 (iPad; U; CPU OS 3_2_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B500 Safari/531.21.10";
+  testUserAgent(userAgent, { version: '531.21.10', webkit: '531.21.10', mobileSafari: '531.21.10', current: 'mobile-safari', iOS: true });
+});
+
+test("Mobile Safari - iOS 4.0", function() {
   var userAgent = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7";
-  testUserAgent(userAgent, { version: '532.9', safari: '532.9', mobileSafari: '532.9', current: 'safari' });
+  testUserAgent(userAgent, { version: '532.9', webkit: '532.9', mobileSafari: '532.9', current: 'mobile-safari', iOS: true });
+});
+
+test("Mobile Safari - iOS 4.1", function() {
+  var userAgent = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B117 Safari/6531.22.7";
+  testUserAgent(userAgent, { version: '532.9', webkit: '532.9', mobileSafari: '532.9', current: 'mobile-safari', iOS: true });
+});
+
+test("iOS WebView - iOS 4.1", function() {
+  var userAgent = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Mobile/8B117";
+  testUserAgent(userAgent, { version: '532.9', webkit: '532.9', current: 'unknown', iOS: true });
+});
+
+test("iOS WebView - iOS 4.2.1", function() {
+  var userAgent = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_2_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Mobile/8C14";
+  testUserAgent(userAgent, { version: '533.17.9', webkit: '533.17.9', current: 'unknown', iOS: true });
 });
 
 test("Unknown", function() {
@@ -53,18 +161,19 @@ test("Unknown", function() {
   testUserAgent(userAgent, { version: undefined, current: 'unknown' });
 });
 
-test("Windows", function(){
+test("Windows - using Safari with Webkit v533.17.8", function(){
   var userAgent = "Mozilla/5.0 (Windows; U; Windows NT 5.2; en-US) AppleWebKit/533.17.8 (KHTML, like Gecko) Version/5.0.1 Safari/533.17.8";
-  testUserAgent(userAgent, { windows: true });
+  testUserAgent(userAgent, { windows: true, version: '533.17.8', safari: '533.17.8', webkit: '533.17.8' });
 });
 
-test("Mac", function(){
-  var userAgent;
-  userAgent = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_5; en-US) AppleWebKit/534.12 (KHTML, like Gecko) Chrome/9.0.572.1 Safari/534.12";
-  testUserAgent(userAgent, { mac: true });
+test("Mac - using Chrome 9.0.572.1 with Webkit v534.12", function(){
+  var userAgent = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_5; en-US) AppleWebKit/534.12 (KHTML, like Gecko) Chrome/9.0.572.1 Safari/534.12";
+  testUserAgent(userAgent, { mac: true, version: '9.0.572.1', chrome: '9.0.572.1', webkit: '534.12', current: 'chrome' });
+});
 
-  userAgent = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7";
-  testUserAgent(userAgent, { mac: false });
+test("Android - using Samsung Galaxy S on Android 2.1", function() {
+  var userAgent = "Mozilla/5.0 (Linux; U; Android 2.1-update1; en-us; SCH-I500 Build/ECLAIR) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17";
+  testUserAgent(userAgent, {android: true, version: '530.17', webkit: '530.17'});
 });
 
 test("Language", function(){

data/lib/frameworks/sproutcore/frameworks/{amber → core_foundation}/controllers/object.js

@@ -5,7 +5,7 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-require('controllers/controller') ;
+sc_require('controllers/controller') ;
 
 /** @class
 

data/lib/frameworks/sproutcore/frameworks/{amber → core_foundation}/ext/run_loop.js

@@ -159,4 +159,5 @@ SC.RunLoop = SC.RunLoop.extend(
 
 });
 
+// Recreate the currentRunLoop with the new methods
 SC.RunLoop.currentRunLoop = SC.RunLoop.create();