From 38f2c778fb62c2435d41472b89365f3c04e1a26d Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 17 Mar 2014 12:00:59 -0400
Subject: [PATCH] Update ember-cloaking for latest fixes/tweaks

---
 vendor/assets/javascripts/ember-cloaking.js | 24 +++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/vendor/assets/javascripts/ember-cloaking.js b/vendor/assets/javascripts/ember-cloaking.js
index cde63b59687..d0409f4f544 100644
--- a/vendor/assets/javascripts/ember-cloaking.js
+++ b/vendor/assets/javascripts/ember-cloaking.js
@@ -25,7 +25,7 @@
         cloaks: cloakView,
         preservesContext: this.get('preservesContext') === "true",
         cloaksController: this.get('itemController'),
-        defaultHeight: this.get('defaultHeight') || 100,
+        defaultHeight: this.get('defaultHeight'),
 
         init: function() {
           this._super();
@@ -191,6 +191,7 @@
       $(window).bind('scroll.ember-cloak', onScrollMethod);
       this.addObserver('wrapperTop', self, onScrollMethod);
       this.addObserver('wrapperHeight', self, onScrollMethod);
+      this.scrollTriggered();
 
       this.set('scrollingEnabled', true);
     }.on('didInsertElement'),
@@ -219,7 +220,7 @@
 
     init: function() {
       this._super();
-      this.uncloak();
+      this.cloak();
     },
 
     /**
@@ -246,8 +247,8 @@
             factory = Ember.generateControllerFactory(container, controllerName, model);
 
             // inform developer about typo
-            Ember.Logger.warn('ember-cloacking: can\'t lookup controller by name "' + controllerFullName + '".');
-            Ember.Logger.warn('ember-cloacking: using ' + factory.toString() + '.');
+            Ember.Logger.warn('ember-cloaking: can\'t lookup controller by name "' + controllerFullName + '".');
+            Ember.Logger.warn('ember-cloaking: using ' + factory.toString() + '.');
           }
 
           controller = factory.create({
@@ -301,6 +302,21 @@
     },
 
 
+    didInsertElement: function(){
+      if (!this.get('containedView')) {
+        // setting default height
+        // but do not touch if height already defined
+        if(!this.$().height()){
+          var defaultHeight = 100;
+          if(this.get('defaultHeight')) {
+            defaultHeight = this.get('defaultHeight');
+          }
+
+          this.$().css('height', defaultHeight);
+        }
+      }
+     },
+
     /**
       Render the cloaked view if applicable.