Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO

Conflicts:
	js/io/document/document-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

6 files changed, 153 insertions, 26 deletions

diff --git a/js/io/document/document-controller.js b/js/io/document/document-controller.js
index 6f67b57c..16643a58 100755
--- a/js/io/document/document-controller.js
+++ b/js/io/document/document-controller.js
@@ -37,7 +37,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         value: "function CodeMirror(place, givenOptions) {" +
                 "// Determine effective options based on given values and defaults." +
                 "var options = {}, defaults = CodeMirror.defaults; }"
-    },
+            },
 
     activeDocument: {
         get: function() {
@@ -45,7 +45,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         },
         set: function(doc) {
             if(this._activeDocument)  this._activeDocument.isActive = false;
-
+                
             if(this._documents.indexOf(doc) === -1) this._documents.push(doc);
 
             this._activeDocument = doc;
@@ -66,11 +66,20 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             this.eventManager.addEventListener("executeSave", this, false);
 
             this.eventManager.addEventListener("recordStyleChanged", this, false);
+
+                        // Temporary testing opening a new file after Ninja has loaded
+                        this.eventManager.addEventListener("executeNewProject", this, false);
         }
     },
 
     handleAppLoaded: {
         value: function() {
+            //this.openDocument({"type": "html"});
+        }
+    },
+        
+        handleExecuteNewProject: {
+        value: function() {
             this.openDocument({"type": "html"});
         }
     },
@@ -107,9 +116,9 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
             if((newFileObj.fileExtension !== ".html") && (newFileObj.fileExtension !== ".htm")){//open code view
 
-            }else{
+                } else {
                 //open design view
-            }
+                }
         }
     },
 
@@ -145,11 +154,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
     /**
      * Public method
-     * doc contains:
-     *      type : file type, like js, css, etc
-     *      name : file name
-     *      source : file content
-     *      uri : file uri
      */
     openFileCallback:{
         value:function(response){
@@ -193,7 +197,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         }
     },
 
-
     openProjectWithURI: {
         value: function(uri) {
             console.log("URI is: ", uri);
@@ -225,7 +228,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
                     this.textDocumentOpened(newDoc);
 
-                }
+            }
 
            // } catch (err) {
            //     console.log("Could not open Document ",  err);
@@ -257,24 +260,24 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
            }
 
            DocumentManager._codeEditor.editor = CodeMirror.fromTextArea(doc.textArea, {
-                       lineNumbers: true,
+                            lineNumbers: true,
                        mode: type,
-                       onCursorActivity: function() {
-                           DocumentManager._codeEditor.editor.setLineClass(DocumentManager._codeEditor.hline, null);
-                           DocumentManager._codeEditor.hline = DocumentManager._codeEditor.editor.setLineClass(DocumentManager._codeEditor.editor.getCursor().line, "activeline");
-                       }
-           });
+                            onCursorActivity: function() {
+                                DocumentManager._codeEditor.editor.setLineClass(DocumentManager._codeEditor.hline, null);
+                                DocumentManager._codeEditor.hline = DocumentManager._codeEditor.editor.setLineClass(DocumentManager._codeEditor.editor.getCursor().line, "activeline");
+                            }
+                });
            DocumentManager._codeEditor.hline = DocumentManager._codeEditor.editor.setLineClass(0, "activeline");
            */
 
-       }
+            }
    },
 
     closeDocument: {
         value: function(id) {
             if(this.activeDocument.dirtyFlag === true){
                 //if file dirty then alert user to save
-            }
+        }
 
             var doc = this._findDocumentByUUID(id);
             this._removeDocumentView(doc.container);
@@ -399,9 +402,9 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
                     this.application.ninja.stage.restoreScroll();
                     this.application.ninja.stage.hideCanvas(false);
                     this.application.ninja.stage.stageView.showRulers();
-                }
             }
         }
+        }
     },
 
     _removeDocumentView: {
@@ -442,5 +445,5 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         value: function() {
             return "userDocument_" + (this._iframeCounter++);
         }
-    }
-});
\ No newline at end of file
+        }
+});
diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index f62133ac..b19f1e70 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -323,7 +323,7 @@ window.hack = function (name, type) {
                                 //
                                 this._cloudDialogComponents.dialog.element.style.opacity = 1;
                                 this._cloudDialogComponents.popup.element.style.opacity = 1;
-                                this._cloudDialogComponents.popup.element.style.margin = '-100px 0px 0px -190px';
+                                this._cloudDialogComponents.popup.element.style.margin = '-170px 0px 0px -190px';
                         }
         }
     },
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html
index 1ab0892d..8e65a705 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.html
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.html
@@ -46,6 +46,18 @@
                         
                         <button class="btn_ok nj-skinned">Ok</button>
                         
+                        <section>
+                                
+                                <h4>Install Ninja Cloud App</h4>
+                                
+                                <p>Donec congue lacinia dui, a porttitor lectus condimentum laoreet. Nunc eu ullamcorper orci. Quisque eget odio ac lectus.</p>
+                                
+                                <div class="cloud_icon"></div>
+                                
+                                <button class="btn_download nj-skinned">Download</button>
+                                
+                        </section>
+                        
                 </div>
         </div>
     
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js
index 7f494dcf..1344661b 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.js
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.js
@@ -17,10 +17,15 @@ exports.CloudPopup = Montage.create(Component, {
         value: true
     },
     ////////////////////////////////////////////////////////////////////
+        //
+        _os: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
     //
     components: {
         enumerable: false,