diff options
author | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
commit | 48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch) | |
tree | 899f9cf1b09a01bc073f92ab498236aed80b38ec /node_modules/montage/examples/feed-reader/map-example.reel/main.js | |
parent | 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff) | |
parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
download | ninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'node_modules/montage/examples/feed-reader/map-example.reel/main.js')
-rw-r--r-- | node_modules/montage/examples/feed-reader/map-example.reel/main.js | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/node_modules/montage/examples/feed-reader/map-example.reel/main.js b/node_modules/montage/examples/feed-reader/map-example.reel/main.js deleted file mode 100644 index 54b84425..00000000 --- a/node_modules/montage/examples/feed-reader/map-example.reel/main.js +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | var Montage = require("montage/core/core").Montage, | ||
7 | Component = require("montage/ui/component").Component; | ||
8 | |||
9 | |||
10 | exports.Main = Montage.create(Component, { | ||
11 | |||
12 | templateDidLoad: { | ||
13 | value: function() { | ||
14 | //console.log("main templateDidLoad") | ||
15 | } | ||
16 | }, | ||
17 | |||
18 | prepareForDraw: { | ||
19 | value: function() { | ||
20 | //console.log("main prepareForDraw") | ||
21 | } | ||
22 | } | ||
23 | |||
24 | }); | ||