5 files changed, 397 insertions, 113 deletions

diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js
index ede71383..bf22aed2 100644..100755
--- a/js/mediators/drag-drop-mediator.js
+++ b/js/mediators/drag-drop-mediator.js
@@ -24,6 +24,10 @@ exports.DragDropMediator = Montage.create(Component, {
         writable: true
     },
 
+    dropDelegate: {
+        value: null
+    },
+
     deserializedFromTemplate: {
         value: function() {
             this.eventManager.addEventListener("appLoaded", this, false);
@@ -69,13 +73,14 @@ exports.DragDropMediator = Montage.create(Component, {
 
             xferString = evt.dataTransfer.getData("text/plain");
             if(xferString) {
-
-                if(xferString.lastIndexOf("-Component") !== -1) {
-                    component = xferString.substring(0, xferString.lastIndexOf("-Component"));
-                    NJevent( "executeAddComponent", { "component": component, "dropX": this.baseX, "dropY": this.baseY });
-//                    ComponentPanelModule.ComponentsPanelBase.addComponentToStage(componentStr.substring(0, compInd), this.baseX, this.baseY);
+                // If the drop is a component, call the delegate with the top,left coordinates
+                if(xferString.indexOf("componentDrop") > -1) {
+                    if(this.dropDelegate && typeof this.dropDelegate === 'object') {
+                        this.dropDelegate.handleComponentDrop(this.baseX, this.baseY);
+                        return;
+                    }
                 }
-                return;
+
             }
 
             // Verify that browser supports FileReader API.
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 9aefbca6..51923f08 100644..100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -28,13 +28,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
     // TODO use the specific controller to be able to subclass the functionality
     handleElementAdding: {
         value: function(event) {
-            /*
-            var cmd = ElementControllerCommands.addElementCommand(event.detail.el, event.detail.data);
-            NJevent("sendToUndo", cmd);
-            cmd.execute();
-            */
             this.addElement(event.detail.el, event.detail.data);
-
         }
     },
 
@@ -97,17 +91,39 @@ exports.ElementMediator = Montage.create(NJComponent, {
         value: function(el, rules, noEvent) {
             ElementController.addElement(el, rules);
             var p3d = this.get3DProperties(el);
-            if(p3d)
-            {
+            if(p3d) {
                 el.elementModel.controller["set3DProperties"](el, [p3d], 0, true);
             }
-            if(!noEvent) NJevent("elementAdded", el);
+            if(!noEvent) {
+                this.application.ninja.documentController.activeDocument.needsSave = true;
+                NJevent("elementAdded", el);
+            }
         }
     },
 
+    deleteElements: {
+         value: function(items) {
+            // Add the Undo/Redo
+            var len, el;
+
+            len = items.length;
+
+            if(len) {
+
+                for(var i = len - 1; i >= 0; i--) {
+                    el = items[i]._element || items[i];
+                    this._removeElement(el);
+                }
+
+                NJevent( "deleteSelection", items );
+            }
+         }
+    },
+
     _removeElement: {
         value: function(el, rules) {
             ElementController.removeElement(el, rules);
+            this.application.ninja.documentController.activeDocument.needsSave = true;
             NJevent("elementDeleted", el);
         }
     },
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
new file mode 100644
index 00000000..56869839
--- /dev/null
+++ b/js/mediators/io-mediator.js
@@ -0,0 +1,237 @@
+/* <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,
+        FileIo =        require("js/io/system/fileio").FileIo,
+        ProjectIo = require("js/io/system/projectio").ProjectIo;
+////////////////////////////////////////////////////////////////////////
+//
+exports.IoMediator = Montage.create(Component, {
+        ////////////////////////////////////////////////////////////////////
+        //
+        hasTemplate: {
+                enumerable: false,
+        value: false
+    },
+        ////////////////////////////////////////////////////////////////////
+    //
+        deserializedFromTemplate: {
+                enumerable: false,
+                value: function () {
+                        //
+                }
+        },
+        ////////////////////////////////////////////////////////////////////
+    //
+    fio: {
+        enumerable: false,
+        value: FileIo
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    pio: {
+        enumerable: false,
+        value: ProjectIo
+    },
+        ////////////////////////////////////////////////////////////////////
+    //
+    fileNew: {
+        enumerable: false,
+        value: function (file, template, callback) {
+                //Loading template from template URL
+                var xhr = new XMLHttpRequest(), result;
+                xhr.open("GET", template, false);
+            xhr.send();
+                if (xhr.readyState === 4) {
+                        //Making call to create file, checking for return code
+                        switch (this.fio.newFile({uri: file, contents: xhr.response})) {
+                                case 201:
+                                        result = {status: 201, success: true, uri: file};
+                                        break;
+                                case 204:
+                                        result = {status: 204, success: false, uri: file};
+                                        break;
+                                case 400:
+                                        result = {status: 400, success: false, uri: file};
+                                        break;
+                                default:
+                                        result = {status: 500, success: false, uri: file};
+                                        break;
+                        }
+                } else {
+                        result = {status: 500, success: false, uri: file};
+                }
+                //Sending result to callback if requested for handling
+                if (callback) callback(result);
+                //Codes
+                //      204: File exists | 400: File exists
+                    //  201: File succesfully created | 500: Unknown (Probably cloud API not running)
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    fileOpen: {
+        enumerable: false,
+        value: function (file, callback) {
+                //Reading file (Ninja doesn't really open a file, all in browser memory)
+                var read = this.fio.readFile({uri: file}), result;
+                //Checking for status
+                switch(read.status) {
+                        case 204:
+                                //Creating and formatting result object for callbak
+                                result = read.file.details;
+                                result.root = read.file.details.uri.replace(read.file.details.name, "");
+                                //Checking for type of content to returns
+                                if (result.extension !== 'html' && result.extension !== 'htm') {
+                                        //Simple string
+                                        result.content = read.file.content;
+                                } else {
+                                        //Object to be used by Ninja Template
+                                                result.content = this.parseHtmlToNinjaTemplate(read.file.content);
+                                }
+                                //Status of call
+                                result.status = read.status;
+                                //Calling back with result
+                                if (callback) callback(result);
+                                break;
+                        case 404:
+                                //File does not exists
+                                if (callback) callback({status: read.status});
+                                break;
+                        default:
+                                //Unknown
+                                if (callback) callback({status: 500});
+                                break;
+                }
+                /*
+                ////////////////////////////////////////////////////////////
+                ////////////////////////////////////////////////////////////
+                //Return Object Description
+                Object.status (Always presents for handling)
+                204: File exists (Success)
+                404: File does not exists (Failure)
+                500: Unknown (Probably cloud API not running)
+                
+                (Below only present if succesfull 204)