From 3a754133dbc138390503341fd2e9beba3e43aa4b Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 27 Jan 2012 12:05:17 -0800
Subject: Merged old FileIO

---
 js/io/document/html-document.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 js/io/document/html-document.js

(limited to 'js/io/document/html-document.js')

diff --git a/js/io/document/html-document.js b/js/io/document/html-document.js
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From 87e247e74040b5e80ff40003d233d5317881102a Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Thu, 2 Feb 2012 03:30:54 -0800
Subject: fixed code view container, and switching code view

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/io/document/html-document.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'js/io/document/html-document.js')

diff --git a/js/io/document/html-document.js b/js/io/document/html-document.js
index c44dfe75..fc7dd05b 100755
--- a/js/io/document/html-document.js
+++ b/js/io/document/html-document.js
@@ -36,6 +36,13 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
 
     _zoomFactor: { value: 100, enumerable: false },
 
+    _codeEditor: {
+            value: {
+                "editor": { value: null, enumerable: false },
+                "hline": { value: null, enumerable: false }
+            }
+        },
+
     // PUBLIC MEMBERS
     cssLoadInterval: { value: null, enumerable: false },
 
@@ -44,6 +51,11 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
      */
 
     // GETTERS / SETTERS
+    editor: {
+           get: function() { return this._codeEditor.editor; },
+           set: function(value) { this._codeEditor.editor = value}
+       },
+
     selectionExclude: {
         get: function() { return this._selectionExclude; },
         set: function(value) { this._selectionExclude = value; }
-- 
cgit v1.2.3


From 1daf146c849a0a8dbd2b61b14218c9a39bdee3a7 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Fri, 3 Feb 2012 17:22:48 -0800
Subject: added editor tab save while switching code view tabs, integrated new
 file dialog with io mediator to open the new file in a new tab

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/io/document/html-document.js | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'js/io/document/html-document.js')

diff --git a/js/io/document/html-document.js b/js/io/document/html-document.js
index fc7dd05b..24d4e7e4 100755
--- a/js/io/document/html-document.js
+++ b/js/io/document/html-document.js
@@ -43,9 +43,16 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
             }
         },
 
+
     // PUBLIC MEMBERS
     cssLoadInterval: { value: null, enumerable: false },
 
+    codeViewDocument:{
+        writable: true,
+        enumerable: true,
+        value:null
+    },
+
     /*
      * PUBLIC API
      */
@@ -432,5 +439,26 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
                 */
             }
         }
+    },
+
+    /**
+     * public method
+     * parameter:
+     * removeCodeMirrorDivFlag - for code view, tell to remove the codemirror div after saving
+     */
+    save:{
+        value:function(removeCodeMirrorDivFlag){
+            if(this.currentView === "design"){
+                //generate html and save
+            }else if((this.currentView === "code") && (this.codeViewDocument !== null)){
+                if(removeCodeMirrorDivFlag === true){
+                    this.codeViewDocument.save(true);
+                }else{
+                    this.codeViewDocument.save();
+                }
+                //persist to filesystem
+            }
+
+        }
     }
 });
\ No newline at end of file
-- 
cgit v1.2.3


From 45cfffd9261ab1aa714554c584f0d0d8fe627c91 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Fri, 3 Feb 2012 18:04:26 -0800
Subject: allow to open html file in design view, integrated file open with io
 mediator

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/io/document/html-document.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'js/io/document/html-document.js')

diff --git a/js/io/document/html-document.js b/js/io/document/html-document.js
index 24d4e7e4..da1bbe4a 100755
--- a/js/io/document/html-document.js
+++ b/js/io/document/html-document.js
@@ -216,8 +216,9 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
         value: function(doc, uuid, iframe, callback) {
             // Shell mode is not used anymore
             //if(!window.IsInShellMode()) {
-
-                this.init("index-cloud", this._cloudTemplateUri, doc.type, iframe, uuid, callback);
+                if(!doc.name){doc.name = "index-cloud"};
+                if(!doc.uri){doc.uri = this._cloudTemplateUri};
+                this.init(doc.name, doc.uri, doc.type, iframe, uuid, callback);
             /*
             } else {
                 var tmpurl = doc.uri.split('\\');
-- 
cgit v1.2.3


From 272c5f74f4ce76fec9cbe360817bf23639307d3a Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Sun, 5 Feb 2012 19:20:37 -0800
Subject: changes to show document dirty indicator on editing code view, and to
 remove dirty indicator on save.

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/io/document/html-document.js | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'js/io/document/html-document.js')

diff --git a/js/io/document/html-document.js b/js/io/document/html-document.js
index da1bbe4a..8e1eb614 100755
--- a/js/io/document/html-document.js
+++ b/js/io/document/html-document.js
@@ -449,17 +449,22 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
      */
     save:{
         value:function(removeCodeMirrorDivFlag){
-            if(this.currentView === "design"){
-                //generate html and save
-            }else if((this.currentView === "code") && (this.codeViewDocument !== null)){
-                if(removeCodeMirrorDivFlag === true){
-                    this.codeViewDocument.save(true);
-                }else{
-                    this.codeViewDocument.save();
+            try{
+                if(this.currentView === "design"){
+                    //generate html and save
+                }else if((this.currentView === "code") && (this.codeViewDocument !== null)){
+                    if(removeCodeMirrorDivFlag === true){
+                        this.codeViewDocument.save(true);
+                    }else{
+                        this.codeViewDocument.save();
+                    }
+                    //persist to filesystem
                 }
-                //persist to filesystem
+                this.dirtyFlag=false;
+            }catch(e){
+                console.log("Error while saving "+this.uri);
+                console.log(e.stack);
             }
-
         }
     }
 });
\ No newline at end of file
-- 
cgit v1.2.3


From 36b2e540f06cef3887e7d0fea60527fee51e2a40 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Wed, 8 Feb 2012 15:36:53 -0800
Subject: fixed undo/redo for each code view document, changed new file
 integration with io mediator

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/io/document/html-document.js | 45 ++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

(limited to 'js/io/document/html-document.js')

diff --git a/js/io/document/html-document.js b/js/io/document/html-document.js
index 8e1eb614..d51cd279 100755
--- a/js/io/document/html-document.js
+++ b/js/io/document/html-document.js
@@ -36,18 +36,13 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
 
     _zoomFactor: { value: 100, enumerable: false },
 
-    _codeEditor: {
-            value: {
-                "editor": { value: null, enumerable: false },
-                "hline": { value: null, enumerable: false }
-            }
-        },
-
-
     // PUBLIC MEMBERS
     cssLoadInterval: { value: null, enumerable: false },
 
-    codeViewDocument:{
+    _savedLeftScroll: {value:null},
+    _savedTopScroll: {value:null},
+
+    _codeViewDocument:{
         writable: true,
         enumerable: true,
         value:null
@@ -58,10 +53,21 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
      */
 
     // GETTERS / SETTERS
-    editor: {
-           get: function() { return this._codeEditor.editor; },
-           set: function(value) { this._codeEditor.editor = value}
-       },
+
+    codeViewDocument:{
+        get: function() { return this._codeViewDocument; },
+        set: function(value) { this._codeViewDocument = value}
+    },
+
+    savedLeftScroll:{
+        get: function() { return this._savedLeftScroll; },
+        set: function(value) { this._savedLeftScroll = value}
+    },
+
+    savedTopScroll:{
+        get: function() { return this._savedTopScroll; },
+        set: function(value) { this._savedTopScroll = value}
+    },
 
     selectionExclude: {
         get: function() { return this._selectionExclude; },
@@ -233,6 +239,7 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
             this.currentView = "design";
 
             this._loadDocument(this.uri);
+
         }
     },
 
@@ -444,20 +451,15 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
 
     /**
      * public method
-     * parameter:
-     * removeCodeMirrorDivFlag - for code view, tell to remove the codemirror div after saving
+     *
      */
     save:{
-        value:function(removeCodeMirrorDivFlag){
+        value:function(){
             try{
                 if(this.currentView === "design"){
                     //generate html and save
                 }else if((this.currentView === "code") && (this.codeViewDocument !== null)){
-                    if(removeCodeMirrorDivFlag === true){
-                        this.codeViewDocument.save(true);
-                    }else{
-                        this.codeViewDocument.save();
-                    }
+                    this.codeViewDocument.editor.save();
                     //persist to filesystem
                 }
                 this.dirtyFlag=false;
@@ -467,4 +469,5 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
             }
         }
     }
+
 });
\ No newline at end of file
-- 
cgit v1.2.3


From 632a5daca17acb774b9344ccc0e9107f1643924c Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 10 Feb 2012 15:29:12 -0800
Subject: File Open

Adding the functionality to open a basic file.
---
 js/io/document/html-document.js | 84 ++++++++++++++++++++++-------------------
 1 file changed, 46 insertions(+), 38 deletions(-)

(limited to 'js/io/document/html-document.js')

diff --git a/js/io/document/html-document.js b/js/io/document/html-document.js
index d51cd279..fbb34a1d 100755
--- a/js/io/document/html-document.js
+++ b/js/io/document/html-document.js
@@ -11,7 +11,7 @@ var Montage = require("montage/core/core").Montage,
 var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.BaseDocument, {
     // PRIVATE MEMBERS
     _selectionExclude: { value: null, enumerable: false },
-    _cloudTemplateUri: { value: "user-document-templates/montage-application-cloud/index.html", enumerable: false},
+    _htmlTemplateUrl: { value: "user-document-templates/montage-application-cloud/index.html", enumerable: false},
     _iframe: { value: null, enumerable: false },
     _server: { value: null, enumerable: false },
     _selectionModel: { value: [], enumerable: false },
@@ -24,7 +24,7 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
     _styles: { value: null, enumerable: false },
     _stylesheets: { value: null, enumerable: false },
     _stageStyleSheetId : { value: 'nj-stage-stylesheet', enumerable: false },
-    _initialUserDocument: { value: null, enumerable: false },
+    _userDocument: { value: null, enumerable: false },
     _htmlSource: {value: "<html></html>", enumerable: false},
     _glData: {value: null, enumerable: false },
 
@@ -218,30 +218,27 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
 
     //****************************************//
     // PUBLIC METHODS
-    initialize: {
-        value: function(doc, uuid, iframe, callback) {
-            // Shell mode is not used anymore
-            //if(!window.IsInShellMode()) {
-                if(!doc.name){doc.name = "index-cloud"};
-                if(!doc.uri){doc.uri = this._cloudTemplateUri};
-                this.init(doc.name, doc.uri, doc.type, iframe, uuid, callback);
-            /*
-            } else {
-                var tmpurl = doc.uri.split('\\');
-                var fileUrl =  doc.server.url + "/" + tmpurl[tmpurl.length -1] + "?fileio=true&template=/user-document-templates/montage-application/index.html";
-                this.init(name, fileUrl, doc.type, iframe, uuid, callback);
-                this.server = doc.server;
-                this._initialUserDocument = doc;
-            }
-            */
-            this.iframe = iframe;
-            this.selectionExclude = ["HTML", "BODY", "Viewport", "UserContent", "stageBG"];
-            this.currentView = "design";
-
-            this._loadDocument(this.uri);
-
+    
+    
+    ////////////////////////////////////////////////////////////////////
+	//
+	initialize: {
+		value: function(file, uuid, iframe, callback) {
+			//
+			this._userDocument = file;
+			//
+			this.init(file.name, file.uri, file.extension, iframe, uuid, callback);
+			//
+			this.iframe = iframe;
+			this.selectionExclude = ["HTML", "BODY", "Viewport", "UserContent", "stageBG"];
+			this.currentView = "design";
+			//
+			this.iframe.src = this._htmlTemplateUrl;
+            this.iframe.addEventListener("load", this, true);
         }
     },
+    ////////////////////////////////////////////////////////////////////
+
 
 	collectGLData: {
 		value: function( elt,  dataArray )
@@ -345,7 +342,8 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
         }
     },
 
-    // Private
+    /*
+// Private
     _loadDocument: {
         value: function(uri) {
             // Load the document into the Iframe
@@ -353,23 +351,32 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
             this.iframe.addEventListener("load", this, true);
         }
     },
-
+*/
+	
+	
+	
+	////////////////////////////////////////////////////////////////////
+	//
     handleEvent: {
         value: function(event){
-            this.documentRoot = this.iframe.contentWindow.document.getElementById("UserContent");
+        	//
+        	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 = {};
-            }
-
-            if(this._initialUserDocument) {
-                // Now load the user content
-                this.documentRoot.innerHTML = this._initialUserDocument.body;
-                this.iframe.contentWindow.document.getElementById("userHead").innerHTML = this._initialUserDocument.head;
+            //
+            if(!this.documentRoot.Ninja) this.documentRoot.Ninja = {};
+            //
+            
+            this.documentRoot.innerHTML = this._userDocument.content.body;
+            this.iframe.contentWindow.document.getElementById("userHead").innerHTML = this._userDocument.content.head;
+            
+          
+            
+            	
+            	
+            
 
                 this.cssLoadInterval = setInterval(function() {
                     if(this._document.styleSheets.length > 1) {
@@ -383,7 +390,8 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
                 
                 // TODO - Not sure where this goes
                 this._userComponentSet = {};
-            } else {
+
+            
                 this._styles = this._document.styleSheets[this._document.styleSheets.length - 1];
                 this._stylesheets = this._document.styleSheets; // Entire stlyesheets array
 
@@ -429,7 +437,7 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
                 }
 
                 this.callback(this);
-            }
+            
         }
     },
 
-- 
cgit v1.2.3


From a30d76ff641ce89686cf5fbd9f04ac9ab4e9c830 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 10 Feb 2012 17:21:28 -0800
Subject: initial color chip for the stage

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/io/document/html-document.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'js/io/document/html-document.js')

diff --git a/js/io/document/html-document.js b/js/io/document/html-document.js
index c44dfe75..dd3507c2 100644
--- a/js/io/document/html-document.js
+++ b/js/io/document/html-document.js
@@ -398,6 +398,9 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
 
                         this.documentRoot.elementModel.stageView = this.documentRoot.elementModel.defaultRule.cssRules[j];
 
+                    } else if(this.documentRoot.elementModel.defaultRule.cssRules[j].selectorText === "#stageBG") {
+
+                        this.documentRoot.elementModel.stageBackground = this.documentRoot.elementModel.defaultRule.cssRules[j];
                     }
                 }
 
-- 
cgit v1.2.3


From b1fc4f84d92efeaa33ec239b662235c9e8218d0c Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Sun, 12 Feb 2012 16:50:33 -0800
Subject: File Save (HTML only)

Added the ability to save an HTML file from design view, need to add CSS detection and saving (of styles in <style> only). Also need to add 'Save All' for all file attached to the HTML file.
---
 js/io/document/html-document.js | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'js/io/document/html-document.js')

diff --git a/js/io/document/html-document.js b/js/io/document/html-document.js
index fbb34a1d..2ece76c5 100755
--- a/js/io/document/html-document.js
+++ b/js/io/document/html-document.js
@@ -14,6 +14,7 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
     _htmlTemplateUrl: { value: "user-document-templates/montage-application-cloud/index.html", enumerable: false},
     _iframe: { value: null, enumerable: false },
     _server: { value: null, enumerable: false },
+    _templateDocument: { value: null, enumerable: false },
     _selectionModel: { value: [], enumerable: false },
     _undoModel: { value: { "queue" : [], "position" : 0 }, enumerable: false},
 
@@ -359,6 +360,10 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
 	//
     handleEvent: {
         value: function(event){
+        	//TODO: Clean up, using for prototyping save
+        	this._templateDocument = {};
+        	this._templateDocument.head = this.iframe.contentWindow.document.getElementById("userHead");;
+        	this._templateDocument.body = this.iframe.contentWindow.document.getElementById("UserContent");;
         	//
         	this.documentRoot = this.iframe.contentWindow.document.getElementById("UserContent");
             this.stageBG = this.iframe.contentWindow.document.getElementById("stageBG");
@@ -373,7 +378,7 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
             this.iframe.contentWindow.document.getElementById("userHead").innerHTML = this._userDocument.content.head;
             
           
-            
+            //TODO: Look at code below and clean up
             	
             	
             
@@ -461,7 +466,21 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
      * public method
      *
      */
-    save:{
+	////////////////////////////////////////////////////////////////////
+	//
+	save: {
+		enumerable: false,
+    	value: function () {
+    		//TODO: Add code view logic
+    		return {mode: 'html', document: this._userDocument, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
+    	}
+	}
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////
+	
+	
+    /*
+save:{
         value:function(){
             try{
                 if(this.currentView === "design"){
@@ -477,5 +496,6 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
             }
         }
     }
+*/
 
 });
\ No newline at end of file
-- 
cgit v1.2.3


From 1b84b4549934578caaad38ef14b34cba35e2622a Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Sun, 12 Feb 2012 21:03:39 -0800
Subject: File Save (with CSS styles)

Temp fix for saving styles in <style> of HTML document.
---
 js/io/document/html-document.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'js/io/document/html-document.js')

diff --git a/js/io/document/html-document.js b/js/io/document/html-document.js
index 2ece76c5..99bf4576 100755
--- a/js/io/document/html-document.js
+++ b/js/io/document/html-document.js
@@ -471,8 +471,9 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
 	save: {
 		enumerable: false,
     	value: function () {
-    		//TODO: Add code view logic
-    		return {mode: 'html', document: this._userDocument, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
+    		//console.log(this._styles, this._stylesheets);
+    		//TODO: Add code view logic and also styles for HTML
+    		return {mode: 'html', document: this._userDocument, style: this._styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
     	}
 	}
 	////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From 018a6132d93a73d28bd349122404c236e61cb765 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Mon, 13 Feb 2012 15:03:23 -0800
Subject: Save 'code' view files

Added functionality (temp) to save files in code view.
---
 js/io/document/html-document.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'js/io/document/html-document.js')

diff --git a/js/io/document/html-document.js b/js/io/document/html-document.js
index 99bf4576..dfd8566a 100755
--- a/js/io/document/html-document.js
+++ b/js/io/document/html-document.js
@@ -471,9 +471,12 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
 	save: {
 		enumerable: false,
     	value: function () {
-    		//console.log(this._styles, this._stylesheets);
     		//TODO: Add code view logic and also styles for HTML
-    		return {mode: 'html', document: this._userDocument, style: this._styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
+    		if (this.currentView === 'design') {
+    			return {mode: 'html', document: this._userDocument, style: this._styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
+    		} else if(this.currentView === "code"){
+    			//TODO: Would this get call when we are in code of HTML?
+    		}
     	}
 	}
 	////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From 5b6c62b7164cbde2845a3f7af810568e5ba53a6a Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Mon, 13 Feb 2012 22:39:28 -0800
Subject: File IO UI tweaks

Making minor tweaks to the UI for file IO, will need to make much more at a later time.
---
 js/io/document/html-document.js | 38 +++++++++++---------------------------
 1 file changed, 11 insertions(+), 27 deletions(-)

(limited to 'js/io/document/html-document.js')

diff --git a/js/io/document/html-document.js b/js/io/document/html-document.js
index 520906ab..ac556c2d 100755
--- a/js/io/document/html-document.js
+++ b/js/io/document/html-document.js
@@ -4,11 +4,14 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
-var Montage = require("montage/core/core").Montage,
-    baseDocumentModule = require("js/io/document/base-document"),
-    NJUtils = require("js/lib/NJUtils").NJUtils;
-
-var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.BaseDocument, {
+////////////////////////////////////////////////////////////////////////
+//
+var Montage = 		require("montage/core/core").Montage,
+    BaseDocument =	require("js/io/document/base-document").BaseDocument,
+    NJUtils = 		require("js/lib/NJUtils").NJUtils;
+////////////////////////////////////////////////////////////////////////
+//
+exports.HTMLDocument = Montage.create(BaseDocument, {
     // PRIVATE MEMBERS
     _selectionExclude: { value: null, enumerable: false },
     _htmlTemplateUrl: { value: "user-document-templates/montage-application-cloud/index.html", enumerable: false},
@@ -477,32 +480,13 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
     		//TODO: Add code view logic and also styles for HTML
     		if (this.currentView === 'design') {
     			return {mode: 'html', document: this._userDocument, style: this._styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
-    		} else if(this.currentView === "code"){
+    		} else if (this.currentView === "code"){
     			//TODO: Would this get call when we are in code of HTML?
+    		} else {
+    			//Error
     		}
     	}
 	}
 	////////////////////////////////////////////////////////////////////
 	////////////////////////////////////////////////////////////////////
-	
-	
-    /*
-save:{
-        value:function(){
-            try{
-                if(this.currentView === "design"){
-                    //generate html and save
-                }else if((this.currentView === "code") && (this.codeViewDocument !== null)){
-                    this.codeViewDocument.editor.save();
-                    //persist to filesystem
-                }
-                this.dirtyFlag=false;
-            }catch(e){
-                console.log("Error while saving "+this.uri);
-                console.log(e.stack);
-            }
-        }
-    }
-*/
-
 });
\ No newline at end of file
-- 
cgit v1.2.3


From a7952c5a16e2cae3fd1a459b03b9f16bba1004da Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Tue, 14 Feb 2012 13:23:20 -0800
Subject: Cleaning up

Setting up a 'document' folder to handle all document related classes that in relation to IO
---
 js/io/document/html-document.js | 492 ----------------------------------------
 1 file changed, 492 deletions(-)
 delete mode 100755 js/io/document/html-document.js

(limited to 'js/io/document/html-document.js')

diff --git a/js/io/document/html-document.js b/js/io/document/html-document.js
deleted file mode 100755
index ac556c2d..00000000
--- a/js/io/document/html-document.js
+++ /dev/null
@@ -1,492 +0,0 @@
-/* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
-
-////////////////////////////////////////////////////////////////////////
-//
-var Montage = 		require("montage/core/core").Montage,
-    BaseDocument =	require("js/io/document/base-document").BaseDocument,
-    NJUtils = 		require("js/lib/NJUtils").NJUtils;
-////////////////////////////////////////////////////////////////////////
-//
-exports.HTMLDocument = Montage.create(BaseDocument, {
-    // PRIVATE MEMBERS
-    _selectionExclude: { value: null, enumerable: false },
-    _htmlTemplateUrl: { value: "user-document-templates/montage-application-cloud/index.html", enumerable: false},
-    _iframe: { value: null, enumerable: false },
-    _server: { value: null, enumerable: false },
-    _templateDocument: { value: null, enumerable: false },
-    _selectionModel: { value: [], enumerable: false },
-    _undoModel: { value: { "queue" : [], "position" : 0 }, enumerable: false},
-
-    _document: { value: null, enumerable: false },
-    _documentRoot: { value: null, enumerable: false },
-    _stageBG: { value: null, enumerable: false },
-    _window: { value: null, enumerable: false },
-    _styles: { value: null, enumerable: false },
-    _stylesheets: { value: null, enumerable: false },
-    _stageStyleSheetId : { value: 'nj-stage-stylesheet', enumerable: false },
-    _userDocument: { value: null, enumerable: false },
-    _htmlSource: {value: "<html></html>", enumerable: false},
-    _glData: {value: null, enumerable: false },
-
-    _elementCounter: { value: 1, enumerable: false },
-    _snapping : { value: true, enumerable: false },
-    _layoutMode: { value: "all", enumerable: false },
-    _draw3DGrid: { value: false, writable: true },
-    _swfObject: { value: false, enumerable: false },
-
-    _zoomFactor: { value: 100, enumerable: false },
-
-    // PUBLIC MEMBERS
-    cssLoadInterval: { value: null, enumerable: false },
-
-    _savedLeftScroll: {value:null},
-    _savedTopScroll: {value:null},
-
-    _codeViewDocument:{
-        writable: true,
-        enumerable: true,
-        value:null
-    },
-
-    /*
-     * PUBLIC API
-     */
-
-    // GETTERS / SETTERS
-
-    codeViewDocument:{
-        get: function() { return this._codeViewDocument; },
-        set: function(value) { this._codeViewDocument = value}
-    },
-
-    savedLeftScroll:{
-        get: function() { return this._savedLeftScroll; },
-        set: function(value) { this._savedLeftScroll = value}
-    },
-
-    savedTopScroll:{
-        get: function() { return this._savedTopScroll; },
-        set: function(value) { this._savedTopScroll = value}
-    },
-
-    selectionExclude: {
-        get: function() { return this._selectionExclude; },
-        set: function(value) { this._selectionExclude = value; }
-    },
-
-    iframe: {
-        get: function() { return this._iframe; },
-        set: function(value) { this._iframe = value; }
-    },
-
-    server: {
-        get: function() { return this._server; },
-        set: function(value) { this._server = value; }
-    },
-
-    selectionModel: {
-        get: function() { return this._selectionModel; },
-        set: function(value) { this._selectionModel = value; }
-    },
-
-    undoModel: {
-        get: function() { return this._undoModel; },
-        set: function(value) { this._undoModel.queue = value.queue; this._undoModel.position = value.position; }
-    },
-
-    documentRoot: {
-        get: function() { return this._documentRoot; },
-        set: function(value) { this._documentRoot = value; }
-    },
-
-    stageBG: {
-        get: function() { return this._stageBG; },
-        set: function(value) { this._stageBG = value; }
-    },
-
-    elementCounter: {
-        set: function(value) { this._elementCounter = value; },
-        get: function() { return this._elementCounter; }
-    },
-
-    snapping: {
-        get: function() { return this._snapping; },
-        set: function(value) {
-            if(this._snapping !== value) {
-                this._snapping = value;
-            }
-        }
-    },
-
-    // TODO SEND THE EVENT --> Redraw the desired layout
-    layoutMode: {
-        get: function() { return this._layoutMode; },
-        set: function(mode) { this._layoutMode = mode; }
-    },
-
-    draw3DGrid: {
-        get: function() { return this._draw3DGrid; },
-        set: function(value) {
-            if(this._draw3DGrid !== value) {
-                this._draw3DGrid = value;
-            }
-        }
-    },
-
-    _userComponentSet: {
-        value: {},
-        writable: true,
-        enumerable:true
-    },
-
-//    userComponentSet:{
-//        enumerable: true,
-//        get: function() {
-//            return this._userComponentSet;
-//        },
-//        set: function(value) {
-//            this._userComponentSet = value;
-//            this._drawUserComponentsOnOpen();
-//        }
-//    },
-//
-//    _drawUserComponentsOnOpen:{
-//        value:function(){
-//            for(var i in this._userComponentSet){
-//                console.log(this._userComponentSet[i].control)
-//                this._userComponentSet[i].control.needsDraw = true;
-//            }
-//        }
-//    },
-    
-    glData: {
-        get: function()
-		{
-			var elt = this.iframe;
-			var elt = this.iframe.contentWindow.document.getElementById("UserContent");
-			this._glData = null;
-			if (elt)
-			{
-				this._glData = new Array();
-				this.collectGLData( elt,  this._glData );
-			}
-				
-			return this._glData
-		},
-
-        set: function(value)
-		{
-			var nWorlds = value.length;
-			for (var i=0;  i<nWorlds;  i++)
-			{
-				var importStr = value[i];
-				var startIndex = importStr.indexOf( "id: " );
-				if (startIndex >= 0)
-				{
-					var endIndex = importStr.indexOf( "\n", startIndex );
-					if (endIndex > 0)
-					{
-						var id = importStr.substring( startIndex+4, endIndex );
-						var canvas = this.iframe.contentWindow.document.getElementById( id );
-						if (canvas)
-						{
-							if (!canvas.elementModel)
-							{
-								NJUtils.makeElementModel(canvas, "Canvas", "shape", true);
-							}
-								
-							if (canvas.elementModel)
-							{
-								if (canvas.elementModel.shapeModel.GLWorld)
-                                    canvas.elementModel.shapeModel.GLWorld.clearTree();
-
-								var world = new GLWorld( canvas );
-								canvas.elementModel.shapeModel.GLWorld = world;
-								world.import( importStr );
-							}
-						}
-					}
-				}
-			}
-		}
-    },
-
-    zoomFactor: {
-        get: function() { return this._zoomFactor; },
-        set: function(value) { this._zoomFactor = value; }
-    },
-
-    //****************************************//
-    // PUBLIC METHODS
-    
-    
-    ////////////////////////////////////////////////////////////////////
-	//
-	initialize: {
-		value: function(file, uuid, iframe, callback) {
-			//
-			this._userDocument = file;
-			//
-			this.init(file.name, file.uri, file.extension, iframe, uuid, callback);
-			//
-			this.iframe = iframe;
-			this.selectionExclude = ["HTML", "BODY", "Viewport", "UserContent", "stageBG"];
-			this.currentView = "design";
-			//
-			this.iframe.src = this._htmlTemplateUrl;
-            this.iframe.addEventListener("load", this, true);
-        }
-    },
-    ////////////////////////////////////////////////////////////////////
-
-
-	collectGLData: {
-		value: function( elt,  dataArray )
-		{
-			if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld)
-			{
-				var data = elt.elementModel.shapeModel.GLWorld.export();
-				dataArray.push( data );
-			}
-
-			if (elt.children)
-			{
-				var nKids = elt.children.length;
-				for (var i=0;  i<nKids;  i++)
-				{
-					var child = elt.children[i];
-					this.collectGLData( child, dataArray );
-				}
-			}
-		}
-	},
-
-
-    // OLD
-
-    inExclusion: {
-        value: function(element) {
-            if(this._selectionExclude.indexOf(element.id) === -1) {
-                if(this._selectionExclude.indexOf(element.nodeName) === -1) {
-                    return -1;
-                }
-            } else if (this._selectionExclude.indexOf(element.id) === -1) {
-                return -1;
-            } else {
-                return 1;
-            }
-        }
-    },
-
-
-
-    AppendElement: {
-        value: function(element, parent) {
-            this.dirtyFlag = true;
-        }
-    },
-
-
-    /**
-     * Return the specified inline attribute from the element.
-     */
-    GetElementAttribute: {
-        value: function(element, attribute) {
-
-            var value;
-
-            if(attribute === "src") {
-                return element[attribute].replace(window.location.href, '');
-            }
-
-            value = element[attribute];
-
-            if(value !== undefined) return value;
-//            if(value || value === false) return [value, "inline"];
-
-            // 3.
-            //value = this._document.defaultView.getComputedStyle(element,null).getPropertyValue(attribute);
-            //if(value) return value;
-
-            return null;
-        }
-    },
-
-    GetElementStyle: {
-        value: function(element, style) {
-//            return this._queryStylesheets(element, style);
-        }
-    },
-
-    SetStyle: {
-        value: function(type, selector, style, value) {
-            try {
-                for(var j=0; j<this._stylesheets.length;j++){
-                    for(var i=0; i<this._stylesheets[j].cssRules.length;i++) {
-                        if(this._stylesheets[j].cssRules[i].selectorText === type + selector) {
-                            this._stylesheets[j].cssRules[i].style[style] = value;
-
-                            return true;
-                        }
-                    }
-                }
-            } catch(err) {
-                console.log("Cannot change the style of selector: " + selector + " " + err);
-            }
-        }
-    },
-
-    GetElementFromPoint: {
-        value: function(x, y) {
-            return this._window.getElement(x,y);
-        }
-    },
-
-    /*
-// Private
-    _loadDocument: {
-        value: function(uri) {
-            // Load the document into the Iframe
-            this.iframe.src = uri;
-            this.iframe.addEventListener("load", this, true);
-        }
-    },
-*/
-	
-	
-	
-	////////////////////////////////////////////////////////////////////
-	//
-    handleEvent: {
-        value: function(event){
-        	//TODO: Clean up, using for prototyping save
-        	this._templateDocument = {};
-        	this._templateDocument.head = this.iframe.contentWindow.document.getElementById("userHead");;
-        	this._templateDocument.body = this.iframe.contentWindow.document.getElementById("UserContent");;
-        	//
-        	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 = {};
-            //
-            
-            this.documentRoot.innerHTML = this._userDocument.content.body;
-            this.iframe.contentWindow.document.getElementById("userHead").innerHTML = this._userDocument.content.head;
-            
-          
-            //TODO: Look at code below and clean up
-            	
-            	
-            
-
-                this.cssLoadInterval = setInterval(function() {
-                    if(this._document.styleSheets.length > 1) {
-                        clearInterval(this.cssLoadInterval);
-                        this._styles = this._document.styleSheets[this._document.styleSheets.length - 1];
-                        this._stylesheets = this._document.styleSheets; // Entire stlyesheets array
-
-                        this.callback(this);
-                    }
-                }.bind(this), 50);
-                
-                // TODO - Not sure where this goes
-                this._userComponentSet = {};
-
-            
-                this._styles = this._document.styleSheets[this._document.styleSheets.length - 1];
-                this._stylesheets = this._document.styleSheets; // Entire stlyesheets array
-
-                /* 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");
-                //this.documentRoot.elementModel.viewPort = this.iframe.contentWindow.document.getElementById("Viewport");
-                NJUtils.makeElementModel(this.stageBG, "Stage", "stage");
-                NJUtils.makeElementModel(this.iframe.contentWindow.document.getElementById("Viewport"), "Stage", "stage");
-
-                for(i = 0; i < this._stylesheets.length; i++) {
-                    if(this._stylesheets[i].ownerNode.id === this._stageStyleSheetId) {
-                        this.documentRoot.elementModel.defaultRule = this._stylesheets[i];
-                        break;
-                    }
-                }
-
-                // Temporary create properties for each rule we need to save the index of the rule.
-                var len = this.documentRoot.elementModel.defaultRule.cssRules.length;
-                for(var j = 0; j < len; j++) {
-//                    console.log(this.documentRoot.elementModel.defaultRule.cssRules[j].selectorText);
-                    if(this.documentRoot.elementModel.defaultRule.cssRules[j].selectorText === "*") {
-
-                        this.documentRoot.elementModel.transitionStopRule = this.documentRoot.elementModel.defaultRule.cssRules[j];
-
-                    } else if(this.documentRoot.elementModel.defaultRule.cssRules[j].selectorText === "body") {
-
-                        this.documentRoot.elementModel.body = this.documentRoot.elementModel.defaultRule.cssRules[j];
-
-                    } else if(this.documentRoot.elementModel.defaultRule.cssRules[j].selectorText === "#Viewport") {
-
-                        this.documentRoot.elementModel.viewPort = this.documentRoot.elementModel.defaultRule.cssRules[j];
-
-                    } else if(this.documentRoot.elementModel.defaultRule.cssRules[j].selectorText === ".stageDimension") {
-
-                        this.documentRoot.elementModel.stageDimension = this.documentRoot.elementModel.defaultRule.cssRules[j];
-
-                    } else if(this.documentRoot.elementModel.defaultRule.cssRules[j].selectorText === ".stageView") {
-
-                        this.documentRoot.elementModel.stageView = this.documentRoot.elementModel.defaultRule.cssRules[j];
-
-                    } else if(this.documentRoot.elementModel.defaultRule.cssRules[j].selectorText === "#stageBG") {
-
-                        this.documentRoot.elementModel.stageBackground = this.documentRoot.elementModel.defaultRule.cssRules[j];
-                    }
-                }
-
-                this.callback(this);
-            
-        }
-    },
-
-    _setSWFObjectScript: {
-        value: function() {
-            if(!this._swfObject) {
-                /*
-                var swfObj = document.createElement("script");
-                swfObj.type = "text/javascript";
-                swfObj.src = "../../user-document-templates/external-libs/swf-object/swfobject.js";
-                swfObj.id = "swfObject";
-                var head= this._document.getElementsByTagName('head')[0];
-                head.appendChild(swfObj);
-                this._swfObject = true;
-                */
-            }
-        }
-    },
-
-    /**
-     * public method
-     *
-     */
-	////////////////////////////////////////////////////////////////////
-	//
-	save: {
-		enumerable: false,
-    	value: function () {
-    		//TODO: Add code view logic and also styles for HTML
-    		if (this.currentView === 'design') {
-    			return {mode: 'html', document: this._userDocument, style: this._styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
-    		} else if (this.currentView === "code"){
-    			//TODO: Would this get call when we are in code of HTML?
-    		} else {
-    			//Error
-    		}
-    	}
-	}
-	////////////////////////////////////////////////////////////////////
-	////////////////////////////////////////////////////////////////////
-});
\ No newline at end of file
-- 
cgit v1.2.3