Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	Resolution: Use both.

4 files changed, 484 insertions, 0 deletions

diff --git a/js/clipboard/internal-ops/component-clipboard-agent.js b/js/clipboard/internal-ops/component-clipboard-agent.js
new file mode 100644
index 00000000..8b589a27
--- /dev/null
+++ b/js/clipboard/internal-ops/component-clipboard-agent.js
@@ -0,0 +1,40 @@
+/* <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;
+
+var ComponentsClipboardAgent = exports.ComponentsClipboardAgent = Montage.create(Component, {
+
+    copy:{
+        value: function(clipboardEvent){
+
+        }
+    },
+
+    cut:{
+        value:function(clipboardEvent){
+
+        }
+
+    },
+
+    pasteFromCopy:{
+        value:function(){
+
+        }
+    },
+
+    pasteFromCut:{
+          value:function(){
+
+          }
+    }
+
+});
\ No newline at end of file
diff --git a/js/clipboard/internal-ops/css-clipboard-agent.js b/js/clipboard/internal-ops/css-clipboard-agent.js
new file mode 100644
index 00000000..690a3a84
--- /dev/null
+++ b/js/clipboard/internal-ops/css-clipboard-agent.js
@@ -0,0 +1,40 @@
+/* <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;
+
+var CssClipboardAgent = exports.CssClipboardAgent = Montage.create(Component, {
+
+    copy:{
+        value: function(clipboardEvent){
+
+        }
+    },
+
+    cut:{
+        value:function(clipboardEvent){
+
+        }
+
+    },
+
+    pasteFromCopy:{
+        value:function(){
+
+        }
+    },
+
+    pasteFromCut:{
+          value:function(){
+
+          }
+    }
+
+});
\ No newline at end of file
diff --git a/js/clipboard/internal-ops/elements-clipboard-agent.js b/js/clipboard/internal-ops/elements-clipboard-agent.js
new file mode 100644
index 00000000..cd8de46e
--- /dev/null
+++ b/js/clipboard/internal-ops/elements-clipboard-agent.js
@@ -0,0 +1,364 @@
+/* <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,
+    ClipboardUtil = require("js/clipboard/util").ClipboardUtil,
+    World =         require("js/lib/drawing/world").World;
+
+var ElementsClipboardAgent = exports.ElementsClipboardAgent = Montage.create(Component, {
+
+    //count how many times pasted
+    //used to move multiple pastes of same copy
+    pasteCounter:{
+        value: 0
+    },
+
+    copiedObjects:{
+        value: {}
+    },
+
+    copy:{
+        value: function(clipboardEvent){
+            var j=0, htmlToClipboard = "", ninjaClipboardObj = {}, textToClipboard = "";
+            this.copiedObjects = {};
+            this.pasteCounter = 0;
+            this.copiedObjects["copy"] = [];
+
+            if(clipboardEvent){
+                for(j=0; j < this.application.ninja.selectedElements.length; j++){//copying from stage
+                    this.copiedObjects.copy.push(this.application.ninja.selectedElements[j]);
+
+                    if(this.application.ninja.selectedElements[j].tagName === "CANVAS"){
+                        if(!ninjaClipboardObj.canvas){
+                            ninjaClipboardObj.canvas = true;
+                        }
+                    }else{
+                        htmlToClipboard = htmlToClipboard + this.serializeHTMLElement(this.application.ninja.selectedElements[j]);
+                        if(!ninjaClipboardObj.plainHtml){
+                            ninjaClipboardObj.plainHtml = true;
+                        }
+                        textToClipboard = textToClipboard + this.getText(this.application.ninja.selectedElements[j]) + " ";
+                    }
+
+                }
+                //set clipboard data
+                clipboardEvent.clipboardData.setData('ninja', ''+ JSON.stringify(ninjaClipboardObj));
+                clipboardEvent.clipboardData.setData('text/html', '<HTML><BODY>' + htmlToClipboard + '</BODY></HTML>');
+                clipboardEvent.clipboardData.setData('text/plain', textToClipboard);
+            }
+        }
+    },
+
+    cut:{
+        value:function(clipboardEvent){
+            var j=0, htmlToClipboard = "", ninjaClipboardObj = {}, textToClipboard = "", elObj = null;
+            this.copiedObjects = {}; this.pasteCounter = 0;
+            this.copiedObjects["cut"] = [];
+
+            if(clipboardEvent){
+                for(j=0; j < this.application.ninja.selectedElements.length; j++){//copying from stage
+                    elObj = {};
+                    elObj["outerhtml"] = this.application.ninja.selectedElements[j].outerHTML;
+
+                    if(this.application.ninja.selectedElements[j].tagName === "CANVAS"){
+                        elObj["styles"] = this.getDominantStyles(this.application.ninja.selectedElements[j], true);
+                        if(!ninjaClipboardObj.canvas){
+                            ninjaClipboardObj.canvas = true;
+                        }
+                        elObj["worldJson"] = this.application.ninja.selectedElements[j].elementModel.shapeModel ? this.application.ninja.selectedElements[j].elementModel.shapeModel.GLWorld.exportJSON(): null;
+                        elObj["className"] = this.application.ninja.selectedElements[j].className;
+                    }else{
+                        elObj["styles"] = this.getDominantStyles(this.application.ninja.selectedElements[j], false);
+                        htmlToClipboard = htmlToClipboard + this.serializeHTMLElement(this.application.ninja.selectedElements[j]);
+                        if(!ninjaClipboardObj.plainHtml){
+                            ninjaClipboardObj.plainHtml = true;
+                        }
+                        textToClipboard = textToClipboard + this.getText(this.application.ninja.selectedElements[j]) + " ";
+                    }
+                    this.copiedObjects.cut.push(elObj);
+                }
+                //set clipboard data
+                clipboardEvent.clipboardData.setData('ninja', ''+ JSON.stringify(ninjaClipboardObj));
+                clipboardEvent.clipboardData.setData('text/html', '<HTML><BODY>' + htmlToClipboard + '</BODY></HTML>');
+                clipboardEvent.clipboardData.setData('text/plain', textToClipboard);
+
+            }
+
+            this.application.ninja.elementMediator.removeElements(this.application.ninja.selectedElements);
+
+            clipboardEvent.preventDefault();
+        }
+    },
+
+    pasteInternal:{
+        value:function(){
+            if(this.copiedObjects.copy){
+                        try{
+                            this.pasteFromCopy();
+                        }catch(e){
+                            console.log(""+e.stack);
+                        }
+            }
+            else if(this.copiedObjects.cut){
+                try{
+                    this.pasteFromCut();
+                }catch(e){
+                    console.log(""+e.stack);
+                }
+            }
+
+        }
+    },
+
+    pasteFromCopy:{//todo: change to appropriate name
+        value:function(){
+                var i=0, j=0,
+