From 79da052891a3d8cfb70489edb71619f27bfe3939 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Wed, 22 Feb 2012 13:45:28 -0800
Subject: Fix for bug that keeps Ninja from launching over HTTP. We need to
 wrap any extension specific code in an if (window.chrome.app.isInstalled)
 check.

---
 js/controllers/document-controller.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'js/controllers/document-controller.js')

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 7491ef9f..fa611de4 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -85,7 +85,9 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     handleAppLoaded: {
         value: function() {
             //Adding an intercept to resources loaded to ensure user assets load from cloud simulator
-            chrome.webRequest.onBeforeRequest.addListener(this.handleWebRequest.bind(this), {urls: ["<all_urls>"]}, ["blocking"]);
+            if (window.chrome.app.isInstalled) {
+                chrome.webRequest.onBeforeRequest.addListener(this.handleWebRequest.bind(this), {urls: ["<all_urls>"]}, ["blocking"]);
+            }
         }
     },
 	////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From 593b2c954cf507bcb61d27f18d63b1406e7364c4 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Wed, 22 Feb 2012 22:47:25 -0800
Subject: Cleaning up and commenting CSS IO

---
 js/controllers/document-controller.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'js/controllers/document-controller.js')

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 48e33267..a6f600cc 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -59,6 +59,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             this.eventManager.addEventListener("executeNewFile", this, false);
             this.eventManager.addEventListener("executeSave", this, false);
             this.eventManager.addEventListener("executeSaveAs", this, false);
+            this.eventManager.addEventListener("executeSaveAll", this, false);
 
             this.eventManager.addEventListener("recordStyleChanged", this, false);
             
@@ -129,6 +130,16 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             }
 		}
     },
+    ////////////////////////////////////////////////////////////////////
+	//TODO: Check for appropiate structures
+    handleExecuteSaveAll: {
+    	value: function(event) {
+            if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
+                //Text and HTML document classes should return the same save object for fileSave
+                this.application.ninja.ioMediator.fileSave(this.activeDocument.saveAll(), this.fileSaveResult.bind(this));
+            }
+		}
+    },
     ////////////////////////////////////////////////////////////////////
     handleExecuteSaveAs: {
         value: function(event) {
-- 
cgit v1.2.3


From 950bb79b1907e4f97735bed1430401dfd797fb0d Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Wed, 22 Feb 2012 23:28:49 -0800
Subject: App mode checking fix

Added a way to check for the app to be served over http/https to prevent from adding webRequest events on app load.
---
 js/controllers/document-controller.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'js/controllers/document-controller.js')

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 77ae67a1..3a77ed5f 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -86,9 +86,10 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 	//
     handleAppLoaded: {
         value: function() {
-            //Adding an intercept to resources loaded to ensure user assets load from cloud simulator
-            if (window.chrome.app.isInstalled) {
-                chrome.webRequest.onBeforeRequest.addListener(this.handleWebRequest.bind(this), {urls: ["<all_urls>"]}, ["blocking"]);
+            //Checking for app not to be loaded via http/https to add app only listener
+            if (window.location.protocol !== 'http:' && window.location.protocol !== 'https:') {
+            	//Adding an intercept to resources loaded to ensure user assets load from cloud simulator
+            	chrome.webRequest.onBeforeRequest.addListener(this.handleWebRequest.bind(this), {urls: ["<all_urls>"]}, ["blocking"]);
             }
         }
     },
-- 
cgit v1.2.3