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/models/base.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/document/models/base.js')

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 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/models/base.js')

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/models/base.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/document/models/base.js')

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