aboutsummaryrefslogtreecommitdiff
path: root/user-document-templates/montage-application-cloud
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-17 00:20:42 -0800
committerJose Antonio Marquez2012-02-17 00:20:42 -0800
commit7e9c50aaa9774f1c8840e19d831ed2e7bfd9f61f (patch)
tree0a51be74f0d5b1f6c740cd1a9c79e00624a0c0af /user-document-templates/montage-application-cloud
parent9fe5d98bf469036c856e28d71ad4160d630b4af4 (diff)
parent18a42c37d080c03830c3f0a4156b81044e6309ee (diff)
downloadninja-7e9c50aaa9774f1c8840e19d831ed2e7bfd9f61f.tar.gz
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'user-document-templates/montage-application-cloud')
-rw-r--r--user-document-templates/montage-application-cloud/main.reel/main.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/user-document-templates/montage-application-cloud/main.reel/main.js b/user-document-templates/montage-application-cloud/main.reel/main.js
index 86871fd3..567f481c 100644
--- a/user-document-templates/montage-application-cloud/main.reel/main.js
+++ b/user-document-templates/montage-application-cloud/main.reel/main.js
@@ -6,8 +6,6 @@
6var Montage = require("montage/core/core").Montage, 6var Montage = require("montage/core/core").Montage,
7 Component = require("montage/ui/component").Component; 7 Component = require("montage/ui/component").Component;
8 8
9//var Button = ("montage/ui/button.reel").Button;
10
11exports.Main = Montage.create(Component, { 9exports.Main = Montage.create(Component, {
12 10
13 hasTemplate: { 11 hasTemplate: {
@@ -31,6 +29,7 @@ exports.Main = Montage.create(Component, {
31 } 29 }
32 }, 30 },
33 31
32 // Adding components to the user document by using a async require.
34 addComponentToUserDocument:{ 33 addComponentToUserDocument:{
35 value:function(element, data, callback){ 34 value:function(element, data, callback){
36 35
@@ -42,7 +41,7 @@ exports.Main = Montage.create(Component, {
42 var componentInstance = componentRequire.create(); 41 var componentInstance = componentRequire.create();
43 42
44 componentInstance.element = element; 43 componentInstance.element = element;
45 componentInstance.deserializedFromTemplate(); 44 //componentInstance.deserializedFromTemplate();
46 componentInstance.needsDraw = true; 45 componentInstance.needsDraw = true;
47 46
48 callback(componentInstance, element); 47 callback(componentInstance, element);