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/youtube-channel-example | |
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/youtube-channel-example')
4 files changed, 0 insertions, 107 deletions
diff --git a/node_modules/montage/examples/youtube-channel-example/index.html b/node_modules/montage/examples/youtube-channel-example/index.html deleted file mode 100755 index 132d0d5a..00000000 --- a/node_modules/montage/examples/youtube-channel-example/index.html +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | <!DOCTYPE html> | ||
2 | <!-- <copyright> | ||
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
6 | </copyright> --> | ||
7 | <html> | ||
8 | <head> | ||
9 | <title>Youtube Channel</title> | ||
10 | <link rel="stylesheet" type="text/css" href="style.css"> | ||
11 | <script src="../../montage.js" type="text/javascript"></script> | ||
12 | <script type="text/montage-serialization"> | ||
13 | { | ||
14 | "player": { | ||
15 | "prototype": "montage/ui/youtube-channel.reel", | ||
16 | "properties": { | ||
17 | "element": {"#": "player"}, | ||
18 | "channelUrl": "http://www.youtube.com/TEDEducation" | ||
19 | } | ||
20 | }, | ||
21 | |||
22 | "url": { | ||
23 | "prototype": "montage/ui/textfield.reel", | ||
24 | "properties": { | ||
25 | "element": {"#": "url"}, | ||
26 | "value": "http://www.youtube.com/TEDEducation" | ||
27 | }, | ||
28 | "bindings": { | ||
29 | "value": { | ||
30 | "boundObject": {"@": "player"}, | ||
31 | "boundObjectPropertyPath": "channelUrl" | ||
32 | } | ||
33 | } | ||
34 | } | ||
35 | } | ||
36 | </script> | ||
37 | </head> | ||
38 | <body> | ||
39 | <div class="youtube-channel-example"> | ||
40 | <div id="title">Youtube Channel</div> | ||
41 | <input type="text" data-montage-id="url" placeholder="Channel URL" class="youtube-channel-example-url"> | ||
42 | <div data-montage-id="player"></div> | ||
43 | </div> | ||
44 | </body> | ||
45 | </html> | ||
diff --git a/node_modules/montage/examples/youtube-channel-example/package.json b/node_modules/montage/examples/youtube-channel-example/package.json deleted file mode 100755 index ecfbdd8a..00000000 --- a/node_modules/montage/examples/youtube-channel-example/package.json +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | { | ||
2 | "name": "youtube-channel-example", | ||
3 | "version": "0.0.0", | ||
4 | "mappings": { | ||
5 | "montage": "../../" | ||
6 | } | ||
7 | } \ No newline at end of file | ||
diff --git a/node_modules/montage/examples/youtube-channel-example/style.css b/node_modules/montage/examples/youtube-channel-example/style.css deleted file mode 100755 index c281cd65..00000000 --- a/node_modules/montage/examples/youtube-channel-example/style.css +++ /dev/null | |||
@@ -1,47 +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 | |||
7 | |||
8 | /* Base ----------------------------- */ | ||
9 | |||
10 | html { | ||
11 | background-color: hsl(0,0%,85%); | ||
12 | height: 100%; | ||
13 | } | ||
14 | |||
15 | body { | ||
16 | margin: 0; | ||
17 | width: 100%; | ||
18 | height: 100%; | ||
19 | display: -webkit-box; | ||
20 | -webkit-box-align: center; | ||
21 | -webkit-box-pack: center; | ||
22 | |||
23 | display: -moz-box; | ||
24 | -moz-box-align: center; | ||
25 | -moz-box-pack: center; | ||
26 | } | ||
27 | |||
28 | |||
29 | /* Converter ----------------------------- */ | ||
30 | |||
31 | .youtube-channel-example { | ||
32 | padding: 10px; | ||
33 | text-shadow: #fff 0 1px 0; | ||
34 | border-radius: 8px; | ||
35 | background-color: hsl(0,0%,95%); | ||
36 | box-shadow: inset 0px 1px 2px 1px hsla(0,0%,100%,1), 0px 2px 5px hsla(0,0%,0%,.1); | ||
37 | } | ||
38 | |||
39 | .youtube-channel-example #title { | ||
40 | margin: 0 0 5px 0; | ||
41 | text-align: center; | ||
42 | font: 24px/40px "Lucida Grande", "Trebuchet MS", Verdana, sans-serif; | ||
43 | } | ||
44 | |||
45 | .youtube-channel-example-url { | ||
46 | width: 100%; | ||
47 | } | ||
diff --git a/node_modules/montage/examples/youtube-channel-example/youtube-channel-example.js b/node_modules/montage/examples/youtube-channel-example/youtube-channel-example.js deleted file mode 100755 index 4ca12757..00000000 --- a/node_modules/montage/examples/youtube-channel-example/youtube-channel-example.js +++ /dev/null | |||
@@ -1,8 +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").Montage; | ||
7 | |||
8 | exports.YoutubeChannelExample = Montage.create(Converter, {}); | ||