diff options
author | hwc487 | 2012-05-11 13:52:55 -0700 |
---|---|---|
committer | hwc487 | 2012-05-11 13:52:55 -0700 |
commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /node_modules/montage/examples/feed-reader/map-example.reel/main.js | |
parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
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 | }); | ||