aboutsummaryrefslogtreecommitdiff
path: root/node_modules
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-19 01:03:59 -0700
committerArmen Kesablyan2012-06-19 01:03:59 -0700
commit2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch)
treed352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /node_modules
parent244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff)
parentc59eb371559a3061ce53223e249ca97daace5968 (diff)
downloadninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz
Merge branch 'refs/heads/master' into binding
Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules')
-rw-r--r--node_modules/descriptor.json1
-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-channel.reel/youtube-channel.js22
-rw-r--r--node_modules/montage-google/youtube-player.reel/youtube-player.html2
-rwxr-xr-xnode_modules/montage/CHANGES.md347
-rw-r--r--node_modules/montage/core/change-notification.js82
-rwxr-xr-xnode_modules/montage/core/converter/bytes-converter.js3
-rwxr-xr-xnode_modules/montage/core/converter/converter.js3
-rwxr-xr-xnode_modules/montage/core/converter/currency-converter.js9
-rwxr-xr-xnode_modules/montage/core/converter/date-converter.js12
-rwxr-xr-xnode_modules/montage/core/converter/number-converter.js28
-rwxr-xr-xnode_modules/montage/core/converter/upper-case-converter.js2
-rwxr-xr-xnode_modules/montage/core/core.js32
-rwxr-xr-xnode_modules/montage/core/deserializer.js29
-rwxr-xr-xnode_modules/montage/core/event/action-event-listener.js6
-rwxr-xr-xnode_modules/montage/core/event/binding.js202
-rw-r--r--node_modules/montage/core/extras/object.js41
-rwxr-xr-xnode_modules/montage/montage.js20
-rwxr-xr-xnode_modules/montage/package.json2
-rw-r--r--node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.js15
-rw-r--r--node_modules/montage/ui/autocomplete/results-list.reel/results-list.html11
-rw-r--r--node_modules/montage/ui/bluemoon/button-group.reel/button-group.html2
-rw-r--r--node_modules/montage/ui/bluemoon/button.reel/button.html2
-rw-r--r--node_modules/montage/ui/bluemoon/progress.reel/progress.html1
-rw-r--r--node_modules/montage/ui/bluemoon/progress.reel/progress.js11
-rw-r--r--node_modules/montage/ui/bluemoon/slider.reel/slider.html2
-rw-r--r--node_modules/montage/ui/bluemoon/slider.reel/slider.js267
-rw-r--r--node_modules/montage/ui/button.reel/button.js2
-rwxr-xr-xnode_modules/montage/ui/component.js22
-rw-r--r--node_modules/montage/ui/composer/composer.js9
-rw-r--r--node_modules/montage/ui/composer/translate-composer.js99
-rwxr-xr-xnode_modules/montage/ui/condition.reel/condition.js13
-rw-r--r--node_modules/montage/ui/controller/array-controller.js247
-rwxr-xr-xnode_modules/montage/ui/controller/paged-array-controller.js260
-rwxr-xr-xnode_modules/montage/ui/dynamic-text.reel/dynamic-text.js6
-rwxr-xr-xnode_modules/montage/ui/editable-text.js3
-rw-r--r--node_modules/montage/ui/flow.reel/flow.html11
-rw-r--r--node_modules/montage/ui/flow.reel/flow.js44
-rwxr-xr-xnode_modules/montage/ui/list.reel/list.html6
-rwxr-xr-xnode_modules/montage/ui/list.reel/list.js24
-rwxr-xr-xnode_modules/montage/ui/loader.reel/loader.js5
-rwxr-xr-xnode_modules/montage/ui/loading-panel.reel/loading-panel.html11
-rwxr-xr-xnode_modules/montage/ui/loading.reel/loading.html2
-rwxr-xr-xnode_modules/montage/ui/loading.reel/loading.js3
-rw-r--r--node_modules/montage/ui/native-control.js50
-rwxr-xr-xnode_modules/montage/ui/popup/alert.reel/alert.html10
-rwxr-xr-xnode_modules/montage/ui/popup/confirm.reel/confirm.html8
-rwxr-xr-xnode_modules/montage/ui/popup/notifier.reel/notifier.html2
-rwxr-xr-xnode_modules/montage/ui/popup/notifier.reel/notifier.js6
-rwxr-xr-xnode_modules/montage/ui/popup/popup.reel/popup.html4
-rwxr-xr-xnode_modules/montage/ui/popup/popup.reel/popup.js41
-rwxr-xr-xnode_modules/montage/ui/repetition.reel/repetition.js188
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.html4
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html4
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.js2
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.css7
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html4
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js6
-rw-r--r--node_modules/montage/ui/scroll-bars.reel/scroll-bars.html1
-rw-r--r--node_modules/montage/ui/scroll-bars.reel/scroll-bars.js61
-rw-r--r--node_modules/montage/ui/scroller.reel/scroller.html12
-rw-r--r--node_modules/montage/ui/scroller.reel/scroller.js32
-rw-r--r--node_modules/montage/ui/select-input.reel/select-input.js27
-rw-r--r--node_modules/montage/ui/skeleton/range-input.reel/range-input.css6
-rw-r--r--node_modules/montage/ui/skeleton/range-input.reel/range-input.html6
-rw-r--r--node_modules/montage/ui/skeleton/range-input.reel/range-input.js173
-rwxr-xr-xnode_modules/montage/ui/slot.reel/slot.js13
-rwxr-xr-xnode_modules/montage/ui/substitution.reel/substitution.js10
-rwxr-xr-xnode_modules/montage/ui/tabs.reel/tabs.html6
-rwxr-xr-xnode_modules/montage/ui/tabs.reel/tabs.js21
-rwxr-xr-xnode_modules/montage/ui/template.js13
-rw-r--r--node_modules/montage/ui/text-input.js43
-rw-r--r--node_modules/montage/ui/toggle-button.reel/toggle-button.js50
-rw-r--r--node_modules/montage/ui/token-field/token-field.reel/token-field.html12
-rw-r--r--node_modules/montage/ui/token-field/token-field.reel/token-field.js24
-rw-r--r--node_modules/montage/ui/token-field/token.reel/token.html6
-rw-r--r--node_modules/montage/ui/token-field/token.reel/token.js65
-rwxr-xr-xnode_modules/montage/ui/video-player.reel/video-player.html44
82 files changed, 1535 insertions, 1363 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 @@