aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage-google
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-06-13 13:51:39 -0700
committerNivesh Rajbhandari2012-06-13 13:51:39 -0700
commit263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch)
tree7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /node_modules/montage-google
parent1bb2778224982aea7b9781c6559bb659983a400f (diff)
parenta827f2769d75848c0ba0bff03a927c1f2706322b (diff)
downloadninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts: js/panels/properties.reel/sections/position-size.reel/position-size.html Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'node_modules/montage-google')
-rw-r--r--node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html2
-rw-r--r--node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html4
-rw-r--r--node_modules/montage-google/map.reel/map.html2
-rwxr-xr-xnode_modules/montage-google/picasa-carousel.reel/picasa-carousel.html4
-rw-r--r--node_modules/montage-google/youtube-channel.reel/youtube-channel.html4
-rw-r--r--node_modules/montage-google/youtube-player.reel/youtube-player.html2
6 files changed, 9 insertions, 9 deletions
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 b8b9f39a..332b2932 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
@@ -45,7 +45,7 @@
45 } 45 }
46 }, 46 },
47 "owner": { 47 "owner": {
48 "prototype": "montage-google/feed-reader/feed-entry.reel", 48 "prototype": "feed-reader/feed-entry.reel",
49 "properties": { 49 "properties": {
50 "element": {"#": "feed-entry"} 50 "element": {"#": "feed-entry"}
51 } 51 }
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 99a353b9..4d6792a1 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
@@ -24,7 +24,7 @@
24 }, 24 },
25 25
26 "feedEntry": { 26 "feedEntry": {
27 "prototype": "montage-google/feed-reader/feed-entry.reel", 27 "prototype": "feed-reader/feed-entry.reel",
28 "properties": { 28 "properties": {
29 "element": {"#": "feed-entry"} 29 "element": {"#": "feed-entry"}
30 }, 30 },
@@ -38,7 +38,7 @@
38 }, 38 },
39 39
40 "owner": { 40 "owner": {
41 "prototype": "montage-google/feed-reader/feed-reader.reel", 41 "prototype": "feed-reader/feed-reader.reel",
42 "properties": { 42 "properties": {
43 "element": {"#": "feed-reader"} 43 "element": {"#": "feed-reader"}
44 } 44 }
diff --git a/node_modules/montage-google/map.reel/map.html b/node_modules/montage-google/map.reel/map.html
index fee3a38e..bd41f47e 100644
--- a/node_modules/montage-google/map.reel/map.html
+++ b/node_modules/montage-google/map.reel/map.html
@@ -15,7 +15,7 @@
15 { 15 {
16 16
17 "owner": { 17 "owner": {
18 "prototype": "montage-google/map.reel", 18 "prototype": "map.reel",
19 "properties": { 19 "properties": {
20 "element": {"#": "map-container"}, 20 "element": {"#": "map-container"},
21 "mapEl": {"#": "map"} 21 "mapEl": {"#": "map"}
diff --git a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
index f7c8a766..dc70a19c 100755
--- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
+++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
@@ -12,7 +12,7 @@
12 <script type="text/montage-serialization"> 12 <script type="text/montage-serialization">
13 { 13 {
14 "owner": { 14 "owner": {
15 "prototype": "montage-google/picasa-carousel.reel", 15 "prototype": "picasa-carousel.reel",
16 "properties": { 16 "properties": {
17 "element": {"#": "montage-google-picasa-carousel"}, 17 "element": {"#": "montage-google-picasa-carousel"},
18 "flow": {"@": "flow"} 18 "flow": {"@": "flow"}
@@ -29,7 +29,7 @@
29 } 29 }
30 }, 30 },
31 "image": { 31 "image": {
32 "prototype": "montage-google/picasa-carousel.reel/image.reel", 32 "prototype": "picasa-carousel.reel/image.reel",
33 "properties": { 33 "properties": {
34 "element": {"#": "image"} 34 "element": {"#": "image"}
35 }, 35 },
diff --git a/node_modules/montage-google/youtube-channel.reel/youtube-channel.html b/node_modules/montage-google/youtube-channel.reel/youtube-channel.html
index 99a8a698..112fda72 100644
--- a/node_modules/montage-google/youtube-channel.reel/youtube-channel.html
+++ b/node_modules/montage-google/youtube-channel.reel/youtube-channel.html
@@ -10,7 +10,7 @@
10 <script type="text/montage-serialization"> 10 <script type="text/montage-serialization">
11 { 11 {
12 "player": { 12 "player": {
13 "prototype": "montage-google/youtube-player.reel", 13 "prototype": "youtube-player.reel",
14 "properties": { 14 "properties": {
15 "element": {"#": "player"} 15 "element": {"#": "player"}
16 } 16 }
@@ -41,7 +41,7 @@
41 }, 41 },
42 42
43 "owner": { 43 "owner": {
44 "module": "montage-google/youtube-channel.reel", 44 "module": "youtube-channel.reel",
45 "name": "YoutubeChannel", 45 "name": "YoutubeChannel",
46 "properties": { 46 "properties": {
47 "element": {"#": "container"}, 47 "element": {"#": "container"},
diff --git a/node_modules/montage-google/youtube-player.reel/youtube-player.html b/node_modules/montage-google/youtube-player.reel/youtube-player.html
index d51cecdb..41e5922b 100644
--- a/node_modules/montage-google/youtube-player.reel/youtube-player.html
+++ b/node_modules/montage-google/youtube-player.reel/youtube-player.html
@@ -11,7 +11,7 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "owner": { 13 "owner": {
14 "prototype": "montage-google/youtube-player.reel", 14 "prototype": "youtube-player.reel",
15 "properties": { 15 "properties": {
16 "element": {"#": "iframe"} 16 "element": {"#": "iframe"}
17 } 17 }