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