From c90a2542aadbcb263496d5df58f7fae7b591ed7f Mon Sep 17 00:00:00 2001 From: Subramanyan Murali Date: Fri, 9 Sep 2011 17:27:21 -0700 Subject: [PATCH] fixed demo error --- src/gallery-clipboard/demo/demo_1.html | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/gallery-clipboard/demo/demo_1.html b/src/gallery-clipboard/demo/demo_1.html index 5e6373c830..268a5bd1f9 100644 --- a/src/gallery-clipboard/demo/demo_1.html +++ b/src/gallery-clipboard/demo/demo_1.html @@ -1,8 +1,4 @@ -<<<<<<< HEAD -======= - ->>>>>>> upstream/master @@ -95,7 +91,15 @@

var node1 = Y.one(".b1"), node2 = Y.one(".b2"); - + + /* Make sure that the flash interface callback is within a known global name space */ + window.My = { + Global : { + foo : "bar" + } + }; + Y.ClipBoard.setCallBackGlobal( "My.Global" ); + /* Set up Copy on Node 1 */ node1.plug(Y.ClipBoard, { page : Y.one(".container"),