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

Conflicts:
	css/ninja.css
	js/controllers/document-controller.js

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

2 files changed, 22 insertions, 6 deletions

diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js
index ede71383..bf22aed2 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/io-mediator.js b/js/mediators/io-mediator.js
index 2008e40f..56869839 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -86,6 +86,7 @@ exports.IoMediator = Montage.create(Component, {
                         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
@@ -142,6 +143,16 @@ exports.IoMediator = Montage.create(Component, {
                 //
                 switch (file.mode) {
                         case 'html':
+                                //Copy webGL library if needed
+                                if (file.webgl.length > 0) {
+                                        for (var i in this.application.ninja.coreIoApi.ninjaLibrary.libs) {
+                                                //if (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name === 'Assets' || this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name === 'RDGE') {
+                                                if (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name === 'RDGE') {
+                                                        this.application.ninja.coreIoApi.ninjaLibrary.copyLibToCloud(file.document.root, (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name+this.application.ninja.coreIoApi.ninjaLibrary.libs[i].version).toLowerCase());
+                                                }
+                                        }
+                                }
+                                //
                                 contents = this.parseNinjaTemplateToHtml(file);
                                 break;
                         default: