Merge branch 'pentool' into brushtool

Conflicts:
	imports/codemirror/mode/scheme/scheme.js
	js/tools/BrushTool.js

16 files changed, 736 insertions, 23 deletions

diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js
index e3b15f1c..a6e41dd3 100644..100755
--- a/js/controllers/color-controller.js
+++ b/js/controllers/color-controller.js
@@ -322,7 +322,19 @@ exports.ColorController = Montage.create(Component, {
                         //Simple solid color
                         color = this.parseCssToColor(css);
                 }
-                //Returning color object (or null if none)
+            // TODO - Hack for inconsistent color object -- some workflows set color.color and some color.value
+            if(color)
+            {
+                if(color.value && !color.color)
+                {
+                    color.color = color.value;
+                }
+                else if(color.color && !color.value)
+                {
+                    color.value = color.color;
+                }
+            }
+            //Returning color object (or null if none)
                 return color;
         }
     },
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
new file mode 100755
index 00000000..1c9d9d59
--- /dev/null
+++ b/js/controllers/document-controller.js
@@ -0,0 +1,467 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+////////////////////////////////////////////////////////////////////////
+//
+var Montage =           require("montage/core/core").Montage,
+    Component =         require("montage/ui/component").Component,
+    Uuid =                      require("montage/core/uuid").Uuid,
+    HTMLDocument =      require("js/document/html-document").HTMLDocument,
+    TextDocument =      require("js/document/text-document").TextDocument,
+    DocumentController;
+////////////////////////////////////////////////////////////////////////
+//
+var DocumentController = exports.DocumentController = Montage.create(Component, {
+    hasTemplate: {
+        value: false
+    },
+
+    _documents: {
+        value: []
+    },
+    
+    _hackRootFlag: {
+        value: false
+    },
+
+    _activeDocument: { value: null },
+    _iframeCounter: { value: 1, enumerable: false },
+    _iframeHolder: { value: null, enumerable: false },
+    _textHolder: { value: null, enumerable: false },
+    _codeMirrorCounter: {value: 1, enumerable: false},
+    
+    activeDocument: {
+        get: function() {
+            return this._activeDocument;
+        },
+        set: function(doc) {
+            if(!!this._activeDocument) this._activeDocument.isActive = false;
+
+            this._activeDocument = doc;
+            if(!!this._activeDocument){
+
+                if(this._documents.indexOf(doc) === -1) this._documents.push(doc);
+                this._activeDocument.isActive = true;
+                if(!!this._activeDocument.editor){
+                    this._activeDocument.editor.focus();
+                }
+            }
+        }
+    },
+
+    deserializedFromTemplate: {
+        value: function() {
+            this.eventManager.addEventListener("appLoaded", this, false);
+            this.eventManager.addEventListener("executeFileOpen", this, false);
+            this.eventManager.addEventListener("executeNewFile", this, false);
+            this.eventManager.addEventListener("executeSave", this, false);
+
+            this.eventManager.addEventListener("recordStyleChanged", this, false);
+            
+        }
+    },
+    
+   
+    
+                        
+                        
+                        
+                                        
+    ////////////////////////////////////////////////////////////////////
+        //
+    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]};
+                                }
+                        }
+    },
+    ////////////////////////////////////////////////////////////////////
+        //
+    handleAppLoaded: {
+        value: function() {
+            //Checking for app to be loaded through extension
+            var check;
+            if (chrome && chrome.app) {
+                check = chrome.app.getDetails();
+            }
+            if (check !== null) {
+                //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"]);
+            }
+        }
+    },
+        ////////////////////////////////////////////////////////////////////
+
+        
+        
+        
+        
+        
+        
+        
+    handleExecuteFileOpen: {
+        value: function(event) {
+            var pickerSettings = event._event.settings || {};
+            pickerSettings.callback = this.openFileWithURI.bind(this);
+            pickerSettings.pickerMode = "read";
+            pickerSettings.inFileMode = true;
+            this.application.ninja.filePickerController.showFilePicker(pickerSettings);
+        }
+    },
+
+    handleExecuteNewFile: {
+            value: function(event) {
+                var newFileSettings = event._event.settings || {};
+                newFileSettings.callback = this.createNewFile.bind(this);
+                this.application.ninja.newFileController.showNewFileDialog(newFileSettings);
+            }
+    },
+        
+        
+        ////////////////////////////////////////////////////////////////////
+        //TODO: Check for appropiate structures
+    handleExecuteSave: {
+        value: function(event) {
+            if(!!this.activeDocument){
+                //Text and HTML document classes should return the same save object for fileSave
+                this.application.ninja.ioMediator.fileSave(this.activeDocument.save(), this.fileSaveResult.bind(this));
+                }
+                }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    fileSaveResult: {
+        value: function (result) {
+                if(result.status === 204){
+                this.activeDocument.needsSave = false;
+            }
+        }
+    },
+        
+    createNewFile:{
+        value:function(newFileObj){
+            //console.log(newFileObj);//contains the template uri and the new file uri
+            if(!newFileObj) return;
+            this.application.ninja.ioMediator.fileNew(newFileObj.newFilePath, newFileObj.fileTemplateUri, this.openNewFileCallback.bind(this));
+
+            if((newFileObj.fileExtension !== ".html") && (newFileObj.fileExtension !== ".htm")){//open code view
+
+                } else {
+                //open design view
+                }
+        }
+    },
+
+    /**
+     * Public method
+     * doc contains:
+     *      type : file type, like js, css, etc
+     *      name : file name
+     *      source : file content
+     *      uri : file uri
+     */
+    openNewFileCallback:{
+        value:function(doc){
+            var response = doc || null;//default just for testing
+            if(!!response && response.success && (response.status!== 5