aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rwxr-xr-xjs/document/views/design.js6
-rw-r--r--js/io/system/ninjalibrary.js9
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, {
67 propertiesPanel: { 67 propertiesPanel: {
68 value: null 68 value: null
69 }, 69 },
70
71 //////////////////////////////////////////////////////////////////// 70 ////////////////////////////////////////////////////////////////////
72 // 71 //
73 _liveNodeList: { 72 _liveNodeList: {
74 value: null 73 value: null
75 }, 74 },
76 75 ////////////////////////////////////////////////////////////////////
76 //
77 getLiveNodeList: { 77 getLiveNodeList: {
78 value: function(useFilter) { 78 value: function(useFilter) {
79 if(useFilter) { 79 if(useFilter) {
@@ -93,8 +93,6 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
93 }, 93 },
94 //////////////////////////////////////////////////////////////////// 94 ////////////////////////////////////////////////////////////////////
95 // 95 //
96
97 //
98 initialize: { 96 initialize: {
99 value: function (parent) { 97 value: function (parent) {
100 //Creating iFrame for view 98 //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, {
65 if (libName === contents[i].name) { 65 if (libName === contents[i].name) {
66 //Getting contents of library to be copied 66 //Getting contents of library to be copied
67 this.chromeApi.directoryContents(contents[i], function (lib) { 67 this.chromeApi.directoryContents(contents[i], function (lib) {
68 //Creating directory structure from subfolders 68 //Copying to cloud, adding blocking if no callback specified
69 this.copyDirectoryToCloud(path, contents[i], path, callback); 69 if (!callback) {
70 //TODO: Add blocking logic here
71 this.copyDirectoryToCloud(path, contents[i], path);
72 } else {
73 this.copyDirectoryToCloud(path, contents[i], path, callback);
74 }
70 }.bind(this)); 75 }.bind(this));
71 break; 76 break;
72 } 77 }