diff options
author | Jonathan Duran | 2012-05-31 08:54:48 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-31 08:54:48 -0700 |
commit | f297093b5bfa62c9832829751a12f0e556bb5cc0 (patch) | |
tree | 6e04cdf142cb1b36e2197970c9dc2141017a2be7 /node_modules | |
parent | 9253e2ce98d748edd8c3929f113a597923960387 (diff) | |
parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
download | ninja-f297093b5bfa62c9832829751a12f0e556bb5cc0.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/properties.reel/properties.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'node_modules')
69 files changed, 7653 insertions, 3724 deletions
diff --git a/node_modules/descriptor.json b/node_modules/descriptor.json index a2e96aa3..5617234f 100644 --- a/node_modules/descriptor.json +++ b/node_modules/descriptor.json | |||
@@ -7,7 +7,7 @@ | |||
7 | "children": [ | 7 | "children": [ |
8 | {"name": "bin"}, | 8 | {"name": "bin"}, |
9 | {"name": "core", | 9 | {"name": "core", |
10 | "children": [{"name": "converter"}, {"name": "event"}, {"name": "geometry"}, {"name": "shim"}] | 10 | "children": [{"name": "converter"}, {"name": "event"}, {"name": "extras"},{"name": "geometry"}, {"name": "selector"},{"name": "shim"}] |
11 | }, | 11 | }, |
12 | {"name": "data", | 12 | {"name": "data", |
13 | "children": [{"name": "ldapaccess"}, {"name": "nosqlaccess"}, {"name": "restaccess"}, {"name": "sqlaccess"}] | 13 | "children": [{"name": "ldapaccess"}, {"name": "nosqlaccess"}, {"name": "restaccess"}, {"name": "sqlaccess"}] |
@@ -18,13 +18,12 @@ | |||
18 | "children": [ | 18 | "children": [ |
19 | {"name": "anchor.reel"}, | 19 | {"name": "anchor.reel"}, |
20 | {"name": "autocomplete", | 20 | {"name": "autocomplete", |
21 | "children": [{"name": "autocomplete.reel"}, {"name": "results-list.reel"}]}, | 21 | "children": [{"name": "autocomplete.reel"}, {"name": "result-item.reel"}, {"name": "results-list.reel"}]}, |
22 | {"name": "bluemoon", | 22 | {"name": "bluemoon", |
23 | "children": [{"name": "button-group.reel"}, {"name": "button.reel"}, {"name": "checkbox.reel"}, {"name": "progress.reel"}, {"name": "slider.reel"}, {"name": "textarea.reel"}, {"name": "textfield.reel"}, {"name": "toggle.reel"}]}, | 23 | "children": [{"name": "button-group.reel"}, {"name": "button.reel"}, {"name": "checkbox.reel"}, {"name": "progress.reel"}, {"name": "slider.reel"}, {"name": "textarea.reel"}, {"name": "textfield.reel"}, {"name": "toggle.reel"}]}, |
24 | {"name": "button.reel"}, | 24 | {"name": "button.reel"}, |
25 | {"name": "checkbox.reel"}, | 25 | {"name": "checkbox.reel"}, |
26 | {"name": "component-group.reel"}, | 26 | {"name": "component-group.reel"}, |
27 | {"name": "component-placeholder.reel"}, | ||
28 | {"name": "composer"}, | 27 | {"name": "composer"}, |
29 | {"name": "condition.reel"}, | 28 | {"name": "condition.reel"}, |
30 | {"name": "controller"}, | 29 | {"name": "controller"}, |
@@ -56,6 +55,8 @@ | |||
56 | {"name": "textfield.reel"}, | 55 | {"name": "textfield.reel"}, |
57 | {"name": "toggle-button.reel"}, | 56 | {"name": "toggle-button.reel"}, |
58 | {"name": "toggle-switch.reel"}, | 57 | {"name": "toggle-switch.reel"}, |
58 | {"name": "token-field", | ||
59 | "children": [{"name": "token-field.reel"}, {"name": "token.reel"}]}, | ||
59 | {"name": "video-player.reel", | 60 | {"name": "video-player.reel", |
60 | "children": [{"name": "images"}]} | 61 | "children": [{"name": "images"}]} |
61 | ] | 62 | ] |
@@ -83,7 +84,8 @@ | |||
83 | ], | 84 | ], |
84 | "files": [ | 85 | "files": [ |
85 | "montage/core/bitfield.js", | 86 | "montage/core/bitfield.js", |
86 | "montage/core/converter/bytes-converter.js", | 87 | "montage/core/change-notification.js", |
88 | "montage/core/converter/bytes-converter.js", | ||
87 | "montage/core/converter/converter.js", | 89 | "montage/core/converter/converter.js", |
88 | "montage/core/converter/currency-converter.js", | 90 | "montage/core/converter/currency-converter.js", |
89 | "montage/core/converter/date-converter.js", | 91 | "montage/core/converter/date-converter.js", |
@@ -98,7 +100,11 @@ | |||
98 | "montage/core/event/action-event-listener.js", | 100 | "montage/core/event/action-event-listener.js", |
99 | "montage/core/event/binding.js", | 101 | "montage/core/event/binding.js", |
100 | "montage/core/event/event-manager.js", | 102 | "montage/core/event/event-manager.js", |
103 | "montage/core/event/key-manager.js", | ||
101 | "montage/core/event/mutable-event.js", | 104 | "montage/core/event/mutable-event.js", |
105 | "montage/core/extras/array.js", | ||
106 | "montage/core/extras/object.js", | ||
107 | "montage/core/extras/string.js", | ||
102 | "montage/core/exception.js", | 108 | "montage/core/exception.js", |
103 | "montage/core/gate.js", | 109 | "montage/core/gate.js", |
104 | "montage/core/geometry/cubic-bezier.js", | 110 | "montage/core/geometry/cubic-bezier.js", |
@@ -106,14 +112,22 @@ | |||
106 | "montage/core/jshint.js", | 112 | "montage/core/jshint.js", |
107 | "montage/core/logger.js", | 113 | "montage/core/logger.js", |
108 | "montage/core/next-tick.js", | 114 | "montage/core/next-tick.js", |
115 | "montage/core/promise-connection.js", | ||
116 | "montage/core/promise-queue.js", | ||
109 | "montage/core/promise.js", | 117 | "montage/core/promise.js", |
118 | "montage/core/selector/abstract-language.js", | ||
119 | "montage/core/selector/abstract-selector.js", | ||
120 | "montage/core/selector/abstract-semantics.js", | ||
121 | "montage/core/selector/language.js", | ||
122 | "montage/core/selector/parser.js", | ||
123 | "montage/core/selector/property-language.js", | ||
124 | "montage/core/selector/semantics.js", | ||
125 | "montage/core/selector.js", | ||
110 | "montage/core/serializer.js", | 126 | "montage/core/serializer.js", |
111 | "montage/core/shim/array.js", | 127 | "montage/core/shim/array.js", |
112 | "montage/core/shim/immediate.js", | 128 | "montage/core/shim/object.js", |
113 | "montage/core/shim/string.js", | ||
114 | "montage/core/shim/structures.js", | 129 | "montage/core/shim/structures.js", |
115 | "montage/core/shim/weak-map.js", | 130 | "montage/core/shim/weak-map.js", |
116 | "montage/core/shim.js", | ||
117 | "montage/core/state-chart.js", | 131 | "montage/core/state-chart.js", |
118 | "montage/core/undo-manager.js", | 132 | "montage/core/undo-manager.js", |
119 | "montage/core/url.js", |