From 5a34cac9594d710f6e5675bee34dc16be1b4d8a0 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Mon, 16 Jul 2012 15:34:07 -0700
Subject: Fixed copy paste from external applications

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/clipboard/external-apps-clipboard-agent.js      | 138 +++++----------------
 .../internal-ops/elements-clipboard-agent.js       |  24 ++--
 2 files changed, 38 insertions(+), 124 deletions(-)

(limited to 'js/clipboard')

diff --git a/js/clipboard/external-apps-clipboard-agent.js b/js/clipboard/external-apps-clipboard-agent.js
index 6b9d8090..e78950df 100644
--- a/js/clipboard/external-apps-clipboard-agent.js
+++ b/js/clipboard/external-apps-clipboard-agent.js
@@ -38,6 +38,12 @@ var Montage =               require("montage/core/core").Montage,
 
 var ExternalAppsClipboardAgent = exports.ExternalAppsClipboardAgent = Montage.create(Component, {
 
+    //count how many times pasted
+    //used to move multiple pastes of same copy
+    pasteCounter:{
+        value: 0
+    },
+
     paste:{
         value: function(clipboardEvent){
             var clipboardData = clipboardEvent.clipboardData,
@@ -57,16 +63,14 @@ var ExternalAppsClipboardAgent = exports.ExternalAppsClipboardAgent = Montage.cr
                         }catch(e){
                             console.log(""+e.stack);
                         }
-                        this.application.ninja.selectionController.selectElements(imageElement);
                         this.application.ninja.currentDocument.model.needsSave = true;
-
                     }
                 }
             }
 
             try{
                 if(!!htmlData || !!textData){
-                    this.pasteHtml(htmlData, textData);
+                    this.doPasteHtml(htmlData, textData);
                 }
             }catch(e){
                 console.log(""+e.stack);
@@ -108,16 +112,16 @@ var ExternalAppsClipboardAgent = exports.ExternalAppsClipboardAgent = Montage.cr
                 //Adding element once it is loaded
                 element.onload = function () {
                     element.onload = null;
-                    self.application.ninja.elementMediator.addElements(element, rules, true);
+                    self.application.ninja.elementMediator.addElements(element, rules, true/*notify*/, false /*callAddDelegate*/);
                 };
                 //Setting rules of element
                 rules = {
                     'position': 'absolute',
-                    'top' : '100px',
-                    'left' : '100px'
+                    'top' : '0px',
+                    'left' : '0px'
                 };
                 //
-                self.application.ninja.elementMediator.addElements(element, rules, false);
+                self.application.ninja.elementMediator.addElements(element, rules, false/*notify*/, false /*callAddDelegate*/);
             } else {
                 //HANDLE ERROR ON SAVING FILE TO BE ADDED AS ELEMENT
             }
@@ -126,119 +130,37 @@ var ExternalAppsClipboardAgent = exports.ExternalAppsClipboardAgent = Montage.cr
         }
     },
 
-    //paste from external applicaitons
-    pasteHtml:{
+    doPasteHtml:{
         value: function(htmlData, textData){
-            var i=0, j=0,
-                pasteDataObject=null,
-                pastedElements = [],
-                node = null, nodeList = null,
-                styles = null,
-                divWrapper = null,
-                spanWrapper = null,
-                metaEl = null,
-                self = this;
+            var divWrapper = null, data = null;
 
             if(htmlData){
-
                 //cleanse HTML
-
-                htmlData.replace(/[<script]/g," ");
-
-                this.application.ninja.selectedElements.length = 0;
-                NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": true} );
-
-                try{
-                    nodeList = ClipboardUtil.deserializeHtmlString(htmlData);//this removes html and body tags
-                }
-                catch(e){
-                    console.log(""+e.stack);
-                }
-
-                for(i=0; i < nodeList.length; i++){
-                    if(nodeList[i].tagName === "META") {
-                        nodeList[i] = null;
-                    }
-                    else if (nodeList[i].tagName === "CANVAS"){
-                        //can't paste external canvas for lack of all metadata
-                        nodeList[i] = null;
-                    }
-                    else if((nodeList[i].nodeType === 3) || (nodeList[i].tagName === "A")){
-                        node = nodeList[i].cloneNode(true);
-
-                        divWrapper = document.application.njUtils.make("div", null, this.application.ninja.currentDocument);
-                        spanWrapper = document.application.njUtils.make("span", null, this.application.ninja.currentDocument);
-                        spanWrapper.appendChild(node);
-                        divWrapper.appendChild(spanWrapper);
-                        styles = {"position":"absolute", "top":"100px", "left":"100px"};
-
-                        this.pastePositioned(divWrapper, styles);
-
-                        nodeList[i] = null;
-                        pastedElements.push(divWrapper);
-
-                    }else if(nodeList[i].tagName === "SPAN"){
-                        node = nodeList[i].cloneNode(true);
-
-                        divWrapper = document.application.njUtils.make("div", null, this.application.ninja.currentDocument);
-                        divWrapper.appendChild(node);
-                        styles =  {"position":"absolute", "top":"100px", "left":"100px"};
-
-                        this.pastePositioned(divWrapper, styles);
-
-                        nodeList[i] = null;
-                        pastedElements.push(divWrapper);
-                    }
-                    else {
-                        node = nodeList[i].cloneNode(true);
-
-                        //get class string while copying .... generate styles from class
-                        styles = {"position":"absolute", "top":"100px", "left":"100px"};
-
-                        this.pastePositioned(node, styles);
-
-                        nodeList[i] = null;
-                        pastedElements.push(node);
-                    }
-
-                }
-
-                nodeList = null;
-
-
-            }else if(textData){
-                node = ClipboardUtil.deserializeHtmlString("<div><span>"+ textData +"</span></div>")[0];
-                styles = {"position":"absolute", "top":"100px", "left":"100px"};
-                this.pastePositioned(node, styles);
+                htmlData = htmlData.replace(/\<meta [^>]+>/gi, ""); // Remove the meta tag.
+                htmlData = htmlData.replace(/\<script [^>]+>/g," "); // Remove the script tag.
             }
 
-            NJevent("elementAdded", pastedElements);
-            this.application.ninja.currentDocument.model.needsSave = true;
+            textData = textData.replace(/\<script [^>]+>/g," "); // Remove any script tag.
 
-        }
-    },
 
-    pastePositioned:{
-        value: function(element, styles, fromCopy){// for now can wok for both in-place and centered paste
-            var modObject = [], x,y, newX, newY, counter;
+            data = htmlData ? htmlData : textData;
 
-            if((typeof fromCopy === "undefined") || (fromCopy && fromCopy === true)){
-                counter = this.pasteCounter;
-            }else{
-                counter = this.pasteCounter - 1;
-            }
+            if (data && data.length) {
+                //deselect current selections
+                this.application.ninja.selectedElements.length = 0;
+                NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": true} );
 
-            x = styles ? ("" + styles.left + "px") : "100px";
-            y = styles ? ("" + styles.top + "px") : "100px";
-            newX = styles ? ("" + (styles.left + (25 * counter)) + "px") : "100px";
-            newY = styles ? ("" + (styles.top + (25 * counter)) + "px") : "100px";
+                divWrapper = document.application.njUtils.make("div", null, this.application.ninja.currentDocument);
+                this.application.ninja.elementMediator.addElements(divWrapper, {"height": "68px",
+                                                                                "left": "0px",
+                                                                                "position": "absolute",
+                                                                                "top": "0px",
+                                                                                "width": "161px"});
 
-            if(!styles || (styles && !styles.position)){
-                this.application.ninja.elementMediator.addElements(element, null, false);
-            }else if(styles && (styles.position === "absolute")){
-                this.application.ninja.elementMediator.addElements(element, {"top" : newY, "left" : newX}, false);//displace
+                divWrapper.innerHTML = data;
+
+                this.application.ninja.currentDocument.model.needsSave = true;
             }
         }
     }
-
 });
diff --git a/js/clipboard/internal-ops/elements-clipboard-agent.js b/js/clipboard/internal-ops/elements-clipboard-agent.js
index a6bce2ba..cfc75916 100644
--- a/js/clipboard/internal-ops/elements-clipboard-agent.js
+++ b/js/clipboard/internal-ops/elements-clipboard-agent.js
@@ -152,8 +152,6 @@ var ElementsClipboardAgent = exports.ElementsClipboardAgent = Montage.create(Com
 
             this.pasteCounter++;
 
-            //cleanse HTML
-
             for(j=0; j< this.copiedObjects.copy.length; j++){
                 copiedElement = this.copiedObjects.copy[j];
                 styles = null;
@@ -259,16 +257,13 @@ var ElementsClipboardAgent = exports.ElementsClipboardAgent = Montage.create(Com
 
             if(sourceCanvas.ownerDocument.defaultView.getComputedStyle(sourceCanvas).getPropertyValue("position") === "absolute"){
                 styles = canvas.elementModel.data || {};
-                styles.top = "" + (this.application.ninja.elementMediator.getProperty(sourceCanvas, "top", parseInt) + (25 * this.pasteCounter))+"px";
-                styles.left = "" + (this.application.ninja.elementMediator.getProperty(sourceCanvas, "left", parseInt) + (25 * this.pasteCounter)) + "px";
+                styles.top = "" + (this.application.ninja.elementMediator.getProperty(sourceCanvas, "top", parseInt) + (10 * this.pasteCounter))+"px";
+                styles.left = "" + (this.application.ninja.elementMediator.getProperty(sourceCanvas, "left", parseInt) + (10 * this.pasteCounter)) + "px";
             }else{
                 styles = null;
             }
 
-            var addDelegate = this.application.ninja.elementMediator.addDelegate;
-            this.application.ninja.elementMediator.addDelegate = null;
-            this.application.ninja.elementMediator.addElements(canvas, styles, false);
-            this.application.ninja.elementMediator.addDelegate = addDelegate;
+            this.application.ninja.elementMediator.addElements(canvas, styles, false/*notify*/, false /*callAddDelegate*/);
 
             worldData = sourceCanvas.elementModel.shapeModel ? sourceCanvas.elementModel.shapeModel.GLWorld.exportJSON(): null;
             if(worldData)
@@ -360,13 +355,11 @@ var ElementsClipboardAgent = exports.ElementsClipboardAgent = Montage.create(Com
 
             x = styles ? ("" + styles.left + "px") : "100px";
             y = styles ? ("" + styles.top + "px") : "100px";
-            newX = styles ? ("" + (styles.left + (25 * counter)) + "px") : "100px";
-            newY = styles ? ("" + (styles.top + (25 * counter)) + "px") : "100px";
-
-            var addDelegate = this.application.ninja.elementMediator.addDelegate;
-            this.application.ninja.elementMediator.addDelegate = null;
+            newX = styles ? ("" + (styles.left + (10 * counter)) + "px") : "100px";
+            newY = styles ? ("" + (styles.top + (10 * counter)) + "px") : "100px";
+            
             if(!styles || (styles && !styles.position)){
-                this.application.ninja.elementMediator.addElements(element, null, false);
+                this.application.ninja.elementMediator.addElements(element, null, false /*notify*/, false /*callAddDelegate*/);
             }else if(styles && (styles.position === "absolute")){
                 if((element.tagName === "IMG") || (element.getAttribute("type") === "image/svg+xml")){
                     element.onload = function(){
@@ -376,9 +369,8 @@ var ElementsClipboardAgent = exports.ElementsClipboardAgent = Montage.create(Com
                     }
                 }
 
-                this.application.ninja.elementMediator.addElements(element, {"top" : newY, "left" : newX}, false);//displace
+                this.application.ninja.elementMediator.addElements(element, {"top" : newY, "left" : newX}, false/*notify*/, false /*callAddDelegate*/);//displace
             }
-            this.application.ninja.elementMediator.addDelegate = addDelegate;
         }
     },
 
-- 
cgit v1.2.3


From f2dbca782bbaca3bed96dff808693693ba083ea9 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Tue, 17 Jul 2012 14:24:17 -0700
Subject: Fixes : resize wrapper for content, prevent duplicate pastes

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/clipboard/external-apps-clipboard-agent.js | 58 ++++++++++++++++++---------
 1 file changed, 38 insertions(+), 20 deletions(-)

(limited to 'js/clipboard')

diff --git a/js/clipboard/external-apps-clipboard-agent.js b/js/clipboard/external-apps-clipboard-agent.js
index e78950df..819f515e 100644
--- a/js/clipboard/external-apps-clipboard-agent.js
+++ b/js/clipboard/external-apps-clipboard-agent.js
@@ -52,8 +52,13 @@ var ExternalAppsClipboardAgent = exports.ExternalAppsClipboardAgent = Montage.cr
             i=0,
             imageMime, imageData, imageElement;
 
-            //handle image blobs
-            if(clipboardData.items &&  (clipboardData.items.length > 0)){
+            if(!!htmlData || !!textData){
+                try{
+                    this.doPasteHtml(htmlData, textData);
+                }catch(e){
+                    console.log(""+e.stack);
+                }
+            }else if(clipboardData.items &&  (clipboardData.items.length > 0)){//handle image blobs
                 for(i=0; i < clipboardData.items.length; i++ ){
                     if((clipboardData.items[i].kind === "file") && (clipboardData.items[i].type.indexOf("image") === 0)){//example type -> "image/png"
                         imageMime = clipboardData.items[i].type;
@@ -67,15 +72,6 @@ var ExternalAppsClipboardAgent = exports.ExternalAppsClipboardAgent = Montage.cr
                     }
                 }
             }
-
-            try{
-                if(!!htmlData || !!textData){
-                    this.doPasteHtml(htmlData, textData);
-                }
-            }catch(e){
-                console.log(""+e.stack);
-            }
-
         }
     },
 
@@ -134,14 +130,8 @@ var ExternalAppsClipboardAgent = exports.ExternalAppsClipboardAgent = Montage.cr
         value: function(htmlData, textData){
             var divWrapper = null, data = null;
 
-            if(htmlData){
-                //cleanse HTML
-                htmlData = htmlData.replace(/\<meta [^>]+>/gi, ""); // Remove the meta tag.
-                htmlData = htmlData.replace(/\<script [^>]+>/g," "); // Remove the script tag.
-            }
-
-            textData = textData.replace(/\<script [^>]+>/g," "); // Remove any script tag.
-
+            htmlData = this.sanitize(htmlData);
+            textData = this.sanitize(textData);
 
             data = htmlData ? htmlData : textData;
 
@@ -155,12 +145,40 @@ var ExternalAppsClipboardAgent = exports.ExternalAppsClipboardAgent = Montage.cr
                                                                                 "left": "0px",
                                                                                 "position": "absolute",
                                                                                 "top": "0px",
-                                                                                "width": "161px"});
+                                                                                "width": "161px"}, false);
 
                 divWrapper.innerHTML = data;
 
+                //hack to set the wrapper div's height and width as per the pasted content
+                var theclass = divWrapper.getAttribute("class");
+                //temporarily remove the class to find the computed styles for the pasted content
+                if(theclass){
+                    divWrapper.removeAttribute("class");
+                }
+                var height = divWrapper.ownerDocument.defaultView.getComputedStyle(divWrapper).getPropertyValue("height");
+                var width = divWrapper.ownerDocument.defaultView.getComputedStyle(divWrapper).getPropertyValue("width");
+
+                divWrapper.setAttribute("class", theclass);
+
+                this.application.ninja.stylesController.setElementStyle(divWrapper, "height", height);
+                this.application.ninja.stylesController.setElementStyle(divWrapper, "width", width);
+                //-end hack
+
+                NJevent("elementAdded", divWrapper);
+
                 this.application.ninja.currentDocument.model.needsSave = true;
             }
         }
+    },
+
+    sanitize : {
+        value: function(data){
+            data = data.replace(/\<meta [^>]+>/gi, ""); // Remove meta tags
+            data = data.replace(/\<script [^>]+>/g," "); // Remove script tags
+            data = data.replace(/\<link [^>]+>/g," "); // Remove script tags
+            data = data.replace(/\<xml [^>]+>/g," "); // Remove script tags
+
+            return data;
+        }
     }
 });
-- 
cgit v1.2.3


From 1e9cd5ea63f06f264ea22be36ec565ee2bae1acc Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Tue, 17 Jul 2012 15:31:26 -0700
Subject: Try pasting the binary image first, since Windows Chrome places both
 binary and html for copying an image.

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/clipboard/external-apps-clipboard-agent.js | 50 +++++++++++++++++----------
 1 file changed, 31 insertions(+), 19 deletions(-)

(limited to 'js/clipboard')

diff --git a/js/clipboard/external-apps-clipboard-agent.js b/js/clipboard/external-apps-clipboard-agent.js
index 819f515e..5a82314b 100644
--- a/js/clipboard/external-apps-clipboard-agent.js
+++ b/js/clipboard/external-apps-clipboard-agent.js
@@ -50,28 +50,40 @@ var ExternalAppsClipboardAgent = exports.ExternalAppsClipboardAgent = Montage.cr
             htmlData = clipboardData.getData("text/html"),
             textData = clipboardData.getData("text/plain"),
             i=0,
-            imageMime, imageData, imageElement;
+            imageMime, imageData, imageElement, isImage = false, imageItem;
 
-            if(!!htmlData || !!textData){
-                try{
-                    this.doPasteHtml(htmlData, textData);
-                }catch(e){
-                    console.log(""+e.stack);
-                }
-            }else if(clipboardData.items &&  (clipboardData.items.length > 0)){//handle image blobs
+            if(clipboardData.items &&  (clipboardData.items.length > 0)){//handle image blobs
                 for(i=0; i < clipboardData.items.length; i++ ){
                     if((clipboardData.items[i].kind === "file") && (clipboardData.items[i].type.indexOf("image") === 0)){//example type -> "image/png"
-                        imageMime = clipboardData.items[i].type;
-                        imageData = clipboardData.items[i].getAsFile();
-                        try{
-                            imageElement = this.pasteImageBinary(imageData);
-                        }catch(e){
-                            console.log(""+e.stack);
+                        isImage = true;
+                        if(clipboardData.items[i].type === "image/png"){
+                            imageItem = clipboardData.items[i];//grab the png image from clipboard
+                        }
+                        else if(i===0){
+                            imageItem = clipboardData.items[i];
                         }
-                        this.application.ninja.currentDocument.model.needsSave = true;
                     }
                 }
             }
+
+            if(isImage && imageItem){
+                imageMime = imageItem.type;
+                imageData = imageItem.getAsFile();
+                try{
+                    imageElement = this.pasteImageBinary(imageData);
+                }catch(e){
+                    console.log(""+e.stack);
+                }
+                this.application.ninja.currentDocument.model.needsSave = true;
+            }
+
+            if(!isImage && (!!htmlData || !!textData)){
+                try{
+                    this.doPasteHtml(htmlData, textData);
+                }catch(e){
+                    console.log(""+e.stack);
+                }
+            }
         }
     },
 
@@ -128,7 +140,7 @@ var ExternalAppsClipboardAgent = exports.ExternalAppsClipboardAgent = Montage.cr
 
     doPasteHtml:{
         value: function(htmlData, textData){
-            var divWrapper = null, data = null;
+            var divWrapper = null, data = null, theclass, height, width;
 
             htmlData = this.sanitize(htmlData);
             textData = this.sanitize(textData);
@@ -150,13 +162,13 @@ var ExternalAppsClipboardAgent = exports.ExternalAppsClipboardAgent = Montage.cr
                 divWrapper.innerHTML = data;
 
                 //hack to set the wrapper div's height and width as per the pasted content
-                var theclass = divWrapper.getAttribute("class");
+                theclass = divWrapper.getAttribute("class");
                 //temporarily remove the class to find the computed styles for the pasted content
                 if(theclass){
                     divWrapper.removeAttribute("class");
                 }
-                var height = divWrapper.ownerDocument.defaultView.getComputedStyle(divWrapper).getPropertyValue("height");
-                var width = divWrapper.ownerDocument.defaultView.getComputedStyle(divWrapper).getPropertyValue("width");
+                height = divWrapper.ownerDocument.defaultView.getComputedStyle(divWrapper).getPropertyValue("height");
+                width = divWrapper.ownerDocument.defaultView.getComputedStyle(divWrapper).getPropertyValue("width");
 
                 divWrapper.setAttribute("class", theclass);
 
-- 
cgit v1.2.3


From f1ba6e97f4e171566f6785069ecfca627c132f25 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Wed, 18 Jul 2012 09:10:54 -0700
Subject: removing iframes from pasted content to prevent frame injection
 attack

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/clipboard/external-apps-clipboard-agent.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'js/clipboard')

diff --git a/js/clipboard/external-apps-clipboard-agent.js b/js/clipboard/external-apps-clipboard-agent.js
index 5a82314b..65410543 100644
--- a/js/clipboard/external-apps-clipboard-agent.js
+++ b/js/clipboard/external-apps-clipboard-agent.js
@@ -186,9 +186,10 @@ var ExternalAppsClipboardAgent = exports.ExternalAppsClipboardAgent = Montage.cr
     sanitize : {
         value: function(data){
             data = data.replace(/\<meta [^>]+>/gi, ""); // Remove meta tags
-            data = data.replace(/\<script [^>]+>/g," "); // Remove script tags
-            data = data.replace(/\<link [^>]+>/g," "); // Remove script tags
-            data = data.replace(/\<xml [^>]+>/g," "); // Remove script tags
+            data = data.replace(/\<script [^>]+>/g," "); // Remove script tags to prevenet script injection attack
+            data = data.replace(/\<link [^>]+>/g," "); // Remove link tags to prevent unwanted css files that may corrupt the stage
+            data = data.replace(/\<xml [^>]+>/g," "); // Remove xml tags since it works only for IE browsers
+            data = data.replace(/\<iframe [^>]+>/g," "); // Remove iframe tags to prevent iframe injection attack
 
             return data;
         }
-- 
cgit v1.2.3


From 0b6e845b4afe8cf3571351bd7b2aa872fab61c71 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Thu, 19 Jul 2012 17:08:08 -0700
Subject: copy/paste from external apps - removed unnecessary selection change
 to fix PI redraw issue

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

Conflicts:

	js/controllers/clipboard-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/clipboard/external-apps-clipboard-agent.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'js/clipboard')

diff --git a/js/clipboard/external-apps-clipboard-agent.js b/js/clipboard/external-apps-clipboard-agent.js
index 65410543..b82784d3 100644
--- a/js/clipboard/external-apps-clipboard-agent.js
+++ b/js/clipboard/external-apps-clipboard-agent.js
@@ -148,16 +148,12 @@ var ExternalAppsClipboardAgent = exports.ExternalAppsClipboardAgent = Montage.cr
             data = htmlData ? htmlData : textData;
 
             if (data && data.length) {
-                //deselect current selections
-                this.application.ninja.selectedElements.length = 0;
-                NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": true} );
-
                 divWrapper = document.application.njUtils.make("div", null, this.application.ninja.currentDocument);
                 this.application.ninja.elementMediator.addElements(divWrapper, {"height": "68px",
                                                                                 "left": "0px",
                                                                                 "position": "absolute",
                                                                                 "top": "0px",
-                                                                                "width": "161px"}, false);
+                                                                                "width": "161px"}, false/*notify*/, false/*callAddDelegate*/);
 
                 divWrapper.innerHTML = data;
 
-- 
cgit v1.2.3