aboutsummaryrefslogtreecommitdiff
path: root/user-document-templates/montage-application-cloud
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-03 12:20:10 -0800
committerValerio Virgillito2012-02-03 12:20:10 -0800
commite6e539f345f5e1ac36a595db5d1a1c3700715e88 (patch)
tree39846bf1570f9b5a4057b726c54905de9e9e1c02 /user-document-templates/montage-application-cloud
parent7950424cf704bb221971f4645406b01e6979db18 (diff)
parentc630ead20487c3948fa36448d3e7d5f7b5cba782 (diff)
downloadninja-e6e539f345f5e1ac36a595db5d1a1c3700715e88.tar.gz
Merge branch 'master' into components
Conflicts: node_modules/montage/ui/bluemoon/progress.reel/progress.html node_modules/montage/ui/image2.reel/image2.html node_modules/ninja-components/effect/desaturate-effect.js node_modules/ninja-components/effect/effect.js node_modules/ninja-components/effect/invert-effect.js node_modules/ninja-components/effect/kaliedoscope-effect.js node_modules/ninja-components/effect/multiply-effect.js node_modules/ninja-components/effect/sepia-effect.js node_modules/ninja-components/flow-controller.reel/flow-controller.html node_modules/ninja-components/flow-controller.reel/flow-controller.js node_modules/ninja-components/flow-offset.js node_modules/ninja-components/hottext.reel/hottext.css node_modules/ninja-components/hottext.reel/hottext.html node_modules/ninja-components/hottext.reel/hottext.js node_modules/ninja-components/hottextunit.reel/hottextunit.css node_modules/ninja-components/hottextunit.reel/hottextunit.html node_modules/ninja-components/hottextunit.reel/hottextunit.js node_modules/ninja-components/image2.reel/image2.html node_modules/ninja-components/image2.reel/image2.js node_modules/ninja-components/image3d.reel/image3d.html node_modules/ninja-components/image3d.reel/image3d.js node_modules/ninja-components/photo-editor.reel/photo-editor.css node_modules/ninja-components/photo-editor.reel/photo-editor.html node_modules/ninja-components/photo-editor.reel/photo-editor.js node_modules/ninja-components/slider-base.js user-document-templates/montage-application-cloud/appdelegate.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'user-document-templates/montage-application-cloud')
-rw-r--r--user-document-templates/montage-application-cloud/appdelegate.js25
1 files changed, 0 insertions, 25 deletions
diff --git a/user-document-templates/montage-application-cloud/appdelegate.js b/user-document-templates/montage-application-cloud/appdelegate.js
index fad60394..3c21b46e 100644
--- a/user-document-templates/montage-application-cloud/appdelegate.js
+++ b/user-document-templates/montage-application-cloud/appdelegate.js
@@ -7,31 +7,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
7var Montage = require("montage/core/core").Montage, 7var Montage = require("montage/core/core").Montage,
8 Component = require("montage/ui/component").Component; 8 Component = require("montage/ui/component").Component;
9 9
10//var Button = ("montage/ui/button.reel").Button,
11// Checkbox = ("montage/ui/checkbox.reel").Checkbox,
12// Condition = ("montage/ui/condition.reel").Condition,
13// DynamicText = ("montage/ui/dynamic-text.reel").DynamicText,
14//
15// FlowController = ("montage/ui/flow-controller.reel").FlowController,
16//
17// HotText = ("montage/ui/hottext.reel").HotText,
18// HotTextUnit = ("montage/ui/hottextunit.reel").HotTextUnit,
19//
20// ImageContainer = ("montage/ui/photo-editor.reel").PhotoEditor,
21// Progress = ("montage/ui/progress.reel").Progress,
22//
23// Repetition = ("montage/ui/repetition.reel").Repetition,
24// Scrollview = ("montage/ui/scrollview.reel").Scrollview,
25// Slider = ("montage/ui/slider.reel").Slider,
26// Slot = ("montage/ui/slot.reel").Slot,
27// Substitution = ("montage/ui/substitution.reel").Substitution,
28//
29// TextArea = ("montage/ui/textarea.reel").TextArea,
30// Textfield = ("montage/ui/textfield.reel").Textfield,
31//
32// Toggle = ("montage/ui/toggle.reel").Toggle,
33// ToggleButton = ("montage/ui/button.reel").ToggleButton;
34
35exports.MyAppDelegate = Montage.create(Component, { 10exports.MyAppDelegate = Montage.create(Component, {
36 templateDidLoad: { 11 templateDidLoad: {
37 value: function(){ 12 value: function(){