From 9321b1d7ab2d23e165ac90e9eea3287f72463948 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 17 May 2012 09:51:11 -0700
Subject: Linear & radial gradients for runtime fixes

---
 js/document/html-document.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js/document')

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 9d083dd8..61223499 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -209,8 +209,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 			{
 				/*
 				// Use this code to test the runtime version of WebGL
-				var cdm = new NinjaCvsRt.CanvasDataManager();
-				cdm.loadGLData(elt,  value,  null );
+				var cvsDataMngr = Object.create(NinjaCvsRt.CanvasDataManager, {});
+				cvsDataMngr.loadGLData(elt, value);
 				*/
 
 				// /*
-- 
cgit v1.2.3


From 792c83a0fe8f7f22d139684ed6d711a2c334c098 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Thu, 17 May 2012 16:55:19 -0700
Subject: Adding component initialization on open

This is for opening components, selection is still not reflecting component data.
---
 js/document/views/design.js | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'js/document')

diff --git a/js/document/views/design.js b/js/document/views/design.js
index 2ccb82d1..bd8c25ec 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -184,8 +184,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
         	this._bodyFragment = null;
         	//Calling standard method to finish opening document
         	this.bodyContentLoaded(null);
-
-            // TODO: Clean up this code
+            //TODO: Move this to be set via the controller
             this.application.ninja.stage.documentOffsetLeft = parseInt((this.document.body.scrollWidth - this._template.size.width)/2);
             this.application.ninja.stage.documentOffsetTop = parseInt((this.document.body.scrollHeight - this._template.size.height)/2);
     	}
@@ -243,17 +242,15 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
 					}
 				}
 			}
-            //Checking and initializing webGL
+           	//Checking for script tags then parsing check for montage and webgl
             if (scripttags.length > 0) {
+            	//Checking and initializing webGL
             	this.initWebGl(scripttags);
-            } //Else there is not data to parse
-    		
-    		
-    		
-    		//TODO: Load Montage Components (blocking)
-    		//this.initMontage();
-    		
-    		
+            	//Checking and initializing Montage
+            	this.initMontage(scripttags);
+            } else {
+            	//Else there is not data to parse
+            }
     		//Makign callback if specified
     		if (this._callback) this._callback();
     	}
@@ -350,8 +347,14 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     ////////////////////////////////////////////////////////////////////
 	//
     initMontage: {
-        value: function () {
-        	//initWithDocument(window.document) instantiateWithOwnerAndDocument(null, window.document)
+        value: function (scripttags) {
+        	//
+        	this.iframe.contentWindow.document.body.addEventListener('mjsTemplateReady', function () {
+        		//Initializing template with user's seriliazation
+        		var template = this.iframe.contentWindow.mjsTemplate.create();
+        		template.initWithDocument(this.iframe.contentWindow.document);
+        		template.instantiateWithOwnerAndDocument(null, this.iframe.contentWindow.document, function (e){/*Nothing just a required extra parameter*/});
+        	}.bind(this), false);
         }
     },
     ////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From bf3d3bf0ec530f7636a8738298c3cbc0fe0e56de Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Thu, 17 May 2012 19:52:57 -0700
Subject: CSS Panel - Add highlight CSS class to template file

---
 js/document/templates/html/index.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'js/document')

diff --git a/js/document/templates/html/index.html b/js/document/templates/html/index.html
index 933df157..70187900 100755
--- a/js/document/templates/html/index.html
+++ b/js/document/templates/html/index.html
@@ -54,6 +54,10 @@
 			.nj-preset-transition {
 				-webkit-transition: all 450ms linear !important;
 			}
+
+            .nj-element-highlight {
+                 outline: 4px solid #ff0000;
+             }
         </style>
         
         <script type="text/javascript" data-ninja-template="true">
-- 
cgit v1.2.3


From eff40602cac6821f8272177c24b6bf3de399f8b1 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 17 May 2012 21:11:33 -0700
Subject: multiple documents - enable opening multiple documents and initial
 switching

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

(limited to 'js/document')

diff --git a/js/document/document-html.js b/js/document/document-html.js
index 56d9db02..c77ed7bc 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -119,8 +119,6 @@ exports.HtmlDocument = Montage.create(Component, {
     		this._observer = null;
     		//Making callback after view is loaded
     	    this.loaded.callback.call(this.loaded.context, this);
-    	    //Setting opacity to be viewable after load
-		   	this.model.views.design.iframe.style.opacity = 1;
     	}
     },
     ////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From 7a94696e19b14e15261df516e2ba75e693b1313d Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 18 May 2012 00:21:56 -0700
Subject: enabling basic document switching

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/document/document-html.js | 20 ++++++++++--
 js/document/html-document.js | 78 +-------------------------------------------
 js/document/models/base.js   |  2 +-
 3 files changed, 20 insertions(+), 80 deletions(-)

(limited to 'js/document')

diff --git a/js/document/document-html.js b/js/document/document-html.js
index c77ed7bc..0037c94d 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -134,7 +134,7 @@ exports.HtmlDocument = Montage.create(Component, {
 	//
     serializeDocument: {
     	value: function () {
-            // There are not needed for now ssince we cannot change them
+            // There are not needed for now since we cannot change them
             //this.gridHorizontalSpacing = this.application.ninja.stage.drawUtils.gridHorizontalSpacing;
             //this.gridVerticalSpacing = this.application.ninja.stage.drawUtils.gridVerticalSpacing;
 
@@ -150,13 +150,29 @@ exports.HtmlDocument = Montage.create(Component, {
 
             // Pause the videos
             this.model.views.design.pauseVideos();
+
+            this.model.isActive = false;
     	}
     },
     ////////////////////////////////////////////////////////////////////
 	//
     deserializeDocument: {
     	value: function () {
-    		//TODO: Import functionality
+            // There are not needed for now since we cannot change them
+            //this.application.ninja.stage.drawUtils.gridHorizontalSpacing = this.gridHorizontalSpacing;
+            //this.application.ninja.stage.drawUtils.gridVerticalSpacing = this.gridVerticalSpacing;
+
+            // Deserialize the current scroll position
+            // TODO: Implement
+
+            this.application.ninja.selectedElements = this.model.selection.slice(0);
+
+            this.application.ninja.appModel.show3dGrid = this.draw3DGrid;
+
+            // Serialize the undo
+            // TODO: Save the montage undo queue
+
+            this.model.isActive = true;
     	}
     }
     ////////////////////////////////////////////////////////////////////
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 68c2a9fb..bcf2b5c2 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -454,55 +454,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
         }
     },
 
-    /**
-     * 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);
@@ -919,32 +870,5 @@ exports.HTMLDocument = Montage.create(TextDocument, {
     			//Error
     		}
     	}
-	},
-
-    ////////////////////////////////////////////////////////////////////
-    restoreAppState:{
-        enumerable: false,
-        value: function () {
-            this.application.ninja.stage.drawUtils.gridHorizontalSpacing = this.gridHorizontalSpacing;
-            this.application.ninja.stage.drawUtils.gridVerticalSpacing = this.gridVerticalSpacing;
-           
-            if((this.savedLeftScroll !== null) && (this.savedTopScroll !== null)){
-                this.application.ninja.stage._iframeContainer.scrollLeft = this.savedLeftScroll;
-                this.application.ninja.stage._iframeContainer.scrollTop = this.savedTopScroll;
-                this.application.ninja.stage.handleScroll();
-            }
-
-            this.application.ninja.currentSelectedContainer = this.documentRoot;
-            if(this.selectionModel){
-                this.application.ninja.selectedElements = this.selectionModel.slice(0);
-            }
-
-            this.application.ninja.appModel.show3dGrid = this.draw3DGrid;
-
-            this.application.ninja.undocontroller.undoQueue = this.undoStack.slice(0);
-            this.application.ninja.undocontroller.redoQueue = this.redoStack.slice(0);
-
-
-        }
-    }
+	}
 });
\ No newline at end of file
diff --git a/js/document/models/base.js b/js/document/models/base.js
index 649539ea..df341b2f 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -30,7 +30,7 @@ exports.BaseDocumentModel = Montage.create(Component, {
 	////////////////////////////////////////////////////////////////////
 	//
     _isActive: {
-        value: null
+        value: true
     },
     ////////////////////////////////////////////////////////////////////
 	//
-- 
cgit v1.2.3


From 66edf78c7e5df11218ef733686965beab05c7c7d Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 18 May 2012 14:01:00 -0700
Subject: fixing a scrolling issue when multiple documents are switched

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/document/document-html.js | 11 +++++++++--
 js/document/models/html.js   | 17 +++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

(limited to 'js/document')

diff --git a/js/document/document-html.js b/js/document/document-html.js
index 0037c94d..983da966 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -139,7 +139,11 @@ exports.HtmlDocument = Montage.create(Component, {
             //this.gridVerticalSpacing = this.application.ninja.stage.drawUtils.gridVerticalSpacing;
 
             // Serialize the current scroll position
-            // TODO: Implement
+            this.model.scrollLeft = this.application.ninja.stage._scrollLeft;
+            this.model.scrollTop = this.application.ninja.stage._scrollTop;
+            this.model.userContentLeft = this.application.ninja.stage._userContentLeft;
+            this.model.userContentTop = this.application.ninja.stage._userContentTop;
+
 
             // Serialize the selection
             this.model.selection = this.application.ninja.selectedElements.slice(0);
@@ -163,7 +167,10 @@ exports.HtmlDocument = Montage.create(Component, {
             //this.application.ninja.stage.drawUtils.gridVerticalSpacing = this.gridVerticalSpacing;
 
             // Deserialize the current scroll position
-            // TODO: Implement
+            this.application.ninja.stage._scrollLeft = this.model.scrollLeft;
+            this.application.ninja.stage._scrollTop = this.model.scrollTop;
+            this.application.ninja.stage._userContentLeft = this.model.userContentLeft;
+            this.application.ninja.stage._userContentTop = this.model.userContentTop;
 
             this.application.ninja.selectedElements = this.model.selection.slice(0);
 
diff --git a/js/document/models/html.js b/js/document/models/html.js
index 67457863..a97b4b5a 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -27,6 +27,23 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
     draw3DGrid: {
         value: false
     },
+    ////////////////////////////////////////////////////////////////////
+    //
+    scrollLeft: {
+        value: null
+    },
+
+    scrollTop: {
+        value: null
+    },
+
+    userContentLeft: {
+        value: null
+    },
+
+    userContentTop: {
+        value: null
+    },
     ////////////////////////////////////////////////////////////////////
 	//
 	baseHref: {
-- 
cgit v1.2.3


From d878aa470074d5698a316512b513949fa22073f2 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 18 May 2012 15:23:15 -0700
Subject: Fixing save logic

Moved dirty marker clearing code to model.
---
 js/document/models/base.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'js/document')

diff --git a/js/document/models/base.js b/js/document/models/base.js
index df341b2f..c99e36c7 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -151,7 +151,7 @@ exports.BaseDocumentModel = Montage.create(Component, {
         			head: this.views.design.iframe.contentWindow.document.head,
         			body: this.views.design.iframe.contentWindow.document.body,
         			mjsTemplateCreator: this.views.design.iframe.contentWindow.mjsTemplateCreator
-        		}, callback.bind(this));
+        		}, this.handleSaved.bind({callback: callback, model: this}));
         	} else {
         		//TODO: Add logic to save code view data
         	}
@@ -180,7 +180,7 @@ exports.BaseDocumentModel = Montage.create(Component, {
         			head: this.views.design.iframe.contentWindow.document.head,
         			body: this.views.design.iframe.contentWindow.document.body,
         			mjsTemplateCreator: this.views.design.iframe.contentWindow.mjsTemplateCreator
-        		}, callback.bind(this));
+        		}, this.handleSaved.bind({callback: callback, model: this}));
         	} else {
         		//TODO: Add logic to save code view data
         	}
@@ -190,7 +190,7 @@ exports.BaseDocumentModel = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
 	//
 	saveAs: {
-        value: function () {
+        value: function (callback) {
         	//
         	if (this.needsSave) {
         		//Save current file on memory
@@ -199,6 +199,18 @@ exports.BaseDocumentModel = Montage.create(Component, {
         	}
         }
     },
+    ////////////////////////////////////////////////////////////////////
+	//
+	handleSaved: {
+		value: function (result) {
+			//
+			if (result.status === 204) {
+				this.model.needsSave = false;
+			}
+			//
+			if (this.callback) this.callback(result);
+		}
+	},
     ////////////////////////////////////////////////////////////////////
 	//
 	close: {
-- 
cgit v1.2.3


From 48beced355a5d4ee959ed41e104b0a343411658c Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 18 May 2012 16:33:10 -0700
Subject: Clean up and adding TODOs

---
 js/document/document-html.js | 18 +++++++++++++-----
 js/document/models/base.js   |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'js/document')

diff --git a/js/document/document-html.js b/js/document/document-html.js
index 983da966..ae5b73b6 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -125,9 +125,10 @@ exports.HtmlDocument = Montage.create(Component, {
 	//
 	closeDocument: {
 		value: function (context, callback) {
+			//Closing document and getting outcome
 			var closed = this.model.close(null);
-
-            callback.call(context, this);
+			//Making callback if specified
+			if (callback) callback.call(context, this);
 		}
 	},
     ////////////////////////////////////////////////////////////////////
@@ -139,6 +140,7 @@ exports.HtmlDocument = Montage.create(Component, {
             //this.gridVerticalSpacing = this.application.ninja.stage.drawUtils.gridVerticalSpacing;
 
             // Serialize the current scroll position
+            //TODO: Move these properties to the design view class
             this.model.scrollLeft = this.application.ninja.stage._scrollLeft;
             this.model.scrollTop = this.application.ninja.stage._scrollTop;
             this.model.userContentLeft = this.application.ninja.stage._userContentLeft;
@@ -146,6 +148,7 @@ exports.HtmlDocument = Montage.create(Component, {
 
 
             // Serialize the selection
+            //TODO: Move this property to the design view class
             this.model.selection = this.application.ninja.selectedElements.slice(0);
             this.draw3DGrid = this.application.ninja.appModel.show3dGrid;
 
@@ -153,8 +156,10 @@ exports.HtmlDocument = Montage.create(Component, {
             // TODO: Save the montage undo queue
 
             // Pause the videos
+            //TODO: Move these to be handled on the show/hide methods in the view
             this.model.views.design.pauseVideos();
-
+			
+			//TODO: Move this to the document controller
             this.model.isActive = false;
     	}
     },
@@ -167,18 +172,21 @@ exports.HtmlDocument = Montage.create(Component, {
             //this.application.ninja.stage.drawUtils.gridVerticalSpacing = this.gridVerticalSpacing;
 
             // Deserialize the current scroll position
+             //TODO: Move these properties to the design view class
             this.application.ninja.stage._scrollLeft = this.model.scrollLeft;
             this.application.ninja.stage._scrollTop = this.model.scrollTop;
             this.application.ninja.stage._userContentLeft = this.model.userContentLeft;
             this.application.ninja.stage._userContentTop = this.model.userContentTop;
-
+			
+			//TODO: Move this property to the design view class
             this.application.ninja.selectedElements = this.model.selection.slice(0);
 
             this.application.ninja.appModel.show3dGrid = this.draw3DGrid;
 
             // Serialize the undo
             // TODO: Save the montage undo queue
-
+			
+			//TODO: Move this to the document controller
             this.model.isActive = true;
     	}
     }
diff --git a/js/document/models/base.js b/js/document/models/base.js
index c99e36c7..6d9d2e89 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -100,7 +100,7 @@ exports.BaseDocumentModel = Montage.create(Component, {
         				}
 	        			break;
     	    		default:
-        				if (this.template.type === 'banner' || this.template.type === 'animation') {
+        				if (this.template && (this.template.type === 'banner' || this.template.type === 'animation')) {
         					window.open('/js/document/templates/preview/banner.html?width='+this.template.size.width+'&height='+this.template.size.height+'&url='+this.url);
         				} else {
         					window.open(this.url);
-- 
cgit v1.2.3


From fdfba499f0b84360b96096fa866a981e96e8756c Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 18 May 2012 16:35:56 -0700
Subject: fixing the color chip for the document root

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

(limited to 'js/document')

diff --git a/js/document/views/design.js b/js/document/views/design.js
index 2ccb82d1..44f1a5e8 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -64,6 +64,11 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     },
     ////////////////////////////////////////////////////////////////////
 	//
+    propertiesPanel: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
 	initialize: {
         value: function (parent) {
         	//Creating iFrame for view
-- 
cgit v1.2.3


From 7a22f7b368ef549a5b30c58a0f3900685b764bdb Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Fri, 18 May 2012 16:56:16 -0700
Subject: integrated open code view document in new dom architecture

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/document/document-text.js |  43 +++++++++-
 js/document/models/text.js   |   4 +-
 js/document/views/code.js    | 193 ++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 231 insertions(+), 9 deletions(-)

(limited to 'js/document')

diff --git a/js/document/document-text.js b/js/document/document-text.js
index 2a469144..533b32c9 100755
--- a/js/document/document-text.js
+++ b/js/document/document-text.js
@@ -7,7 +7,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 ////////////////////////////////////////////////////////////////////////
 //
 var Montage = 	require("montage/core/core").Montage,
-	Component = require("montage/ui/component").Component;
+	Component = require("montage/ui/component").Component,
+    TextDocumentModel = require("js/document/models/text").TextDocumentModel,
+    CodeDocumentView = require("js/document/views/code").CodeDocumentView;
 ////////////////////////////////////////////////////////////////////////
 //	
 exports.TextDocument = Montage.create(Component, {
@@ -16,9 +18,44 @@ exports.TextDocument = Montage.create(Component, {
 	hasTemplate: {
 		enumerable: false,
         value: false
-    }
-	////////////////////////////////////////////////////////////////////
+    },
 	////////////////////////////////////////////////////////////////////
+    //
+    model: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+
+    init:{
+        enumerable: false,
+        value : function(file, context, callback, view){
+            var codeDocumentView = CodeDocumentView.create(), container = null;
+            codeDocumentView.initialize();
+
+            //Creating instance of Text Document Model
+            this.model = Montage.create(TextDocumentModel,{
+                file: {value: file},
+                parentContainer: {value: document.getElementById("codeViewContainer")},
+                views: {value: {'code': codeDocumentView, 'design': null}}
+            });
+
+            codeDocumentView.textArea.value = file.content;
+            codeDocumentView.initializeTextView(file, this);
+
+            if (view === 'code') {
+                //TODO: Remove reference and use as part of model
+                this.currentView = 'code';
+                //Setting current view object to design
+                this.model.currentView = this.model.views.code;
+            }
+
+
+            callback.call(context, this);
+        }
+    }
+////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////
 });
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/js/document/models/text.js b/js/document/models/text.js
index ebf9993e..5a5e86ef 100755
--- a/js/document/models/text.js
+++ b/js/document/models/text.js
@@ -7,7 +7,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 ////////////////////////////////////////////////////////////////////////
 //
 var Montage = 	require("montage/core/core").Montage,
-	BaseDocumentModel = require("js/document/models/text").BaseDocumentModel;
+	BaseDocumentModel = require("js/document/models/base").BaseDocumentModel;
 ////////////////////////////////////////////////////////////////////////
 //	
 exports.TextDocumentModel = Montage.create(BaseDocumentModel, {
@@ -17,8 +17,6 @@ exports.TextDocumentModel = Montage.create(BaseDocumentModel, {
 		enumerable: false,
         value: false
     }
-	////////////////////////////////////////////////////////////////////
-	////////////////////////////////////////////////////////////////////
 });
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/js/document/views/code.js b/js/document/views/code.js
index cd3e02d4..de12881c 100755
--- a/js/document/views/code.js
+++ b/js/document/views/code.js
@@ -11,15 +11,202 @@ var Montage = 			require("montage/core/core").Montage,
 	BaseDocumentView = 	require("js/document/views/base").BaseDocumentView;
 ////////////////////////////////////////////////////////////////////////
 //	
-exports.CodeDocumentView = Montage.create(BaseDocumentView, {
+var CodeDocumentView = exports.CodeDocumentView = Montage.create(BaseDocumentView, {
 	////////////////////////////////////////////////////////////////////
 	//
 	hasTemplate: {
 		enumerable: false,
         value: false
+    },
+
+    ////////////////////////////////////////////////////////////////////
+    //
+    _editor: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    editor: {
+        get: function() {return this._editor;},
+        set: function(value) {this._editor= value;}
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    _textArea: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    textArea: {
+        get: function() {return this._textArea;},
+        set: function(value) {this._textArea= value;}
+    },
+
+     ////////////////////////////////////////////////////////////////////
+    //remove _extParentContainer after moving to bucket structure for documents
+    _textParentContainer: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    textParentContainer: {
+        get: function() {return this._textParentContainer;},
+        set: function(value) {this._textParentContainer= value;}
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    _textViewContainer: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    textViewContainer: {
+        get: function() {return this._textViewContainer;},
+        set: function(value) {this._textViewContainer= value;}
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+
+    /**
+     * Public method
+     */
+    initialize:{
+        value: function(){
+            //populate _textParentContainer
+            this.textParentContainer = document.getElementById("codeViewContainer");
+
+            //create contianer
+            this.textViewContainer = document.createElement("div");
+            //this.textViewContainer.id = "codemirror_" + uuid;
+            this.textViewContainer.style.display = "block";
+            this.textParentContainer.appendChild(this.textViewContainer);
+
+            //create text area
+            this.textArea = this.createTextAreaElement();
+        }
+    },
+
+    /**
+     * Public method
+     * Creates a textarea element which will contain the content of the opened text document.
+     */
+    createTextAreaElement: {
+        value: function() {
+            var textArea = document.createElement("textarea");
+//            textArea.id = "code";
+//            textArea.name = "code";
+            this.textViewContainer.appendChild(textArea);
+
+            return textArea;
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    /**
+     * Public method
+     * Creates a new instance of a code editor
+     */
+    initializeTextView: {
+        value: function(file, textDocument) {
+            var type;
+
+            if(this.activeDocument) {
+                //need to hide only if another document was open before
+//                this.application.ninja.documentController._hideCurrentDocument();
+//                this.hideOtherDocuments(doc.uuid);
+            }
+
+            switch(file.extension) {
+                case  "css" :
+                    type = "css";
+                    break;
+                case "js" :
+                    type = "javascript";
+                    break;
+                case "html" :
+                    type = "htmlmixed";
+                    break;
+                case "json" :
+                    type = "javascript";
+                    break;
+                case "php" :
+                    type = "php";
+                    break;
+                case "pl" :
+                    type = "perl";
+                    break;
+                case "py" :
+                    type = "python";
+                    break;
+                case "rb" :
+                    type = "ruby";
+                    break;
+                case "xml" :
+                    type = "xml";
+                    break;
+            }
+            this.textViewContainer.style.display="block";
+
+            this.editor = this.application.ninja.codeEditorController.createEditor(this, type, file.extension, textDocument);
+            this.editor.hline = this.editor.setLineClass(0, "activeline");
+
+
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+
+    showRulers:{
+        value:function(){
+            this.application.ninja.rulerTop.style.display = "block";
+            this.application.ninja.rulerLeft.style.display = "block";
+        }
+    },
+    hideRulers:{
+        value:function(){
+            this.application.ninja.rulerTop.style.display = "none";
+            this.application.ninja.rulerLeft.style.display = "none";
+        }
+    },
+    showCodeViewBar:{
+        value:function(isCodeView){
+            if(isCodeView === true) {
+                this.application.ninja.editorViewOptions.element.style.display = "block";
+                this.application.ninja.documentBar.element.style.display = "none";
+            } else {
+                this.application.ninja.documentBar.element.style.display = "block";
+                this.application.ninja.editorViewOptions.element.style.display = "none";
+            }
+        }
+    },
+
+    collapseAllPanels:{
+        value:function(){
+            this.application.ninja.panelSplitter.collapse();
+            this.application.ninja.timelineSplitter.collapse();
+            this.application.ninja.toolsSplitter.collapse();
+            this.application.ninja.optionsSplitter.collapse();
+        }
+    },
+    restoreAllPanels:{
+        value:function(){
+            this.application.ninja.panelSplitter.restore();
+            this.application.ninja.timelineSplitter.restore();
+            this.application.ninja.toolsSplitter.restore();
+            this.application.ninja.optionsSplitter.restore();
+        }
+    },
+
+    applyTheme:{
+        value:function(themeClass){
+            //Todo: change for bucket structure of documents
+            this.textParentContainer.className = "codeViewContainer "+themeClass;
+        }
     }
-	////////////////////////////////////////////////////////////////////
-	////////////////////////////////////////////////////////////////////
+
+
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
 });
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
\ No newline at end of file
-- 
cgit v1.2.3


From 6f5ffa17c72dd0aef7a02e3496154514750143c2 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Fri, 18 May 2012 18:38:09 -0700
Subject: save for code view documents in the new dom architecture

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/document/document-text.js | 10 ++++++++-
 js/document/models/text.js   | 53 +++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 61 insertions(+), 2 deletions(-)

(limited to 'js/document')

diff --git a/js/document/document-text.js b/js/document/document-text.js
index 533b32c9..09525f4e 100755
--- a/js/document/document-text.js
+++ b/js/document/document-text.js
@@ -53,8 +53,16 @@ exports.TextDocument = Montage.create(Component, {
 
             callback.call(context, this);
         }
-    }
+    },
 ////////////////////////////////////////////////////////////////////
+    //
+    closeDocument: {
+    		value: function (context, callback) {
+    			var closed = this.model.close(null);
+
+                callback.call(context, this);
+    		}
+    	}
 ////////////////////////////////////////////////////////////////////
 });
 ////////////////////////////////////////////////////////////////////////
diff --git a/js/document/models/text.js b/js/document/models/text.js
index 5a5e86ef..d21666d0 100755
--- a/js/document/models/text.js
+++ b/js/document/models/text.js
@@ -16,7 +16,58 @@ exports.TextDocumentModel = Montage.create(BaseDocumentModel, {
 	hasTemplate: {
 		enumerable: false,
         value: false
-    }
+    },
+////////////////////////////////////////////////////////////////////
+	//
+    save: {
+        enumerable: false,
+        value: function (callback) {
+            this.application.ninja.documentController.activeDocument.model.views.code.editor.save();//save to textarea
+
+            var self = this;
+
+            this.application.ninja.ioMediator.fileSave({
+                mode: ""+ self.file.extension,
+                file: self.file,
+                content:self.views.code.textArea.value
+            }, this.handleSaved.bind({callback: callback, model: this}));
+        }
+    },
+////////////////////////////////////////////////////////////////////
+	//
+    handleSaved: {
+    		value: function (result) {
+    			//
+    			if (result.status === 204) {
+    				this.model.needsSave = false;
+    			}
+    			//
+    			if (this.callback) this.callback(result);
+    		}
+    	},
+    ////////////////////////////////////////////////////////////////////
+    	//
+    close: {
+            value: function (view, callback) {
+            	//Outcome of close (pending on save logic)
+            	var success;
+            	//
+            	if (this.needsSave) {
+            		//Prompt user to save of lose data
+            	} else {
+            		//Close file
+            		success = true;
+            	}
+            	//
+                this.views.code.textParentContainer.removeChild(this.views.code.textViewContainer);
+                this.views.code.restoreAllPanels();
+                this.views.code.showCodeViewBar(false);
+                this.views.code = null;
+
+            	//
+            	return success;
+            }
+        }
 });
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
\ No newline at end of file
-- 
cgit v1.2.3


From c3c2ffc8d057660b7c42b45442885cd0d2d598bc Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Sun, 20 May 2012 15:16:06 -0700
Subject: use documents parent container property

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/document/document-text.js |  3 ++-
 js/document/models/text.js   |  2 +-
 js/document/views/code.js    | 21 +++------------------
 3 files changed, 6 insertions(+), 20 deletions(-)

(limited to 'js/document')

diff --git a/js/document/document-text.js b/js/document/document-text.js
index 09525f4e..bb63f5f8 100755
--- a/js/document/document-text.js
+++ b/js/document/document-text.js
@@ -31,7 +31,6 @@ exports.TextDocument = Montage.create(Component, {
         enumerable: false,
         value : function(file, context, callback, view){
             var codeDocumentView = CodeDocumentView.create(), container = null;
-            codeDocumentView.initialize();
 
             //Creating instance of Text Document Model
             this.model = Montage.create(TextDocumentModel,{
@@ -40,6 +39,8 @@ exports.TextDocument = Montage.create(Component, {
                 views: {value: {'code': codeDocumentView, 'design': null}}
             });
 
+            codeDocumentView.initialize(this.model.parentContainer);
+
             codeDocumentView.textArea.value = file.content;
             codeDocumentView.initializeTextView(file, this);
 
diff --git a/js/document/models/text.js b/js/document/models/text.js
index d21666d0..fe02953c 100755
--- a/js/document/models/text.js
+++ b/js/document/models/text.js
@@ -59,7 +59,7 @@ exports.TextDocumentModel = Montage.create(BaseDocumentModel, {
             		success = true;
             	}
             	//
-                this.views.code.textParentContainer.removeChild(this.views.code.textViewContainer);
+                this.parentContainer.removeChild(this.views.code.textViewContainer);
                 this.views.code.restoreAllPanels();
                 this.views.code.showCodeViewBar(false);
                 this.views.code = null;
diff --git a/js/document/views/code.js b/js/document/views/code.js
index de12881c..711479a8 100755
--- a/js/document/views/code.js
+++ b/js/document/views/code.js
@@ -41,18 +41,6 @@ var CodeDocumentView = exports.CodeDocumentView = Montage.create(BaseDocumentVie
         get: function() {return this._textArea;},
         set: function(value) {this._textArea= value;}
     },
-
-     ////////////////////////////////////////////////////////////////////
-    //remove _extParentContainer after moving to bucket structure for documents
-    _textParentContainer: {
-        value: null
-    },
-    ////////////////////////////////////////////////////////////////////
-    //
-    textParentContainer: {
-        get: function() {return this._textParentContainer;},
-        set: function(value) {this._textParentContainer= value;}
-    },
     ////////////////////////////////////////////////////////////////////
     //
     _textViewContainer: {
@@ -71,15 +59,12 @@ var CodeDocumentView = exports.CodeDocumentView = Montage.create(BaseDocumentVie
      * Public method
      */
     initialize:{
-        value: function(){
-            //populate _textParentContainer
-            this.textParentContainer = document.getElementById("codeViewContainer");
-
+        value: function(parentContainer){
             //create contianer
             this.textViewContainer = document.createElement("div");
             //this.textViewContainer.id = "codemirror_" + uuid;
             this.textViewContainer.style.display = "block";
-            this.textParentContainer.appendChild(this.textViewContainer);
+            parentContainer.appendChild(this.textViewContainer);
 
             //create text area
             this.textArea = this.createTextAreaElement();
@@ -200,7 +185,7 @@ var CodeDocumentView = exports.CodeDocumentView = Montage.create(BaseDocumentVie
     applyTheme:{
         value:function(themeClass){
             //Todo: change for bucket structure of documents
-            this.textParentContainer.className = "codeViewContainer "+themeClass;
+            this.textViewContainer.className = "codeViewContainer "+themeClass;
         }
     }
 
-- 
cgit v1.2.3


From 2cc8e58f6bb9f64a7473e62aecd013fa55167231 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Mon, 21 May 2012 16:42:26 -0700
Subject: - added opening multiple code and design view documents - switching
 between multiple code and design view documents - Note: closing of documents,
 when multiple documents are open, is not yet implemented

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/document/models/text.js |  4 ++--
 js/document/views/code.js  | 54 ++++++++++++----------------------------------
 2 files changed, 16 insertions(+), 42 deletions(-)

(limited to 'js/document')

diff --git a/js/document/models/text.js b/js/document/models/text.js
index fe02953c..d1252b7d 100755
--- a/js/document/models/text.js
+++ b/js/document/models/text.js
@@ -60,8 +60,8 @@ exports.TextDocumentModel = Montage.create(BaseDocumentModel, {
             	}
             	//
                 this.parentContainer.removeChild(this.views.code.textViewContainer);
-                this.views.code.restoreAllPanels();
-                this.views.code.showCodeViewBar(false);
+                this.application.ninja.stage.showCodeViewBar(false);
+                this.application.ninja.stage.restoreAllPanels();
                 this.views.code = null;
 
             	//
diff --git a/js/document/views/code.js b/js/document/views/code.js
index 711479a8..66d1c702 100755
--- a/js/document/views/code.js
+++ b/js/document/views/code.js
@@ -140,56 +140,30 @@ var CodeDocumentView = exports.CodeDocumentView = Montage.create(BaseDocumentVie
     },
     ////////////////////////////////////////////////////////////////////
     //
-
-    showRulers:{
-        value:function(){
-            this.application.ninja.rulerTop.style.display = "block";
-            this.application.ninja.rulerLeft.style.display = "block";
-        }
-    },
-    hideRulers:{
-        value:function(){
-            this.application.ninja.rulerTop.style.display = "none";
-            this.application.ninja.rulerLeft.style.display = "none";
-        }
-    },
-    showCodeViewBar:{
-        value:function(isCodeView){
-            if(isCodeView === true) {
-                this.application.ninja.editorViewOptions.element.style.display = "block";
-                this.application.ninja.documentBar.element.style.display = "none";
-            } else {
-                this.application.ninja.documentBar.element.style.display = "block";
-                this.application.ninja.editorViewOptions.element.style.display = "none";
-            }
-        }
-    },
-
-    collapseAllPanels:{
-        value:function(){
-            this.application.ninja.panelSplitter.collapse();
-            this.application.ninja.timelineSplitter.collapse();
-            this.application.ninja.toolsSplitter.collapse();
-            this.application.ninja.optionsSplitter.collapse();
+    show: {
+        value: function (callback) {
+            this.textViewContainer.style.display = "block";
+            //
+            if (callback) callback();
         }
     },
-    restoreAllPanels:{
-        value:function(){
-            this.application.ninja.panelSplitter.restore();
-            this.application.ninja.timelineSplitter.restore();
-            this.application.ninja.toolsSplitter.restore();
-            this.application.ninja.optionsSplitter.restore();
+    ////////////////////////////////////////////////////////////////////
+    //
+    hide: {
+        value: function (callback) {
+            this.textViewContainer.style.display = "none";
+            //
+            if (callback) callback();
         }
     },
-
+    ////////////////////////////////////////////////////////////////////
+    //
     applyTheme:{
         value:function(themeClass){
             //Todo: change for bucket structure of documents
             this.textViewContainer.className = "codeViewContainer "+themeClass;
         }
     }
-
-
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 });
-- 
cgit v1.2.3


From ff57e780d17e35dfdbfa6044bc0416145851f5c9 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Tue, 22 May 2012 00:03:32 -0700
Subject: Adding support for reading webgl external files

For author-time, run-time is already checked in and supported.
---
 js/document/views/design.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'js/document')

diff --git a/js/document/views/design.js b/js/document/views/design.js
index 3f58650e..76a36323 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -324,7 +324,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     initWebGl: {
         value: function (scripttags) {
         	//
-        	var n, webgldata;
+        	var n, webgldata, fileRead;
         	//Setting the iFrame property for reference in helper class
         	this.model.webGlHelper.iframe = this.model.views.design.iframe;
         	//Checking for webGL Data
@@ -336,6 +336,15 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
             		if (scripttags[w].getAttribute('data-ninja-webgl') !== null) {
             			//TODO: Add logic to handle more than one data tag
             			webgldata = JSON.parse((scripttags[w].innerHTML.replace("(", "")).replace(")", ""));
+            		} else if (scripttags[w].getAttribute('data-ninja-canvas-json') !== null) {
+            			//TODO: Add check for hardcoded URL
+            			fileRead = this.application.ninja.ioMediator.fio.readFile({uri: this.application.ninja.documentController.documentHackReference.root+scripttags[w].getAttribute('data-ninja-canvas-json')});
+            			//
+            			if (fileRead.status === 204) {
+            				webgldata = JSON.parse((fileRead.file.content.replace("(", "")).replace(")", ""));
+            			} else {
+            				//Error
+            			}
             		}
             		//Checking for webGL data and building data array
             		if (webgldata && webgldata.data) {
-- 
cgit v1.2.3


From c4435b596cd01aaec3427b6d9390bf6062d77f0c Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Tue, 22 May 2012 00:08:03 -0700
Subject: Minor bug fix

No longer using webgl attribute names, instead using canvas to be more consistent and allow for better term usage across canvas 2D and RDGE.
---
 js/document/views/design.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/document')

diff --git a/js/document/views/design.js b/js/document/views/design.js
index 76a36323..b3887fdf 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -333,7 +333,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
             	webgldata = null;
             	//Checking for tags with webGL data
             	if (scripttags[w].getAttribute) {
-            		if (scripttags[w].getAttribute('data-ninja-webgl') !== null) {
+            		if (scripttags[w].getAttribute('data-ninja-canvas') !== null) {
             			//TODO: Add logic to handle more than one data tag
             			webgldata = JSON.parse((scripttags[w].innerHTML.replace("(", "")).replace(")", ""));
             		} else if (scripttags[w].getAttribute('data-ninja-canvas-json') !== null) {
-- 
cgit v1.2.3


From 9b6da637d9654727426c6d78f17e3804bbd84ce5 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 22 May 2012 14:42:43 -0700
Subject: fixing a few document switching issues.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/document/document-html.js | 2 +-
 js/document/views/base.js    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'js/document')

diff --git a/js/document/document-html.js b/js/document/document-html.js
index 983da966..bb391793 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -155,7 +155,7 @@ exports.HtmlDocument = Montage.create(Component, {
             // Pause the videos
             this.model.views.design.pauseVideos();
 
-            this.model.isActive = false;
+//            this.model.isActive = false;
     	}
     },
     ////////////////////////////////////////////////////////////////////
diff --git a/js/document/views/base.js b/js/document/views/base.js
index d1c65b5e..db72cc60 100755
--- a/js/document/views/base.js
+++ b/js/document/views/base.js
@@ -39,6 +39,7 @@ exports.BaseDocumentView = Montage.create(Component, {
         value: function (callback) {
         	if (this.iframe) {
         		this.iframe.style.display = 'block';
+                this.iframe.style.opacity = 1;
         	} else {
         		console.log('Error: View has no iframe to show!');
         	}
@@ -52,6 +53,7 @@ exports.BaseDocumentView = Montage.create(Component, {
         value: function (callback) {
         	if (this.iframe) {
         		this.iframe.style.display = 'none';
+                this.iframe.style.opacity = 0;
         	} else {
         		console.log('Error: View has no iframe to hide!');
         	}
-- 
cgit v1.2.3


From 2b207ef8b2594927f8cd6cd63a8483d205cb86c4 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 22 May 2012 15:41:51 -0700
Subject: fixing the selection in multiple documents and some code cleanup

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/document/document-html.js | 5 +++--
 js/document/models/html.js   | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'js/document')

diff --git a/js/document/document-html.js b/js/document/document-html.js
index d6b4ba95..f92a425c 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -147,9 +147,10 @@ exports.HtmlDocument = Montage.create(Component, {
             this.model.userContentTop = this.application.ninja.stage._userContentTop;
 
 
-            // Serialize the selection
+            // Serialize the selection, the container and grid
             //TODO: Move this property to the design view class
             this.model.selection = this.application.ninja.selectedElements.slice(0);
+            this.model.selectionContainer = this.application.ninja.currentSelectedContainer;
             this.draw3DGrid = this.application.ninja.appModel.show3dGrid;
 
             // Serialize the undo
@@ -177,7 +178,7 @@ exports.HtmlDocument = Montage.create(Component, {
 			
 			//TODO: Move this property to the design view class
             this.application.ninja.selectedElements = this.model.selection.slice(0);
-
+//            this.application.ninja.currentSelectedContainer = this.model.selectionContainer;
             this.application.ninja.appModel.show3dGrid = this.draw3DGrid;
 
             // Serialize the undo
diff --git a/js/document/models/html.js b/js/document/models/html.js
index a97b4b5a..9cc8ce92 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -21,6 +21,11 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
     //
     selection: {
         value: []
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    selectionContainer: {
+        value: []
     },
 	////////////////////////////////////////////////////////////////////
 	//
-- 
cgit v1.2.3