From 50ee24fdfade83778f623a2e45effca953931a30 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Tue, 19 Jun 2012 16:28:26 -0700
Subject: adding some error handling

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/controllers/clipboard-controller.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'js/controllers')

diff --git a/js/controllers/clipboard-controller.js b/js/controllers/clipboard-controller.js
index 5e63e424..129e1f89 100644
--- a/js/controllers/clipboard-controller.js
+++ b/js/controllers/clipboard-controller.js
@@ -133,8 +133,20 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
             this.pasteCounter++;
 
             if(ninjaData){
-                if(this.copiedObjects.copy){this.pasteFromCopy();}
-                else if(this.copiedObjects.cut){this.pasteFromCut();}
+                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);
+                    }
+                }
             }
             else{
 
-- 
cgit v1.2.3