Merge branch 'refs/heads/FileIO-jose' into FileIO

Conflicts:
	js/controllers/document-controller.js

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

2 files changed, 68 insertions, 42 deletions

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 28818774..02e9918f 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -290,15 +290,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
         }
     },
 
-
-
-    AppendElement: {
-        value: function(element, parent) {
-            this.dirtyFlag = true;
-        }
-    },
-
-
     /**
      * Return the specified inline attribute from the element.
      */
@@ -386,28 +377,29 @@ exports.HTMLDocument = Montage.create(TextDocument, {
         value: function(event){
                 //TODO: Clean up, using for prototyping save
                 this._templateDocument = {};
+                this._templateDocument.html = this.iframe.contentWindow.document;
                 this._templateDocument.head = this.iframe.contentWindow.document.getElementById("userHead");
                 this._templateDocument.body = this.documentRoot = this.iframe.contentWindow.document.getElementById("UserContent");
                 //TODO: Remove, also for prototyping
                 this.application.ninja.documentController._hackRootFlag = true;
                 //
-            //this.documentRoot = this.iframe.contentWindow.document.getElementById("UserContent");
             this.stageBG = this.iframe.contentWindow.document.getElementById("stageBG");
             this.stageBG.onclick = null;
             this._document = this.iframe.contentWindow.document;
             this._window = this.iframe.contentWindow;
             //
             if(!this.documentRoot.Ninja) this.documentRoot.Ninja = {};
-            //
+            //Inserting user's document into template
             this._templateDocument.head.innerHTML = this._userDocument.content.head;
             this._templateDocument.body.innerHTML = this._userDocument.content.body;
             
-            
-            
+            //Adding a handler for the main user document reel to finish loading
+            this._document.body.addEventListener("userTemplateDidLoad",  this.userTemplateDidLoad.bind(this), false);
+
             
             /* this.iframe.contentWindow.document.addEventListener('DOMSubtreeModified', function (e) { */ //TODO: Remove events upon loading once
 
-            //TODO: When written, the best way to initialize the document is to listen for the DOM tree being modified
+            //TODO: When re-written, the best way to initialize the document is to listen for the DOM tree being modified
             setTimeout(function () {
                 
                 
@@ -416,9 +408,47 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                 if(this._document.styleSheets.length > 1) {
-                                        this._styles = this._document.styleSheets[this._document.styleSheets.length - 1];
+                                        //Checking all styleSheets in document
+                                        for (var i in this._document.styleSheets) {
+                                                //If rules are null, assuming cross-origin issue
+                                                if(this._document.styleSheets[i].rules === null) {
+                                                        //TODO: Revisit URLs and URI creation logic, very hack right now
+                                                        var fileUri, cssUrl, cssData, tag, query;
+                                                        if (this._document.styleSheets[i].href.indexOf('js/document/templates/montage-html') !== -1) {
+                                                                //Getting the url of the CSS file
+                                                                cssUrl = this._document.styleSheets[i].href.split('js/document/templates/montage-html')[1];
+                                                                //Creating the URI of the file (this is wrong should not be splitting cssUrl)
+                                                                fileUri = this.application.ninja.coreIoApi.cloudData.root+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+cssUrl.split('/')[1];
+                                                                //Loading the data from the file
+                                                                cssData = this.application.ninja.coreIoApi.readFile({uri: fileUri});
+                                                                //Creating tag with file content
+                                                                tag = this.iframe.contentWindow.document.createElement('style');
+                                                                tag.setAttribute('ninjauri', fileUri);
+                                                                tag.setAttribute('ninjafileurl', cssUrl);
+                                                                tag.innerHTML = cssData.content;
+                                                                //Looping through DOM to insert style tag at location of link element
+                                                                query = this._templateDocument.html.querySelectorAll(['link']);
+                                                                for (var j in query) {
+                                                                        if (query[j].href === this._document.styleSheets[i].href) {
+                                                                                //Disabling style sheet to reload via inserting in style tag
+                                                                                query[j].setAttribute('disabled', 'true');
+                                                                                //Inserting tag
+                                                                                this._templateDocument.head.insertBefore(tag, query[j]);
+                                                                        }
+                                                                }
+                                                        }
+                        }
+                                        }
+                                        
+                                        //TODO: Revisit this logic
+                                        this._styles = this._document.styleSheets[1];
                                         this._stylesheets = this._document.styleSheets; // Entire stlyesheets array
                                         
+                                        console.log(this._document.styleSheets);
+                                        
+                                        ////////////////////////////////////////////////////////////////////////////
+                                        ////////////////////////////////////////////////////////////////////////////
+                                        
                                         //TODO Finish this implementation once we start caching Core Elements
                                         // Assign a model to the UserContent and add the ViewPort reference to it.
                                         NJUtils.makeElementModel(this.documentRoot, "Stage", "stage");
@@ -481,12 +511,20 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             
         }
     },
+
     ////////////////////////////////////////////////////////////////////
+
+    // Handler for user content main reel. Gets called once the main reel of the template
+    // gets deserialized.
+    // Setting up the currentSelectedContainer to the document body.
+    userTemplateDidLoad: {
+        value: function(){
+            this.application.ninja.currentSelectedContainer = this.documentRoot;
+        }
+    },
     
     
-    
-    
-
+    ////////////////////////////////////////////////////////////////////
     _setSWFObjectScript: {
         value: function() {
             if(!this._swfObject) {
diff --git a/js/document/text-document.js b/js/document/text-document.js
index 1132ba65..88464d87 100755
--- a/js/document/text-document.js
+++ b/js/document/text-document.js
@@ -120,15 +120,15 @@ var TextDocument = exports.TextDocument = Montage.create(Component, {
         
         
     /** Private Members **/
-    _name: { value: null, enumerable: false },
-    _uri: { value: null, enumerable: false },
-    _documentType: { value: null, enumerable: false },
-    _container: {value: null, enumerable: false },
-    _uuid: { value: null, enumerable: false },
-    _isActive: { value: true, enumerable: false },
-    _dirtyFlag: { value: false, enumerable: false },
-    _callback: { value: null, enumerable: false },
-    _currentView: { value: null, enumerable: false},
+    _name:          { value: null, enumerable: false },
+    _uri:           { value: null, enumerable: false },
+    _documentType:  { value: null, enumerable: false },
+    _container:     { value: null, enumerable: false },
+    _uuid:          { value: null, enumerable: false },
+    _isActive:      { value: true, enumerable: false },
+    _needsSave:     { value: false, enumarable: false },
+    _callback:      { value: null, enumerable: false },
+    _currentView:   { value: null, enumerable: false},
 
     /** Getters/Setters **/
     name: {
@@ -161,9 +161,9 @@ var TextDocument = exports.TextDocument = Montage.create(Component, {
         set: function(value) { this._isActive = value; }
     },
 
-    dirtyFlag: {
-        get: function() { return this._dirtyFlag; },
-        set: function(value) { this._dirtyFlag = value; }
+    needsSave: {
+        get: function() { return this._needsSave; },
+        set: function(value) { this._needsSave = value }
     },
 
     callback: {
@@ -192,17 +192,5 @@ var TextDocument = exports.TextDocument = Montage.create(Component, {
         value: function() {
             // Have the XHR here?
         }
-    },
-
-    markEdited:{
-        value: function() {
-            this.dirtyFlag = true;
-        }
-    },
-
-    markUnedited:{
-        value: function() {
-            this.dirtyFlag = false;
-        }
     }
 });
\ No newline at end of file