sproutcore 1.7.1.beta → 1.8.0

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

@@ -0,0 +1,27 @@
+// ==========================================================================
+// Project:   Test
+// Copyright: @2011 My Company, Inc.
+// ==========================================================================
+/*globals Test */
+
+// This is the theme that defines how your app renders.
+//
+// Your app is given its own theme so it is easier and less
+// messy for you to override specific things just for your
+// app.
+//
+// You don't have to create the whole theme on your own, though:
+// your app's theme is based on SproutCore's Ace theme.
+//
+// NOTE: if you want to change the theme this one is based on, don't
+// forget to change the :css_theme property in your buildfile.
+Test.Theme = SC.AceTheme.create({
+  name: 'test'
+});
+
+// SproutCore needs to know that your app's theme exists
+SC.Theme.addTheme(Test.Theme);
+
+// Setting it as the default theme makes every pane SproutCore
+// creates default to this theme unless otherwise specified.
+SC.defaultTheme = 'test';

data/lib/frameworks/sproutcore/apps/tests/controllers/targets.js

@@ -15,7 +15,7 @@ TestRunner.targetsController = SC.ArrayController.create(
 /** @scope TestRunner.targetsController.prototype */ {
 
   /**
-    Call this method whenever you want to relaod the targets from the server.
+    Call this method whenever you want to reload the targets from the server.
   */
   reload: function() {
     var targets = TestRunner.store.find(CoreTools.TARGETS_QUERY);

data/lib/frameworks/sproutcore/apps/tests/states/no_targets.js

@@ -12,7 +12,7 @@
 TestRunner.NO_TARGETS = SC.Responder.create({
   
   /**
-    Show laoding targets view.
+    Show loading targets view.
   */
   didBecomeFirstResponder: function() {
     TestRunner.set('currentScene', 'noTargets');

data/lib/frameworks/sproutcore/apps/tests/states/ready_detail.js

@@ -16,7 +16,7 @@ TestRunner.READY_DETAIL = SC.Responder.create({
   nextResponder: TestRunner.READY,
   
   /**
-    Show laoding targets view.
+    Show loading targets view.
   */
   didBecomeFirstResponder: function() {
     TestRunner.set('currentScene', 'testsDetail');

data/lib/frameworks/sproutcore/apps/tests/states/ready_empty.js

@@ -16,7 +16,7 @@ TestRunner.READY_EMPTY = SC.Responder.create({
   nextResponder: TestRunner.READY,
   
   /**
-    Show laoding targets view.
+    Show loading targets view.
   */
   didBecomeFirstResponder: function() {
     TestRunner.set('currentScene', 'testsNone');

data/lib/frameworks/sproutcore/apps/tests/states/ready_list.js

@@ -16,7 +16,7 @@ TestRunner.READY_LIST = SC.Responder.create({
   nextResponder: TestRunner.READY,
   
   /**
-    Show laoding targets view.
+    Show loading targets view.
   */
   didBecomeFirstResponder: function() {
     TestRunner.set('currentScene', 'testsMaster');

data/lib/frameworks/sproutcore/apps/tests/states/ready_no_tests.js

@@ -14,7 +14,7 @@ TestRunner.READY_NO_TESTS = SC.Responder.create({
   nextResponder: TestRunner.READY,
   
   /**
-    Show laoding targets view.
+    Show loading targets view.
   */
   didBecomeFirstResponder: function() {
     TestRunner.set('currentScene', 'noTests');

data/lib/frameworks/sproutcore/apps/welcome/controllers/targets.js

@@ -14,7 +14,7 @@ Welcome.targetsController = SC.ArrayController.create(
 /** @scope Welcome.targetsController.prototype */ {
 
   /**
-    Call this method whenever you want to relaod the targets from the server.
+    Call this method whenever you want to reload the targets from the server.
   */
   reload: function() {
     var targets = Welcome.store.find(CoreTools.TARGETS_QUERY);

data/lib/frameworks/sproutcore/frameworks/ajax/system/request.js

@@ -66,7 +66,7 @@ SC.Request = SC.Object.extend(SC.Copyable, SC.Freezable,
 
     You may want to set this to NO if you are making simple CORS requests
     in compatible browsers. See <a href="http://www.w3.org/TR/cors/">CORS 
-    Spec for more informatinon.</a>
+    Spec for more information.</a>
     
     TODO: Add unit tests for this feature
 
@@ -510,6 +510,19 @@ SC.Request.mixin(
     var req = this.create().set('address', address).set('type', 'PUT');
     if(body) { req.set('body', body) ; }
     return req ;
+  },
+
+  /**
+    Helper method for quickly setting up a PATCH request.
+
+    @param {String} address url of request
+    @param {String} body
+    @returns {SC.Request} receiver
+  */
+  patchUrl: function(address, body) {
+    var req = this.create().set('address', address).set('type', 'PATCH');
+    if(body) { req.set('body', body) ; }
+    return req ;
   }
 
 });

data/lib/frameworks/sproutcore/frameworks/ajax/system/response.js

@@ -24,14 +24,14 @@ SC.Response = SC.Object.extend(
 
   /**
     Walk like a duck
-    
+
     @type Boolean
   */
   isResponse: YES,
-  
+
   /**
     Becomes true if there was a failure.  Makes this into an error object.
-    
+
     @type Boolean
     @default NO
   */
@@ -67,7 +67,7 @@ SC.Response = SC.Object.extend(
     @default null
   */
   request: null,
-  
+
   /**
     The request object that originated this request series.  Mostly this is
     useful if you are looking for a reference to the original request.  To
@@ -83,7 +83,7 @@ SC.Response = SC.Object.extend(
     return ret ;
   }.property('request').cacheable(),
 
-  /** 
+  /**
     Type of request. Must be an HTTP method. Based on the request.
 
     @field
@@ -106,7 +106,7 @@ SC.Response = SC.Object.extend(
   }.property('request').cacheable(),
 
   /**
-    If set then will attempt to automatically parse response as JSON 
+    If set then will attempt to automatically parse response as JSON
     regardless of headers.
 
     @field
@@ -120,7 +120,7 @@ SC.Response = SC.Object.extend(
 
   /**
     If set, then will attempt to automatically parse response as XML
-    regarldess of headers.
+    regardless of headers.
 
     @field
     @type Boolean
@@ -212,7 +212,7 @@ SC.Response = SC.Object.extend(
     @default null
   */
   timedOut: null,
-  
+
   /**
     The timer tracking the timeout
 
@@ -224,7 +224,7 @@ SC.Response = SC.Object.extend(
 
   // ..........................................................
   // METHODS
-  // 
+  //
 
   /**
     Called by the request manager when its time to actually run. This will
@@ -241,7 +241,7 @@ SC.Response = SC.Object.extend(
     req.freeze();
 
     // if the source did not cancel the request, then invoke the transport
-    // to actually trigger the request.  This might receive a response 
+    // to actually trigger the request.  This might receive a response
     // immediately if it is synchronous.
     if (!this.get('isCancelled')) { this.invokeTransport(); }
 
@@ -410,10 +410,10 @@ SC.Response = SC.Object.extend(
     handled = this._notifyListeners(listeners, status);
     if (!handled && baseStat !== status) { handled = this._notifyListeners(listeners, baseStat); }
     if (!handled && status !== 0) { handled = this._notifyListeners(listeners, 0); }
-    
+
     return this ;
   },
-  
+
   /**
     String representation of the response object
 
@@ -513,7 +513,7 @@ SC.XHRResponse = SC.Response.extend(
     async = !!this.getPath('request.isAsynchronous');
 
     if (async) {
-      if (!SC.browser.msie && !SC.browser.opera) {
+      if (!SC.browser.isIE && !SC.browser.isOpera) {
         SC.Event.add(rawRequest, 'readystatechange', this,
                      this.finishRequest, rawRequest);
       } else {
@@ -609,12 +609,12 @@ SC.XHRResponse = SC.Response.extend(
           this.set('errorObject', error);
         }
 
-        // set the status - this will trigger changes on relatedp properties
+        // set the status - this will trigger changes on related properties
         this.set('status', status);
       }, this);
 
       // Avoid memory leaks
-      if (!SC.browser.msie && !SC.browser.opera) {
+      if (!SC.browser.isIE && !SC.browser.isOpera) {
         SC.Event.remove(rawRequest, 'readystatechange', this, this.finishRequest);
       } else {
         rawRequest.onreadystatechange = null;

data/lib/frameworks/sproutcore/frameworks/ajax/tests/system/request.js

@@ -223,7 +223,7 @@ test("Timeouts - SC.Request didReceive callback", function() {
       ok(elapsed >= 10,
         'timeout must not fire earlier than 10msec - actual %@'.fmt(elapsed));
     } else {
-      // We received a response from thes server, which should never happen
+      // We received a response from the server, which should never happen
       ok(false, 'timeout did not fire before response was received.  should have fired after 10msec.  response time: %@msec'.fmt(Date.now() - now));
     }
   });

data/lib/frameworks/sproutcore/frameworks/animation/core.js

@@ -7,7 +7,8 @@
 // ==========================================================================
 /*globals */
 
-/** @namespace
+/** @deprecated
+  @namespace
   A simple mixin called Animatable is provided. What does it do?
   It makes CSS transitions for you, and if they aren't available,
   implements them in JavaScript.
@@ -19,7 +20,7 @@
     - display, in a way. All animating display does is delay setting display:none
       until <em>after</em> the transition duration has passed. This allows you
       to set display:none after fading out. If mixing with CSS transitions, you will
-      need to set the delay a tad longer to accomodate any delays in beginning the
+      need to set the delay a tad longer to accommodate any delays in beginning the
       transition.
 
   ## Example Usage:
@@ -32,6 +33,8 @@
         }
       })
 */
+SC.warn("SC.Animatable is deprecated and will be removed in the next release.  Animation can be achieved by using the .animate method on SC.View.");
+
 SC.Animatable = {
   /** @scope SC.Animatable.prototype */
 
@@ -255,7 +258,7 @@ SC.Animatable = {
       var propertyName = evt.originalEvent.propertyName,
           callback = this._transitionCallbacks[propertyName];
 
-      // only callback is animation is not disabled; assume if anim was 
+      // only callback is animation is not disabled; assume if anim was
       // disabled we already invoked the callback..
       if(callback && this._disableAnimation<=0) {
         SC.Animatable.runCallback(callback);
@@ -754,7 +757,7 @@ SC.Animatable = {
   },
 
   /**
-  Overriden to support animation.
+  Overridden to support animation.
 
   Works by copying the styles to the object's "style" property.
   */
@@ -1079,7 +1082,7 @@ SC.mixin(SC.Animatable, {
   _ticks: 0,
   _timer_start_time: null,
 
-  // the global tiemr interval
+  // the global timer interval
   interval: 10,
 
   // the current time (a placeholder, really)

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

@@ -7,189 +7,403 @@
 
 window.SC = window.SC || { MODULE_INFO: {}, LAZY_INSTANTIATION: {} };
 
-SC._detectBrowser = function(userAgent, language) {
-  var version, webkitVersion, browser = {};
 
+/**
+  The list of browsers that are automatically identified.
+
+  @static
+  @constant
+*/
+SC.BROWSER = {
+  android: 'android',
+  blackberry: 'blackberry',
+  chrome: 'chrome',
+  firefox: 'firefox',
+  ie: 'ie',
+  opera: 'opera',
+  safari: 'safari',
+  unknown: 'unknown'
+};
+
+/**
+  The list of devices that are automatically identified.
+
+  @static
+  @constant
+*/
+SC.DEVICE = {
+  android: 'android',
+  blackberry: 'blackberry',
+  desktop: 'desktop',
+  ipad: 'ipad',
+  iphone: 'iphone',
+  ipod: 'ipod',
+  mobile: 'mobile'
+};
+
+/**
+  The list of browser engines that are automatically identified.
+
+  @static
+  @constant
+*/
+SC.ENGINE = {
+  gecko: 'gecko',
+  opera: 'opera',
+  presto: 'presto',
+  trident: 'trident',
+  webkit: 'webkit'
+};
+
+/**
+  The list of operating systems that are automatically identified.
+
+  @static
+  @constant
+*/
+SC.OS = {
+  android: 'android',
+  blackberry: 'blackberry',
+  ios: 'ios',
+  linux: 'linux',
+  mac: 'mac',
+  win: 'windows'
+};
+
+
+/**
+  Detects browser properties based on the given userAgent and language.
+
+  @private
+*/
+SC.detectBrowser = function(userAgent, language) {
+  var browser = {},
+      device,
+      engineAndVersion,
+      isIOSDevice,
+      conExp = '(?:[\\/:\\::\\s:;])', // Match the connecting character
+      numExp = '(\\S+[^\\s:;:\\)]|)', // Match the "number"
+      nameAndVersion,
+      osAndVersion,
+      override;
+
+  // Use the current values if none are provided.
   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];
+  // Calculations to determine the device.  See SC.DEVICE.
+  device =
+    userAgent.match( new RegExp('(android|ipad|iphone|ipod|blackberry)') ) ||
+    userAgent.match( new RegExp('(mobile)') ) ||
+    ['', SC.DEVICE.desktop];
+
+  /**
+    @name SC.browser.device
+    @type {SC.DEVICE}
+  */
+  browser.device = device[1];
+
+
+  // It simplifies further matching by recognizing this group of devices.
+  isIOSDevice =
+    browser.device === SC.DEVICE.ipad ||
+    browser.device === SC.DEVICE.iphone ||
+    browser.device === SC.DEVICE.ipod;
+
+
+  // Calculations to determine the name and version.  See SC.BROWSER.
+
+  nameAndVersion =
+    // Match the specific names first, avoiding commonly spoofed browsers.
+    userAgent.match( new RegExp('(opera|chrome|firefox|android|blackberry)' + conExp + numExp) ) ||
+    userAgent.match( new RegExp('(ie|safari)' + conExp + numExp) ) ||
+    ['', SC.BROWSER.unknown, '0'];
+
+  // If the device is an iOS device, use SC.BROWSER.safari for browser.name.
+  if (isIOSDevice) { nameAndVersion[1] = SC.BROWSER.safari; }
+
+  // If a `Version` number is found, use that over the `Name` number
+  override = userAgent.match( new RegExp('(version)' + conExp + numExp) );
+  if (override) { nameAndVersion[2] = override[2]; }
+  // If there is no `Version` in Safari, don't use the Safari number since it is
+  // the Webkit number.
+  else if (nameAndVersion[1] === SC.BROWSER.safari) { nameAndVersion[2] = '0'; }
+
+
+  /**
+    @name SC.browser.name
+    @type {SC.BROWSER}
+  */
+  browser.name = nameAndVersion[1];
+
+  /**
+    @name SC.browser.version
+    @type String
+  */
+  browser.version = nameAndVersion[2];
+
+
+  // Calculations to determine the engine and version.  See SC.ENGINE.
+  engineAndVersion =
+    // Match the specific engines first, avoiding commonly spoofed browsers.
+    userAgent.match( new RegExp('(presto)' + conExp + numExp) ) ||
+    userAgent.match( new RegExp('(opera|trident|webkit|gecko)' + conExp + numExp) ) ||
+    ['', SC.BROWSER.unknown, '0'];
+
+  // If the browser is SC.BROWSER.ie, use SC.ENGINE.trident.
+  override = browser.name === SC.BROWSER.ie ? SC.ENGINE.trident : false;
+  if (override) { engineAndVersion[1] = override; }
+
+  // If the engineVersion is unknown and the browser is SC.BROWSER.ie, use
+  // browser.version for browser.engineVersion.
+  override = browser.name === SC.BROWSER.ie && engineAndVersion[2] === '0';
+  if (override) { engineAndVersion[2] = browser.version; }
+
+  // If a `rv` number is found, use that over the engine number.
+  override = userAgent.match( new RegExp('(rv)' + conExp + numExp) );
+  if (override) { engineAndVersion[2] = override[2]; }
+
+
+  /**
+    @name SC.browser.engine
+    @type {SC.ENGINE}
+    @type {SC.BROWSER.unknown}
+  */
+  browser.engine = engineAndVersion[1];
+
+  /**
+    @name SC.browser.engineVersion
+    @type String
+  */
+  browser.engineVersion = engineAndVersion[2];
+
+
+  // If we don't know the name of the browser, use the name of the engine.
+  if (browser.name === SC.BROWSER.unknown) { browser.name = browser.engine; }
+
+  // Calculations to determine the os and version.  See SC.OS.
+  osAndVersion =
+    // Match the specific names first, avoiding commonly spoofed os's.
+    userAgent.match( new RegExp('(blackberry)') ) ||
+    userAgent.match( new RegExp('(android|iphone(?: os)|windows(?: nt))' + conExp + numExp) ) ||
+    userAgent.match( new RegExp('(os|mac(?: os)(?: x))' + conExp + numExp) ) ||
+    userAgent.match( new RegExp('(linux)') ) ||
+    [null, SC.BROWSER.unknown, '0'];
+
+  // Normalize the os name.
+  if (isIOSDevice) { osAndVersion[1] = SC.OS.ios; }
+  else if (osAndVersion[1] === 'mac os x' || osAndVersion[1] === 'mac os') { osAndVersion[1] = SC.OS.mac; }
+  else if (osAndVersion[1] === 'windows nt') { osAndVersion[1] = SC.OS.windows; }
+
+  // Normalize the os version.
+  osAndVersion[2] = osAndVersion[2] ? osAndVersion[2].replace(/_/g, '.') : '0';
+
 
   /**
+    @name SC.browser.os
+    @type {SC.OS}
+    @type {SC.BROWSER.unknown}
+  */
+  browser.os = osAndVersion[1];
+
+  /**
+    @name SC.browser.osVersion
+    @type String
+  */
+  browser.osVersion = osAndVersion[2];
+
+
+  // The following long list of properties have all been deprecated.  While they
+  // are a bit less verbose then the above constants, they lack standardization
+  // and can be prone to failure.  Rather than continuing to expand this list
+  // with more and more one-off comparisons, which often muddle the line between
+  // the browser, the engine, the os and the device, it seems more practical to
+  // only maintain the 7 identifiable properties listed above:  device, name,
+  // version, os, osVersion, engine and engineVersion.
+
+  /** @deprecated Since version 1.7. Use browser.os === SC.OS.windows.
     @name SC.browser.isWindows
     @type Boolean
   */
-  browser.windows = browser.isWindows = !!/windows/.test(userAgent);
+  browser.windows = browser.isWindows = browser.os === SC.OS.windows;
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.os === SC.OS.mac.
     @name SC.browser.isMac
     @type Boolean
   */
-  browser.mac = browser.isMac = !!/macintosh/.test(userAgent) || (/mac os x/.test(userAgent) && !/like mac os x/.test(userAgent));
+  browser.mac = browser.isMac = browser.os === SC.OS.mac;
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.os === SC.OS.mac && browser.compare(browser.osVersion, '10.7') == 0
+    @name SC.browser.isLion
+    @type Boolean
+  */
+  browser.lion = browser.isLion = !!(/mac os x 10_7/.test(userAgent) && !/like mac os x 10_7/.test(userAgent));
+
+  /** @deprecated Since version 1.7. Use browser.device === SC.DEVICE.iphone.
     @name SC.browser.isiPhone
     @type Boolean
   */
-  browser.iPhone = browser.isiPhone = !!/iphone/.test(userAgent);
+  browser.iPhone = browser.isiPhone = browser.device === SC.DEVICE.iphone;
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.device === SC.DEVICE.ipod.
     @name SC.browser.isiPod
     @type Boolean
   */
-  browser.iPod = browser.isiPod = !!/ipod/.test(userAgent);
+  browser.iPod = browser.isiPod = browser.device === SC.DEVICE.ipod;
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.device === SC.DEVICE.ipad.
     @name SC.browser.isiPad
     @type Boolean
   */
-  browser.iPad = browser.isiPad = !!/ipad/.test(userAgent);
+  browser.iPad = browser.isiPad = browser.device === SC.DEVICE.ipad;
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.os === SC.OS.ios.
     @name SC.browser.isiOS
     @type Boolean
   */
-  browser.iOS = browser.isiOS = browser.iPhone || browser.iPod || browser.iPad;
+  browser.iOS = browser.isiOS = browser.os === SC.OS.ios;
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.os === SC.OS.android or browser.name === SC.BROWSER.android or browser.device === SC.DEVICE.android.
     @name SC.browser.isAndroid
     @type Boolean
   */
-  browser.android = browser.isAndroid = !!/android/.test(userAgent);
+  browser.android = browser.isAndroid = browser.os === SC.OS.android;
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.version or browser.engineVersion.
     @name SC.browser.opera
     @type String
   */
-  browser.opera = /opera/.test(userAgent) ? version : 0;
+  browser.opera = browser.name === SC.BROWSER.opera ? browser.version : '0';
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.name === SC.BROWSER.opera.
     @name SC.browser.isOpera
     @type Boolean
   */
-  browser.isOpera = !!browser.opera;
+  browser.isOpera = browser.name === SC.BROWSER.opera;
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.version or browser.engineVersion.
     @name SC.browser.msie
     @type String
   */
-  browser.msie = /msie/.test(userAgent) && !browser.opera ? version : 0;
+  browser.msie = browser.name === SC.BROWSER.ie ? browser.version : '0';
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.engine === SC.ENGINE.trident.
     @name SC.browser.isIE
     @type Boolean
   */
-  browser.isIE = !!browser.msie;
+  browser.isIE = browser.engine === SC.ENGINE.trident;
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.compare(browser.version, '8') <= 0.
     @name SC.browser.isIE8OrLower
     @type Boolean
   */
-  browser.isIE8OrLower = !!(browser.msie && parseInt(browser.msie, 10) <= 8);
+  browser.isIE8OrLower = browser.name === SC.BROWSER.ie && browser.version <= 8;
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.version or browser.engineVersion.
     @name SC.browser.mozilla
     @type String
   */
-  browser.mozilla = /mozilla/.test(userAgent) && !/(compatible|webkit|msie)/.test(userAgent) ? version : 0;
+  browser.mozilla = browser.engine === SC.ENGINE.gecko ? browser.version : '0';
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.name === SC.BROWSER.firefox or browser.engine === SC.ENGINE.gecko.
     @name SC.browser.isMozilla
     @type Boolean
   */
-  browser.isMozilla = !!browser.mozilla;
+  browser.isMozilla = browser.engine === SC.ENGINE.gecko;
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.engineVersion.
     @name SC.browser.webkit
     @type String
   */
-  browser.webkit = /webkit/.test(userAgent) ? webkitVersion : 0;
+  browser.webkit = browser.engine === SC.ENGINE.webkit ? browser.engineVersion : '0';
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.engine === SC.ENGINE.webkit.
     @name SC.browser.isWebkit
     @type Boolean
   */
-  browser.isWebkit = !!browser.webkit;
+  browser.isWebkit = browser.engine === SC.ENGINE.webkit;
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.version.
     @name SC.browser.chrome
     @type String
   */
-  browser.chrome = /chrome/.test(userAgent) ? version: 0;
+  browser.chrome = browser.name === SC.BROWSER.chrome ? browser.version : '0';
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.name === SC.BROWSER.chrome.
     @name SC.browser.isChrome
     @type Boolean
   */
-  browser.isChrome = !!browser.chrome;
+  browser.isChrome = browser.name === SC.BROWSER.chrome;
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.version.
     @name SC.browser.mobileSafari
     @type String
   */
-  browser.mobileSafari = /apple.*mobile/.test(userAgent) && browser.iOS ? webkitVersion : 0;
+  browser.mobileSafari = browser.os === SC.OS.ios ? browser.version : '0';
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.name === SC.BROWSER.safari && browser.os === SC.OS.ios
     @name SC.browser.isMobileSafari
     @type Boolean
   */
-  browser.isMobileSafari = !!browser.mobileSafari;
+  browser.isMobileSafari = browser.name === SC.BROWSER.safari && browser.os === SC.OS.ios;
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.version.
     @name SC.browser.iPadSafari
     @type String
   */
-  browser.iPadSafari = browser.iPad && browser.isMobileSafari ? webkitVersion : 0;
+  browser.iPadSafari = browser.device === SC.DEVICE.ipad && browser.name === SC.BROWSER.safari ?
+    browser.version : 0;
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.device === SC.DEVICE.ipad && browser.name === SC.BROWSER.safari
     @name SC.browser.isiPadSafari
     @type Boolean
   */
-  browser.isiPadSafari = !!browser.iPadSafari;
+  browser.isiPadSafari = browser.device === SC.DEVICE.ipad && browser.name === SC.BROWSER.safari;
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.version.
     @name SC.browser.iPhoneSafari
     @type String
   */
-  browser.iPhoneSafari = browser.iPhone && browser.isMobileSafari ? webkitVersion : 0;
+  browser.iPhoneSafari = browser.device === SC.DEVICE.iphone && browser.name === SC.BROWSER.safari ?
+    browser.version : 0;
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.device === SC.DEVICE.iphone && browser.name === SC.BROWSER.safari
     @name SC.browser.isiPhoneSafari
     @type Boolean
   */
-  browser.isiPhoneSafari = !!browser.iphoneSafari;
+  browser.isiPhoneSafari = browser.device === SC.DEVICE.iphone && browser.name === SC.BROWSER.safari;
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.version.
     @name SC.browser.iPodSafari
     @type String
   */
-  browser.iPodSafari = browser.iPod && browser.isMobileSafari ? webkitVersion : 0;
+  browser.iPodSafari = browser.device === SC.DEVICE.ipod && browser.name === SC.BROWSER.safari ?
+    browser.version : 0;
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.device === SC.DEVICE.ipod && browser.name === SC.BROWSER.safari
     @name SC.browser.isiPodSafari
     @type Boolean
   */
-  browser.isiPodSafari = !!browser.iPodSafari;
+  browser.isiPodSafari = browser.device === SC.DEVICE.ipod && browser.name === SC.BROWSER.safari;
 
-  /**
+  /** @deprecated Since version 1.7. Use SC.platform.standalone.
     @name SC.browser.isiOSHomeScreen
     @type Boolean
   */
-  browser.isiOSHomeScreen = browser.isMobileSafari && !/apple.*mobile.*safari/.test(userAgent);
+  browser.isiOSHomeScreen = browser.isMobileSafari && !(/apple.*mobile.*safari/.test(userAgent));
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.version.
     @name SC.browser.safari
     @type String
   */
-  browser.safari = browser.webkit && !browser.chrome && !browser.iOS && !browser.android ? webkitVersion : 0;
+  browser.safari = browser.name === SC.BROWSER.safari && browser.os === SC.OS.mac ?
+    browser.version : 0;
 
-  /**
+  /** @deprecated Since version 1.7. Use browser.name === SC.BROWSER.safari && browser.os === SC.OS.mac.
     @name SC.browser.isSafari
     @type Boolean
   */
-  browser.isSafari = !!browser.safari;
+  browser.isSafari = browser.name === SC.BROWSER.safari && browser.os === SC.OS.mac;
 
   /**
     @name SC.browser.language
@@ -198,6 +412,12 @@ SC._detectBrowser = function(userAgent, language) {
   browser.language = language.split('-', 1)[0];
 
   /**
+    @name SC.browser.countryCode
+    @type String
+  */
+  browser.countryCode = language.split('-')[1] ? language.split('-')[1].toLowerCase() : undefined;
+
+  /** @deprecated Since version 1.7. Use browser.name.  See SC.BROWSER for possible values.
     Possible values:
 
       - 'msie'
@@ -212,20 +432,32 @@ SC._detectBrowser = function(userAgent, language) {
     @type String
     @default 'unknown'
   */
-  browser.current = browser.msie ? 'msie' : browser.mozilla ? 'mozilla' : browser.chrome ? 'chrome' : browser.safari ? 'safari' : browser.opera ? 'opera' : browser.mobileSafari ? 'mobile-safari' : browser.android ? 'android' : 'unknown';
+  browser.current = browser.name;
+
   return browser;
 };
 
 
 /** @class
 
-  Contains information about the browser environment that SproutCore
-  is running in. String properties, such as `SC.browser.webkit` or
-  `SC.browser.msie`, will have a value that represents the browser build
-  number if that browser is being used. Otherwise, they will have a
-  falsey value. For convenience, Boolean counterparts for all of the
-  versioned properties are provided.
+  This object contains information about the browser environment SproutCore is
+  running in. This includes the following properties:
+
+    - browser.device                  ex. SC.DEVICE.ipad
+    - browser.name                    ex. SC.BROWSER.chrome
+    - browser.version                 ex. '16.0.2.34'
+    - browser.os                      ex. SC.OS.mac
+    - browser.osVersion               ex. '10.6'
+    - browser.engine                  ex. SC.ENGINE.webkit
+    - browser.engineVersion           ex. '533.29'
+
+  Note: User agent sniffing does not provide guaranteed results and spoofing may
+  affect the accuracy.  Therefore, as a general rule, it is much better
+  to rely on the browser's verified capabilities in SC.platform.
+
+  Based on the unit test samples, the most stable browser properties appear to
+  be `engine` and `engineVersion`.
 
   @since SproutCore 1.0
 */
-SC.browser = SC._detectBrowser();
+SC.browser = SC.detectBrowser();