diff options
author | Ananya Sen | 2012-02-03 09:57:41 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-03 09:57:41 -0800 |
commit | c093dd13a84ce6eb3e00a672c38a808093c5d966 (patch) | |
tree | 5dfd4a800bbbe02a8cbcb3ffeee542686bc258bb /user-document-templates/montage-application-cloud | |
parent | 79b0173eeca079dec42ff1480182656dbe3af44f (diff) | |
parent | 8e06b63e5eab5558823f4923e20a832c8b36cbe2 (diff) | |
download | ninja-c093dd13a84ce6eb3e00a672c38a808093c5d966.tar.gz |
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Conflicts:
js/io/document/document-controller.js
js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
js/io/ui/save-as-dialog.reel/save-as-dialog.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'user-document-templates/montage-application-cloud')
-rwxr-xr-x | user-document-templates/montage-application-cloud/appdelegate.js | 25 |
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 64ce6f59..3c21b46e 100755 --- 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 | |||
7 | var Montage = require("montage/core/core").Montage, | 7 | var 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 = require("montage/ui/button.reel").Button, | ||
11 | Checkbox = require("montage/ui/checkbox.reel").Checkbox, | ||
12 | Condition = require("montage/ui/condition.reel").Condition, | ||
13 | DynamicText = require("montage/ui/dynamic-text.reel").DynamicText, | ||
14 | |||
15 | FlowController = require("montage/ui/flow-controller.reel").FlowController, | ||
16 | |||
17 | HotText = require("montage/ui/hottext.reel").HotText, | ||
18 | HotTextUnit = require("montage/ui/hottextunit.reel").HotTextUnit, | ||
19 | |||
20 | ImageContainer = require("montage/ui/photo-editor.reel").PhotoEditor, | ||
21 | Progress = require("montage/ui/progress.reel").Progress, | ||
22 | |||
23 | Repetition = require("montage/ui/repetition.reel").Repetition, | ||
24 | Scrollview = require("montage/ui/scrollview.reel").Scrollview, | ||
25 | Slider = require("montage/ui/slider.reel").Slider, | ||
26 | Slot = require("montage/ui/slot.reel").Slot, | ||
27 | Substitution = require("montage/ui/substitution.reel").Substitution, | ||
28 | |||
29 | TextArea = require("montage/ui/textarea.reel").TextArea, | ||
30 | Textfield = require("montage/ui/textfield.reel").Textfield, | ||
31 | |||
32 | Toggle = require("montage/ui/toggle.reel").Toggle, | ||
33 | ToggleButton = require("montage/ui/button.reel").ToggleButton; | ||
34 | |||
35 | exports.MyAppDelegate = Montage.create(Component, { | 10 | exports.MyAppDelegate = Montage.create(Component, { |
36 | templateDidLoad: { | 11 | templateDidLoad: { |
37 | value: function(){ | 12 | value: function(){ |