aboutsummaryrefslogtreecommitdiff
path: root/js/document
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-16 23:12:11 -0800
committerJose Antonio Marquez2012-02-16 23:12:11 -0800
commite404c691b84ca8fd1ab17fc6187bccb3f94258fb (patch)
tree7547d267a629ac717553e98e34a4d02543d529b7 /js/document
parentcfc2a432323d4620b1f4ca2061bbe57f46e7eaf7 (diff)
parente67d1f472dab28b4ff6afc9d9cc06b34756e26b5 (diff)
downloadninja-e404c691b84ca8fd1ab17fc6187bccb3f94258fb.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'js/document')
-rw-r--r--js/document/templates/montage-html/main.reel/main.js5
1 files changed, 2 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 86871fd3..567f481c 100644
--- a/js/document/templates/montage-html/main.reel/main.js
+++ b/js/document/templates/montage-html/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);