Merge branch 'refs/heads/master' into components

47 files changed, 3441 insertions, 2221 deletions

diff --git a/js/io/document/base-document.js b/js/io/document/base-document.js
index 44f54f78..918b51ad 100644..100755
--- a/js/io/document/base-document.js
+++ b/js/io/document/base-document.js
@@ -82,7 +82,12 @@ var BaseDocument = exports.BaseDocument = Montage.create(Montage, {
         value: function() {
             // Have the XHR here?
         }
-    }
+    },
 
+    save:{
+        value:function(){
+            //base function - to be overridden
+        }
+    }
 
 });
\ No newline at end of file
diff --git a/js/io/document/document-controller.js b/js/io/document/document-controller.js
deleted file mode 100644
index 99177de0..00000000
--- a/js/io/document/document-controller.js
+++ /dev/null
@@ -1,326 +0,0 @@
-/* <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> */
-
-/**
-@module js/document/documentManager
-@requires montage/core/core
-@requires montage/ui/component
-@requires js/document/html-document
-@requires js/document/text-document
-*/
-
-// TODO : Fix deps from Montage V4 Archi
-
-var Montage = require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component,
-    Uuid = require("montage/core/uuid").Uuid;
-
-var HTMLDocument = require("js/io/document/html-document").HTMLDocument;
-var TextDocument = require("js/io/document/text-document").TextDocument;
-
-var DocumentController = exports.DocumentController = Montage.create(Component, {
-    hasTemplate: { value: false },
-
-    _documents: { value: [] },
-    _documentsHash: { value: {} },
-    _activeDocument: { value: null },
-    _iframeCounter: { value: 1, enumerable: false },
-    _iframeHolder: { value: null, enumerable: false },
-    _textHolder: { value: null, enumerable: false },
-    _codeMirrorCounter: {value: 1, enumerable: false},
-
-    _codeEditor: {
-        value: {
-            "editor": {
-                value: null,
-                enumerable: false
-            },
-            "hline": {
-                value: null,
-                enumerable: false
-            }
-        }
-    },
-
-    activeDocument: {
-        get: function() {
-            return this._activeDocument;
-        },
-        set: function(doc) {
-            if(this._activeDocument) {
-                if(this.activeDocument.documentType === "htm" || this.activeDocument.documentType === "html") {
-                    // TODO selection should use the document own selectionModel
-                    //this._activeDocument.selectionModel = selectionManagerModule.selectionManager._selectedItems;
-                }
-                
-                this._activeDocument.isActive = false;
-            }
-
-            if(this._documents.indexOf(doc) === -1) {
-                //this._documentsHash[doc.uuid] = this._documents.push(doc) - 1;
-                this._documents.push(doc);
-            }
-
-            this._activeDocument = doc;
-            this._activeDocument.isActive = true;
-
-            if(this.activeDocument.documentType === "htm" || this.activeDocument.documentType === "html") {
-                // TODO selection should use the document own selectionModel
-                //selectionManagerModule.selectionManager._selectedItems = this._activeDocument.selectionModel;
-            }
-        }
-    },
-
-    deserializedFromTemplate: {
-        value: function() {
-            this.eventManager.addEventListener("appLoaded", this, false);
-        }
-    },
-
-    handleAppLoaded: {
-        value: function() {
-            this.openDocument({"type": "html"});
-        }
-    },
-
-    /** Open a Document **/
-    openDocument: {
-        value: function(doc) {
-            var d;
-
-            if(!doc) return false;
-
-            try {
-                if (doc.type === 'html' || doc.type === 'htm') {
-                    d = Montage.create(HTMLDocument);
-                    d.initialize(doc, Uuid.generate(), this._createIframeElement(), this._onOpenDocument);
-                } else {
-                    d = Montage.create(TextDocument);
-                    d.initialize(doc, Uuid.generate(), this._createTextAreaElement(), this._onOpenTextDocument);
-                }
-
-            } catch (err) {
-                console.log("Could not open Document ",  err);
-            }
-        }
-    },
-
-    closeDocument: {
-        value: function(id) {
-            var doc = this._findDocumentByUUID(id);
-            this._removeDocumentView(doc.container);
-
-            this._documents.splice(this._findIndexByUUID(id), 1);
-
-            if(this.activeDocument.uuid === id && this._documents.length > 0) {
-                this.switchDocument(this._documents[0].uuid)
-            }
-        }
-    },
-
-    switchDocument: {
-        value: function(id) {
-            this._hideCurrentDocument();
-            this.activeDocument = this._findDocumentByUUID(id);
-
-            this.application.ninja.stage._scrollFlag = false;    // TODO HACK to prevent type error on Hide/Show Iframe