diff options
| author | Jon Reid | 2012-06-15 10:10:41 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-15 10:10:41 -0700 |
| commit | 526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch) | |
| tree | 65939e59615aaa10a7db77211e71616ad531bd0e /node_modules | |
| parent | b5b760ee82e5cc4da176914983a6002cbf86c11a (diff) | |
| parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
| download | ninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz | |
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
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 | { | ||