diff options
author | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
commit | 263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch) | |
tree | 7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /node_modules | |
parent | 1bb2778224982aea7b9781c6559bb659983a400f (diff) | |
parent | a827f2769d75848c0ba0bff03a927c1f2706322b (diff) | |
download | ninja-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')
81 files changed, 1520 insertions, 1356 deletions
diff --git a/node_modules/descriptor.json b/node_modules/descriptor.json index 5617234f..6d29cb58 100644 --- a/node_modules/descriptor.json +++ b/node_modules/descriptor.json | |||
@@ -220,7 +220,6 @@ | |||
220 | "montage/ui/controller/array-controller.js", | 220 | "montage/ui/controller/array-controller.js", |
221 | "montage/ui/controller/media-controller.js", | 221 | "montage/ui/controller/media-controller.js", |
222 | "montage/ui/controller/object-controller.js", | 222 | "montage/ui/controller/object-controller.js", |
223 | "montage/ui/controller/paged-array-controller.js", | ||
224 | "montage/ui/date-input.reel/date-input.js", | 223 | "montage/ui/date-input.reel/date-input.js", |
225 | "montage/ui/dom.js", | 224 | "montage/ui/dom.js", |
226 | "montage/ui/dynamic-text.reel/dynamic-text.js", | 225 | "montage/ui/dynamic-text.reel/dynamic-text.js", |
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" |