Merge branch 'refs/heads/ninja-internal' into ToolFixes

47 files changed, 3276 insertions, 2770 deletions

diff --git a/js/io/document/base-document.js b/js/io/document/base-document.js
deleted file mode 100644
index 44f54f78..00000000
--- a/js/io/document/base-document.js
+++ /dev/null
@@ -1,88 +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> */
-
-//BaseDocument Object for all files types and base class for HTML documents.
-
-var Montage = require("montage/core/core").Montage;
-
-var BaseDocument = exports.BaseDocument = Montage.create(Montage, {
-    /** Private Members **/
-    _name: { value: null, enumerable: false },
-    _uri: { value: null, enumerable: false },
-    _documentType: { value: null, enumerable: false },
-    _container: {value: null, enumerable: false },
-    _uuid: { value: null, enumerable: false },
-    _isActive: { value: true, enumerable: false },
-    _dirtyFlag: { value: false, enumerable: false },
-    _callback: { value: null, enumerable: false },
-    _currentView: { value: null, enumerable: false},
-
-    /** Getters/Setters **/
-    name: {
-        get: function() { return this._name; },
-        set: function(value) { this._name = value; }
-    },
-
-    uri: {
-        get: function() { return this._uri; },
-        set: function(value) { this._uri = value; }
-    },
-
-    documentType: {
-        get: function() { return this._documentType; },
-        set: function(value) { this._documentType = value;  }
-    },
-
-    container: {
-        get: function() { return this._container; },
-        set: function(value) { this._container = value; }
-    },
-
-    uuid: {
-        get: function() { return this._uuid; },
-        set: function(value) { this._uuid = value; }
-    },
-
-    isActive: {
-        get: function() { return this._isActive; },
-        set: function(value) { this._isActive = value; }
-    },
-
-    dirtyFlag: {
-        get: function() { return this._dirtyFlag; },
-        set: function(value) { this._dirtyFlag = value; }
-    },
-
-    callback: {
-        get: function() { return this._callback; },
-        set: function(value) { this._callback = value; }
-    },
-
-    currentView: {
-        get: function() { return this._currentView; },
-        set: function(value) { this._currentView = value }
-    },
-
-    /** Base Methods **/
-    init: {
-        value: function(name, uri, type, container, uuid, callback) {
-            this.name = name;
-            this.uri = uri;
-            this.documentType = type;
-            this.container = container;
-            this.uuid = uuid;
-            this.callback = callback;
-        }
-    },
-
-    loadDocument: {
-        value: function() {
-            // Have the XHR here?
-        }
-    }
-
-
-});
\ 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;