ember.prod.js in ember-source-1.1.1

- old
+ new

@@ -59,11 +59,11 @@
   The core Runtime framework is based on the jQuery API with a number of
   performance optimizations.
 
   @class Ember
   @static
-  @version 1.1.0
+  @version 1.1.1
 */
 
 if ('undefined' === typeof Ember) {
   // Create core object. Make it act like an instance of Ember.Namespace so that
   // objects assigned to it are given a sane string representation.
@@ -86,14 +86,14 @@
 
 
 /**
   @property VERSION
   @type String
-  @default '1.1.0'
+  @default '1.1.1'
   @final
 */
-Ember.VERSION = '1.1.0';
+Ember.VERSION = '1.1.1';
 
 /**
   Standard environmental variables. You can define these in a global `ENV`
   variable before loading Ember to control various configuration
   settings.
@@ -15288,12 +15288,15 @@
 
       for (var i = 0, l = props.length; i < l; i++) {
         var properties = props[i];
 
 
-        if (Ember.typeOf(properties) !== 'object') { continue; }
+        if (properties === null || typeof properties !== 'object') {
 
+          continue;
+        }
+
         var keyNames = Ember.keys(properties);
         for (var j = 0, ll = keyNames.length; j < ll; j++) {
           var keyName = keyNames[j];
           if (!properties.hasOwnProperty(keyName)) { continue; }
 
@@ -15479,11 +15482,11 @@
     are also concatenated, in addition to `classNames`.
 
     This feature is available for you to use throughout the Ember object model,
     although typical app developers are likely to use it infrequently. Since
     it changes expectations about behavior of properties, you should properly
-    document its usage in each individual concatenated property (to not 
+    document its usage in each individual concatenated property (to not
     mislead your users to think they can override the property in a subclass).
 
     @property concatenatedProperties
     @type Array
     @default null
@@ -15780,14 +15783,14 @@
     if (arguments.length>0) { this._initProperties(arguments); }
     return new C();
   },
 
   /**
-    
+
     Augments a constructor's prototype with additional
     properties and functions:
-    
+
     ```javascript
     MyObject = Ember.Object.extend({
       name: 'an object'
     });
 
@@ -15803,11 +15806,11 @@
     o2 = MyObject.create();
     o2.say("hello"); // logs "hello"
 
     o.say("goodbye"); // logs "goodbye"
     ```
-    
+
     To add functions and properties to the constructor itself,
     see `reopenClass`
 
     @method reopen
   */
@@ -15817,26 +15820,26 @@
     return this;
   },
 
   /**
     Augments a constructor's own properties and functions:
-    
+
     ```javascript
     MyObject = Ember.Object.extend({
       name: 'an object'
     });
 
 
     MyObject.reopenClass({
       canBuild: false
     });
-    
+
     MyObject.canBuild; // false
     o = MyObject.create();
     ```
 
-    In other words, this creates static properties and functions for the class. These are only available on the class 
+    In other words, this creates static properties and functions for the class. These are only available on the class
     and not on any instance of that class.
 
     ```javascript
     App.Person = Ember.Object.extend({
       name : "",
@@ -15862,18 +15865,18 @@
     tom.sayHello(); // "Hello. My name is Tom Dale"
     yehuda.sayHello(); // "Hello. My name is Yehuda Katz"
     alert(App.Person.species); // "Homo sapiens"
     ```
 
-    Note that `species` and `createPerson` are *not* valid on the `tom` and `yehuda` 
+    Note that `species` and `createPerson` are *not* valid on the `tom` and `yehuda`
     variables. They are only valid on `App.Person`.
-    
+
     To add functions and properties to instances of
     a constructor by extending the constructor's prototype
     see `reopen`
-    
+
     @method reopenClass
-  */  
+  */
   reopenClass: function() {
     reopen.apply(this.ClassMixin, arguments);
     applyMixin(this, arguments, false);
     return this;
   },