aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-21 16:40:34 -0700
committerJose Antonio Marquez2012-03-21 16:40:34 -0700
commit24699c72a0efc1788bb26e0988a31fb0002f560c (patch)
tree6badd6444516fb07a01ac4dbcc16be8e3f509706
parent47ccf0bb685fdaff4c5bdc767e9091a209e34a0f (diff)
parent19aca6ec6f3c10922646f0ca760a375acdffaf56 (diff)
downloadninja-24699c72a0efc1788bb26e0988a31fb0002f560c.tar.gz
Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Components
-rw-r--r--js/document/templates/montage-html/main.reel/main.js14
-rwxr-xr-xnode_modules/montage/ui/picasa-carousel.reel/picasa-carousel.css2
2 files changed, 13 insertions, 3 deletions
diff --git a/js/document/templates/montage-html/main.reel/main.js b/js/document/templates/montage-html/main.reel/main.js
index 6c141108..2970f37a 100644
--- a/js/document/templates/montage-html/main.reel/main.js
+++ b/js/document/templates/montage-html/main.reel/main.js
@@ -27,16 +27,17 @@ exports.Main = Montage.create(Component, {
27 var componentInstance = componentRequire.create(); 27 var componentInstance = componentRequire.create();
28 28
29 componentInstance.element = element; 29 componentInstance.element = element;
30 //componentInstance.deserializedFromTemplate(); 30
31 componentInstance.needsDraw = true; 31 componentInstance.needsDraw = true;
32 componentInstance.ownerComponent = self; 32 componentInstance.ownerComponent = self;
33 33
34 componentInstance.addEventListener("firstDraw", self, false);
35
34 callback(componentInstance, element); 36 callback(componentInstance, element);
35 }) 37 })
36 .end(); 38 .end();
37 39
38 }; 40 };
39// window.addBinding = this.addBindingToUserDocument;
40 41
41 // Dispatch event when this template has loaded. 42 // Dispatch event when this template has loaded.
42 var newEvent = document.createEvent( "CustomEvent" ); 43 var newEvent = document.createEvent( "CustomEvent" );
@@ -45,5 +46,14 @@ exports.Main = Montage.create(Component, {
45 document.body.dispatchEvent( newEvent ); 46 document.body.dispatchEvent( newEvent );
46 47
47 } 48 }
49 },
50
51 handleFirstDraw: {
52 value: function() {
53 var newEvent = document.createEvent( "CustomEvent" );
54 newEvent.initCustomEvent( "addComponentFirstDraw", false, true );
55
56 document.body.dispatchEvent( newEvent );
57 }
48 } 58 }
49}); \ No newline at end of file 59}); \ No newline at end of file
diff --git a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.css b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.css
index cab6d1bb..123c4a0f 100755
--- a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.css
+++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.css
@@ -29,7 +29,7 @@
29 right: 0; 29 right: 0;
30 bottom: 0; 30 bottom: 0;
31*/ -webkit-perspective: 800px; 31*/ -webkit-perspective: 800px;
32 background: -webkit-gradient(linear, left top, left bottom, from(#666), to(#bbb)); 32 /*background: -webkit-gradient(linear, left top, left bottom, from(#666), to(#bbb));*/
33} 33}
34.image { 34.image {
35 position: absolute; 35 position: absolute;