fixed demo error

yui · Sep 10, 2011 · c90a254 · c90a254
1 parent 7844acd
commit c90a254
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/gallery-clipboard/demo/demo_1.html b/src/gallery-clipboard/demo/demo_1.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 <!DOCTYPE html>
-=======
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
->>>>>>> upstream/master
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -95,7 +91,15 @@ <h2></h2>
 
         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"),