Add compatibility with latest ember

codegram · Feb 24, 2013 · 144be26 · 144be26
1 parent 29cbe18
commit 144be26
Show file tree

Hide file tree

Showing 8 changed files with 17,106 additions and 13,449 deletions.
diff --git a/packages/ember-forms/lib/controls/unbound_select.js b/packages/ember-forms/lib/controls/unbound_select.js
@@ -21,12 +21,12 @@ EF.UnboundSelect = Ember.View.extend({
   */
   options: Ember.computed(function(){
     var output;
-    if(!Ember.empty(this.get('prompt'))){
+    if(!Ember.isEmpty(this.get('prompt'))){
       output = '<option value="">' + this.get('prompt') + '</option>';
     }
     this.get('content').forEach(function(item){
       var value, label;
-      if(!Ember.empty(item.value)){
+      if(!Ember.isEmpty(item.value)){
         value = item.value;
         label = item.label;
       }else{ value = item; label = item; }

diff --git a/packages/ember-forms/lib/fields/base.js b/packages/ember-forms/lib/fields/base.js
@@ -49,8 +49,8 @@ EF.BaseField = Ember.ContainerView.extend({
 
     this.set('labelView', labelView);
     this.set('inputView', inputView);
-    this.get('childViews').pushObject(labelView);
-    this.get('childViews').pushObject(inputView);
+    this.pushObject(labelView);
+    this.pushObject(inputView);
     this.setFormView();
     this.bindValue();
   }

diff --git a/packages/ember-forms/lib/fields/date.js b/packages/ember-forms/lib/fields/date.js
@@ -2,7 +2,7 @@ require("ember-forms/fields/base");
 require("ember-forms/controls/unbound_select");
 require("ember-forms/labels");
 
-var e = Ember.empty;
+var e = Ember.isEmpty;
 
 EF.DateComponent = Ember.ContainerView.extend({
   childViews: ['dayView', 'monthView', 'yearView'],

diff --git a/packages/ember-forms/lib/helpers/field.js b/packages/ember-forms/lib/helpers/field.js
@@ -8,7 +8,7 @@ EF.FieldHelper = Ember.Object.create({
         currentView = options.data.view,
         fieldView = findField(type);
 
-    if(Ember.empty(optionsHash.name)){ optionsHash.name = name; }
+    if(Ember.isEmpty(optionsHash.name)){ optionsHash.name = name; }
     delete(optionsHash.as);
     currentView.appendChild(fieldView, optionsHash);
   }