2 files changed, 9 insertions, 6 deletions

diff --git a/js/document/views/design.js b/js/document/views/design.js
index d772aa86..c7313708 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -67,13 +67,13 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     propertiesPanel: {
         value: null
     },
-
     ////////////////////////////////////////////////////////////////////
     //
     _liveNodeList: {
         value: null
     },
-
+    ////////////////////////////////////////////////////////////////////
+    //
     getLiveNodeList: {
         value: function(useFilter) {
             if(useFilter) {
@@ -93,8 +93,6 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     },
     ////////////////////////////////////////////////////////////////////
     //
-
-    //
         initialize: {
         value: function (parent) {
                 //Creating iFrame for view
diff --git a/js/io/system/ninjalibrary.js b/js/io/system/ninjalibrary.js
index dab623c1..12af5988 100644
--- a/js/io/system/ninjalibrary.js
+++ b/js/io/system/ninjalibrary.js
@@ -65,8 +65,13 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
                                 if (libName === contents[i].name) {
                                                 //Getting contents of library to be copied
                                                 this.chromeApi.directoryContents(contents[i], function (lib) {
-                                                        //Creating directory structure from subfolders
-                                                        this.copyDirectoryToCloud(path, contents[i], path, callback);
+                                                        //Copying to cloud, adding blocking if no callback specified
+                                                        if (!callback) {
+                                                                //TODO: Add blocking logic here
+                                                                this.copyDirectoryToCloud(path, contents[i], path);
+                                                        } else {
+                                                                this.copyDirectoryToCloud(path, contents[i], path, callback);
+                                                        }
                                                 }.bind(this));
                                                 break;
                                         }