aboutsummaryrefslogtreecommitdiff
path: root/node_modules
diff options
context:
space:
mode:
authorKruti Shah2012-06-12 13:09:11 -0700
committerKruti Shah2012-06-12 13:09:11 -0700
commitd648c842905c7c53e0f89b943982493d2b79f56e (patch)
treeeb5585f92061975215f6d19305a8d1b76262e2fc /node_modules
parentbedb38e14887b29eae3cdf1c8d435259c920257c (diff)
parentcf3b96822665751dae7a64644db3cb3960733c3d (diff)
downloadninja-d648c842905c7c53e0f89b943982493d2b79f56e.tar.gz
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts: js/controllers/elements/element-controller.js js/document/_toDelete/html-document.js js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'node_modules')
-rw-r--r--node_modules/components-data/feed-reader.json1
-rw-r--r--node_modules/components-data/picasa-carousel.json1
-rw-r--r--node_modules/components-data/searchfield.json20
-rw-r--r--node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html21
-rw-r--r--node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html43
-rw-r--r--node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js22
-rw-r--r--node_modules/montage-google/map.reel/map.js150
-rw-r--r--node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js11
-rw-r--r--node_modules/montage-google/youtube-channel.reel/youtube-channel.js19
-rwxr-xr-xnode_modules/tools/template/template-creator.js1
10 files changed, 161 insertions, 128 deletions
diff --git a/node_modules/components-data/feed-reader.json b/node_modules/components-data/feed-reader.json
index 5e8ca527..0676cac1 100644
--- a/node_modules/components-data/feed-reader.json
+++ b/node_modules/components-data/feed-reader.json
@@ -18,6 +18,7 @@
18 "possibleValues": ["animation", "timer"] 18 "possibleValues": ["animation", "timer"]
19 } 19 }
20 ], 20 ],
21
21 "defaultStyles": { 22 "defaultStyles": {
22 "width":"380px", 23 "width":"380px",
23 "height":"120px" 24 "height":"120px"
diff --git a/node_modules/components-data/picasa-carousel.json b/node_modules/components-data/picasa-carousel.json
index b0711b12..4ab329e5 100644
--- a/node_modules/components-data/picasa-carousel.json
+++ b/node_modules/components-data/picasa-carousel.json
@@ -12,6 +12,7 @@
12 "default": "" 12 "default": ""
13 } 13 }
14 ], 14 ],
15
15 "defaultStyles": { 16 "defaultStyles": {
16 "width":"800px", 17 "width":"800px",
17 "height":"160px", 18 "height":"160px",
diff --git a/node_modules/components-data/searchfield.json b/node_modules/components-data/searchfield.json
deleted file mode 100644
index 94c570d9..00000000
--- a/node_modules/components-data/searchfield.json
+++ /dev/null
@@ -1,20 +0,0 @@
1{
2 "component": "searchfield",
3
4 "module": "montage/ui/textfield.reel",
5
6 "name": "Textfield",
7
8 "properties": [
9 {
10 "name": "valueBinding",
11 "type": "string",
12 "default": null
13 },
14 {
15 "name": "value",
16 "type": "string",
17 "default": ""
18 }
19 ]
20} \ No newline at end of file
diff --git a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html
index 6b2e51e2..b8b9f39a 100644
--- a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html
+++ b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html
@@ -6,8 +6,7 @@
6 <script type="text/montage-serialization"> 6 <script type="text/montage-serialization">
7{ 7{
8 "title": { 8 "title": {
9 "module": "montage/ui/dynamic-text.reel", 9 "prototype": "montage/ui/dynamic-text.reel",
10 "name": "DynamicText",
11 "properties": { 10 "properties": {
12 "element": {"#": "entry-title"} 11 "element": {"#": "entry-title"}
13 }, 12 },
@@ -20,8 +19,7 @@
20 } 19 }
21 }, 20 },
22 "entryLink": { 21 "entryLink": {
23 "module": "montage/ui/anchor.reel", 22 "prototype": "montage/ui/anchor.reel",
24 "name": "Anchor",
25 "properties": { 23 "properties": {
26 "element": {"#": "entry-url"} 24 "element": {"#": "entry-url"}
27 }, 25 },
@@ -34,8 +32,7 @@
34 } 32 }
35 }, 33 },
36 "description": { 34 "description": {
37 "module": "montage/ui/dynamic-text.reel", 35 "prototype": "montage/ui/dynamic-text.reel",
38 "name": "DynamicText",
39 "properties": { 36 "properties": {
40 "element": {"#": "entry-description"} 37 "element": {"#": "entry-description"}
41 }, 38 },
@@ -48,8 +45,7 @@
48 } 45 }
49 }, 46 },
50 "owner": { 47 "owner": {
51 "module": "montage-google/feed-reader/feed-entry.reel", 48 "prototype": "montage-google/feed-reader/feed-entry.reel",
52 "name": "FeedEntry",
53 "properties": { 49 "properties": {
54 "element": {"#": "feed-entry"} 50 "element": {"#": "feed-entry"}
55 } 51 }
@@ -66,7 +62,7 @@
66 margin-top: 0px; 62 margin-top: 0px;
67 font-size: 24px; 63 font-size: 24px;
68 line-height: 24px; 64 line-height: 24px;
69 margin-bottom: 12px; 65 margin-bottom: 12px;
70 } 66 }
71 .feed-entry .entry-title { 67 .feed-entry .entry-title {
72 font-weight: bold; 68 font-weight: bold;
@@ -79,10 +75,9 @@
79 75
80</head> 76</head>
81<body> 77<body>
82 <div class="feed-entry" id="feed-entry"> 78 <div class="feed-entry" data-montage-id="feed-entry">
83 79 <a target="_blank" data-montage-id="entry-url" class="entry-url"><h2 data-montage-id="entry-title" class="entry-title"></h2></a>
84 <a target="_blank" id="entry-url" class="entry-url"><h2 id="entry-title" class="entry-title"></h2></a> 80 <p data-montage-id="entry-description" class="entry-description"></p>
85 <p id="entry-description" class="entry-description"></p>
86 </div> 81 </div>
87 82
88</body> 83</body>
diff --git a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html
index 28c0ed1f..99a353b9 100644
--- a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html
+++ b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html
@@ -3,17 +3,16 @@
3<head> 3<head>
4 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 4 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
5 <title>Feed Reader</title> 5 <title>Feed Reader</title>
6 6
7 <script type="text/javascript" src="https://www.google.com/jsapi?callback=initGoogleAPI"></script> 7 <script type="text/javascript" src="https://www.google.com/jsapi?callback=initGoogleAPI"></script>
8 8
9 <script type="text/montage-serialization"> 9 <script type="text/montage-serialization">
10{ 10{
11 "entriesController": { 11 "entriesController": {
12 "name": "ArrayController", 12 "prototype": "montage/ui/controller/array-controller",
13 "module": "montage/ui/controller/array-controller",
14 "properties": { 13 "properties": {
15 "selectObjectsOnAddition": true, 14 "selectObjectsOnAddition": true,
16 "automaticallyOrganizeObjects": true 15 "automaticallyOrganizeObjects": true
17 }, 16 },
18 "bindings": { 17 "bindings": {
19 "content": { 18 "content": {
@@ -23,10 +22,9 @@
23 } 22 }
24 } 23 }
25 }, 24 },
26 25
27 "feedEntry": { 26 "feedEntry": {
28 "module": "montage-google/feed-reader/feed-entry.reel", 27 "prototype": "montage-google/feed-reader/feed-entry.reel",
29 "name": "FeedEntry",
30 "properties": { 28 "properties": {
31 "element": {"#": "feed-entry"} 29 "element": {"#": "feed-entry"}
32 }, 30 },
@@ -36,17 +34,16 @@
36 "boundObjectPropertyPath": "activeFeedEntry", 34 "boundObjectPropertyPath": "activeFeedEntry",
37 "oneway": true 35 "oneway": true
38 } 36 }
39 } 37 }
40 }, 38 },
41 39
42 "owner": { 40 "owner": {
43 "module": "montage-google/feed-reader/feed-reader.reel", 41 "prototype": "montage-google/feed-reader/feed-reader.reel",
44 "name": "FeedReader",
45 "properties": { 42 "properties": {
46 "element": {"#": "feed-reader"} 43 "element": {"#": "feed-reader"}
47 } 44 }
48 } 45 }
49 46