Merge branch 'refs/heads/FileIO-jose' into FileIO

Conflicts:
	js/controllers/document-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 10 insertions, 19 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 7470bae2..48e33267 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -67,19 +67,19 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     
    
     
-    
-    
-    
-    
+                        
+                        
+                        
+                                        
     ////////////////////////////////////////////////////////////////////
         //
     handleWebRequest: {
         value: function (request) {
                 if (this._hackRootFlag && request.url.indexOf('js/document/templates/montage-html') !== -1) {
                         //TODO: Optimize creating string
-                                return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split('/')[request.url.split('/').length-1]};
+                                        return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split('/')[request.url.split('/').length-1]};
+                                }
                         }
-        }
     },
     ////////////////////////////////////////////////////////////////////
         //
@@ -90,7 +90,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         }
     },
         ////////////////////////////////////////////////////////////////////
-        
+
         
         
         
@@ -146,19 +146,10 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     fileSaveResult: {
         value: function (result) {
                 if(result.status === 204){
-                this.clearDocumentDirtyFlag();
+                this.activeDocument.needsSave = false;
             }
         }
     },
-    ////////////////////////////////////////////////////////////////////
-        
-        
-    clearDocumentDirtyFlag:{
-        value: function(){
-            this.activeDocument.dirtyFlag = false;
-        }
-    },
-        
         
     createNewFile:{
         value:function(newFileObj){
@@ -297,7 +288,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
     closeDocument: {
         value: function(id) {
-            if(this.activeDocument.dirtyFlag === true){
+            if(this.activeDocument.needsSave === true){
                 //if file dirty then alert user to save
         }
 
@@ -480,5 +471,5 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         value: function() {
             return "userDocument_" + (this._iframeCounter++);
         }
-    }
+        }
 });