Cleaning up

1 files changed, 51 insertions, 75 deletions

diff --git a/js/io/system/ninjalibrary.js b/js/io/system/ninjalibrary.js
index 3de5fb69..dab623c1 100644
--- a/js/io/system/ninjalibrary.js
+++ b/js/io/system/ninjalibrary.js
@@ -4,12 +4,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
-/* /////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
-NOTES:
-
-////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////// */
 //
 var Montage = require("montage/core/core").Montage;
 ////////////////////////////////////////////////////////////////////////
@@ -18,73 +13,53 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
         ////////////////////////////////////////////////////////////////////
     //
     _chromeApi: {
-        enumerable: false,
         value: null
     },
     ////////////////////////////////////////////////////////////////////
     //
     chromeApi: {
-        enumerable: false,
-        get: function() {
-            return this._chromeApi;
-        },
-        set: function(value) {
-                this._chromeApi = value;
-        }
+        get: function() {return this._chromeApi;},
+        set: function(value) {this._chromeApi = value;}
     },
     ////////////////////////////////////////////////////////////////////
     //
     _coreApi: {
-        enumerable: false,
         value: null
     },
     ////////////////////////////////////////////////////////////////////
     //
     coreApi: {
-        enumerable: false,
-        get: function() {
-            return this._coreApi;
-        },
-        set: function(value) {
-                this._coreApi = value;
-        }
+        get: function() {return this._coreApi;},
+        set: function(value) {this._coreApi = value;}
     },
     ////////////////////////////////////////////////////////////////////
     //
     _libs: {
-        enumerable: false,
         value: null
     },
     ////////////////////////////////////////////////////////////////////
     //
     libs: {
-        enumerable: false,
-        get: function() {
-            return this._libs;
-        },
-        set: function(value) {
-                this._libs = value;
-        }
+        get: function() {return this._libs;},
+        set: function(value) {this._libs = value;}
     },
     ////////////////////////////////////////////////////////////////////
     //
     _libsToSync: {
-        enumerable: false,
         value: 0
     },
     ////////////////////////////////////////////////////////////////////
     //
     _syncedLibs: {
-        enumerable: false,
         value: 0
     },
     ////////////////////////////////////////////////////////////////////
     //
     copyLibToCloud: {
-        enumerable: false,
         value: function (path, libName, callback) {
-                //
+                //Checking for library to exists
                 if(this.coreApi.directoryExists({uri: path+libName}).status === 404) {
+                        //Getting contents to begin copying
                         this.chromeApi.directoryContents(this.chromeApi.fileSystem.root, function (contents) {
                                 for (var i in contents) {
                                 if (libName === contents[i].name) {
@@ -98,16 +73,15 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
                         }
                         }.bind(this));
                 } else {
-                        //Error
+                        //TODO: Add error handling
                 }
         }
     },
     ////////////////////////////////////////////////////////////////////
     //
     copyDirectoryToCloud: {
-        enumerable: true,
         value: function(root, folder, fileRoot, callback) {
-                //
+                //Setting up directory name
                 if (folder.name) {
                         var dir;
                             if (root) {
@@ -115,23 +89,26 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
                             } else {
                                 dir = folder.name;
                             }
-                            //
+                            //Creating directory
                             if (!this.coreApi.createDirectory({uri: dir.replace(/\/\//gi, '/')})) {
                                 //Error occured while creating folders
-                                return;
+                                return; //TODO: Add error handling
                             }
                         }
-                        //
+                        //Checking for directory
                         if (folder.isDirectory) {
+                                //Using Chrome API to get directory contents
                                 this.chromeApi.directoryContents(folder, function (contents) {
+                                        //Looping through children of directory to copy
                                         for (var i in contents) {
+                                                //Checking for file or directory
                                                 if (contents[i].isDirectory) {
+                                                        //Recursive call if directory
                                                         this.copyDirectoryToCloud(dir, contents[i], fileRoot);
                                                 } else if (contents[i].isFile){
-                                                        //File to copy
+                                                        //Copying file 
                                                         this.chromeApi.fileContent(contents[i].fullPath, function (result) {
-                                                                //
-                                                                //this.coreApi.createFile({uri: fileRoot+result.file.fullPath, contents: blob.getBlob(result.data.type), contentType: result.data.type});
+                                                                //Using binary when copying files to allow images and such to work
                                                                 this.coreApi.createFile({uri: (fileRoot+result.file.fullPath).replace(/\/\//gi, '/'), contents: result.content});
                                                         }.bind(this));
                                                 }
@@ -145,34 +122,31 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
         ////////////////////////////////////////////////////////////////////
     //
     synchronize: {
-        enumerable: true,
         value: function(chromeLibs, chrome) {
                 //TODO: Remove
                 window.wipeLibrary = this.deleteLibraries.bind(this);
-                //
+                //Getting instance of browser file API
                 this.chromeApi = chrome;
-                //
-//            debugger;
+                //Local variables
                 var i, l, libs, libjson, xhr = new XMLHttpRequest(), tocopylibs = [];
-            //Getting known json list of libraries to copy to chrome
+            //Getting known json list of libraries to copy to chrome (will be on a CDN later)
                 xhr.open("GET", '/js/io/system/ninjalibrary.json', false);
             xhr.send();
             //Checkng for correct reponse
             if (xhr.readyState === 4) {
                 //Parsing json libraries
                 libs = JSON.parse(xhr.response);
-                //
+                //Storing JSON data
                 this.libs = libs.libraries;
-                //
+                //Checking for preview libraries to avoid duplicates
                 if (chromeLibs.length > 0) {
-                        //
+                        //Looping through libraries on browser file system
                         for (i=0; chromeLibs[i]; i++) {
                                 for (var j in libs.libraries) {
-                                        if (String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase() === chromeLibs[i]) {
-                                //TODO: Remove, currently manually removing copied libraries
+                                        //Checking for matching names (directories are libraries names)
+