From b49b316a100c9fbf71fc05ad9c528d8920c1a0ba Mon Sep 17 00:00:00 2001
From: Alexandr Evseev <evseev@aboutecho.com>
Date: Mon, 6 Oct 2014 11:32:29 +0000
Subject: [PATCH] Minor fixes

---
 src/canvas.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/canvas.js b/src/canvas.js
index 49e33c6e..f6389b42 100644
--- a/src/canvas.js
+++ b/src/canvas.js
@@ -321,17 +321,14 @@ canvas.renderers.container = function(element) {
  */
 canvas.methods.updateLayout = function(apps, layout) {
 	var self = this;
-	var deferred = $.Deferred();
-	Echo.Utils.pipe($.Deferred().resolve(apps), [
+	return Echo.Utils.pipe($.Deferred().resolve(apps), [
 		$.proxy(this._loadAppResources, this),
 		$.proxy(this._initApps, this)
 	]).then(function() {
 		self.set("data.apps", apps);
 		self.set("data.layout", layout);
 		self.render();
-		deferred.resolve();
 	});
-	return deferred.promise();
 };
 
 canvas.methods._initApps = function(apps) {
@@ -356,7 +353,7 @@ canvas.methods._initApps = function(apps) {
 			acc[appId] = self.apps[appId];
 		}
 	});
-	return deferred.resolve().promise();
+	return deferred.resolve(apps).promise();
 };
 
 canvas.methods._initApp = function(data, id) {
@@ -518,7 +515,10 @@ canvas.methods._getAppScriptURL = function(config) {
 };
 
 canvas.methods._loadAppResources = function(apps) {
-	var self = this, resources = [], isManual = this._isManuallyConfigured(), deferred = $.Deferred();
+	var self = this;
+	var resources = [];
+	var isManual = this._isManuallyConfigured();
+	var deferred = $.Deferred();
 	$.map(apps, function(app) {
 		var script = self._getAppScriptURL(app);
 		if (!app.component || !script || !(isManual || app.id)) {