aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnanya Sen2012-04-23 10:53:45 -0700
committerAnanya Sen2012-04-23 10:53:45 -0700
commit6e2d8c8b7e981de2a7ede45d707614307e811cad (patch)
tree94d5455c90439548c89d811a03d675e94cf5d27c
parent2fafe26f74f342388b97960e7a58e3f45d8d961f (diff)
parent5a0331fc26fcc2cdc6200086109e34440a2dec6a (diff)
downloadninja-6e2d8c8b7e981de2a7ede45d707614307e811cad.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
-rwxr-xr-xjs/components/colorwheel.reel/colorwheel.html10
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.html10
-rwxr-xr-xjs/components/tree.reel/tree.css26
-rwxr-xr-xjs/components/tree.reel/tree.html28
-rwxr-xr-xjs/components/tree.reel/tree.js789
-rwxr-xr-xjs/components/tree.reel/treeDisclosure.pngbin995 -> 0 bytes
-rwxr-xr-xjs/components/tree.reel/treeFolderClosed.pngbin1345 -> 0 bytes
-rwxr-xr-xjs/components/tree.reel/treeFolderOpen.pngbin1323 -> 0 bytes
-rwxr-xr-xjs/components/tree.reel/treeItem.pngbin2935 -> 0 bytes
-rwxr-xr-xjs/components/ui/modalDialog/modal-dialog-manager.js123
-rwxr-xr-xjs/components/ui/modalDialog/modalDialogHeader.js82
-rwxr-xr-xjs/components/ui/modalDialog/modalDialogHeader.reel/modalDialogHeader.css30
-rwxr-xr-xjs/components/ui/modalDialog/modalDialogHeader.reel/modalDialogHeader.html33
-rwxr-xr-xjs/components/ui/radio-button.reel/radio-button.html32
-rwxr-xr-xjs/components/ui/radio-button.reel/radio-button.js44
-rwxr-xr-xjs/components/ui/row-renderer.reel/row-renderer.html37
-rwxr-xr-xjs/components/ui/row-renderer.reel/row-renderer.js18
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js79
-rwxr-xr-xjs/helper-classes/3D/hit-record.js55
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js11
-rwxr-xr-xjs/helper-classes/3D/view-utils.js35
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.js3
-rwxr-xr-xjs/tools/Rotate3DToolBase.js386
-rwxr-xr-xjs/tools/RotateObject3DTool.js4
-rwxr-xr-xjs/tools/RotateStage3DTool.js7
-rwxr-xr-xjs/tools/Translate3DToolBase.js134
-rwxr-xr-xjs/tools/TranslateObject3DTool.js1
-rwxr-xr-xjs/tools/modifier-tool-base.js17
-rw-r--r--manifest.json6
-rw-r--r--node_modules/components-data/textarea.json2
-rwxr-xr-xnode_modules/montage/core/deserializer.js352
-rwxr-xr-xnode_modules/montage/core/event/action-event-listener.js4
-rwxr-xr-xnode_modules/montage/core/event/binding.js48
-rwxr-xr-xnode_modules/montage/core/event/event-manager.js14
-rwxr-xr-xnode_modules/montage/core/logger.js1
-rw-r--r--node_modules/montage/core/promise-connection.js285
-rw-r--r--node_modules/montage/core/promise-queue.js65
-rwxr-xr-xnode_modules/montage/core/promise.js48
-rwxr-xr-xnode_modules/montage/core/serializer.js328
-rw-r--r--node_modules/montage/core/undo-manager.js12
-rwxr-xr-xnode_modules/montage/lab/sandbox/ui/picasa-carousel-test/index.html77
-rwxr-xr-xnode_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.css7
-rwxr-xr-xnode_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.html75
-rwxr-xr-xnode_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.js35
-rwxr-xr-xnode_modules/montage/lab/sandbox/ui/picasa-carousel-test/package.json10
-rwxr-xr-xnode_modules/montage/montage.js45
-rwxr-xr-xnode_modules/montage/package.json2
-rwxr-xr-xnode_modules/montage/require/require.js213
-rwxr-xr-xnode_modules/montage/test/ui/youtube-player-spec.js363
-rw-r--r--node_modules/montage/test/ui/youtube-player-test/youtube-player-test.html47
-rwxr-xr-xnode_modules/montage/test/ui/youtube-player-test/youtube-player-test.js9
-rw-r--r--node_modules/montage/ui/bluemoon/slider.reel/slider.js14
-rw-r--r--node_modules/montage/ui/button.reel/button.js95
-rw-r--r--node_modules/montage/ui/check-input.js4
-rwxr-xr-xnode_modules/montage/ui/component.js23
-rw-r--r--node_modules/montage/ui/composer/long-press-composer.js232
-rw-r--r--node_modules/montage/ui/composer/press-composer.js126
-rw-r--r--node_modules/montage/ui/composer/translate-composer.js133
-rwxr-xr-xnode_modules/montage/ui/condition.reel/condition.js2
-rwxr-xr-xnode_modules/montage/ui/flow-bezier-spline.js405
-rw-r--r--node_modules/montage/ui/flow-path-cubic.js115
-rw-r--r--node_modules/montage/ui/flow-path-lerp.js112
-rw-r--r--node_modules/montage/ui/flow-path-linear.js83
-rw-r--r--node_modules/montage/ui/flow-path-sigmoid.js148
-rw-r--r--node_modules/montage/ui/flow-path.js215
-rw-r--r--node_modules/montage/ui/flow.reel/flow.html48
-rw-r--r--node_modules/montage/ui/flow.reel/flow.js1003
-rwxr-xr-xnode_modules/montage/ui/list.reel/list.html38
-rwxr-xr-xnode_modules/montage/ui/loading-panel.reel/loading-panel.html32
-rw-r--r--node_modules/montage/ui/native-control.js14
-rw-r--r--node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html3
-rwxr-xr-xnode_modules/montage/ui/picasa-carousel.reel/picasa-carousel.css15
-rwxr-xr-xnode_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html242
-rw-r--r--node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js210
-rwxr-xr-xnode_modules/montage/ui/popup/alert.reel/alert.html32
-rwxr-xr-xnode_modules/montage/ui/popup/confirm.reel/confirm.html32
-rwxr-xr-xnode_modules/montage/ui/popup/notifier.reel/notifier.js4
-rwxr-xr-xnode_modules/montage/ui/popup/popup.reel/popup.js135
-rw-r--r--node_modules/montage/ui/range-input.reel/range-input.js6
-rwxr-xr-xnode_modules/montage/ui/repetition.reel/repetition.js18
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.css31
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.html37
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.js274
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.css141
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html45
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js568
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.js1706
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.css30
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html41
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js614
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-sanitizer.js132
-rw-r--r--node_modules/montage/ui/scroller.reel/scroller.html56
-rw-r--r--node_modules/montage/ui/scroller.reel/scroller.js49
-rw-r--r--node_modules/montage/ui/select-input.reel/select-input.js7
-rw-r--r--node_modules/montage/ui/skeleton/range-input.reel/range-input.html19
-rwxr-xr-xnode_modules/montage/ui/tabs.reel/tabs.html20
-rwxr-xr-xnode_modules/montage/ui/template.js313
-rw-r--r--node_modules/montage/ui/text-input.js24
-rw-r--r--node_modules/montage/ui/textarea.reel/textarea.js4
-rwxr-xr-xnode_modules/montage/ui/video-player.reel/video-player.html24
-rw-r--r--node_modules/montage/ui/youtube-channel.reel/youtube-channel.html1
101 files changed, 7590 insertions, 4127 deletions
diff --git a/js/components/colorwheel.reel/colorwheel.html b/js/components/colorwheel.reel/colorwheel.html
index 0374e6a3..a9fbfbd9 100755
--- a/js/components/colorwheel.reel/colorwheel.html
+++ b/js/components/colorwheel.reel/colorwheel.html
@@ -12,15 +12,7 @@
12 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 12 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
13 13
14 <link rel="stylesheet" type="text/css" href="css/colorwheel.css"> 14 <link rel="stylesheet" type="text/css" href="css/colorwheel.css">
15 15
16 <script type="text/m-objects">
17 {
18 "$rootObject": U("m-obj://colorwheel/uuid?mId=js/components/colorwheel", {
19 "element": E("#colorwheel")
20 })
21 }
22 </script>
23
24 <script type="text/montage-serialization"> 16 <script type="text/montage-serialization">
25 { 17 {
26 "owner": { 18 "owner": {
diff --git a/js/components/gradientpicker.reel/gradientpicker.html b/js/components/gradientpicker.reel/gradientpicker.html
index 361e36b2..f71c6705 100755
--- a/js/components/gradientpicker.reel/gradientpicker.html
+++ b/js/components/gradientpicker.reel/gradientpicker.html
@@ -12,15 +12,7 @@
12 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 12 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
13 13
14 <link rel="stylesheet" type="text/css" href="css/gradientpicker.css"> 14 <link rel="stylesheet" type="text/css" href="css/gradientpicker.css">
15 15
16 <script type="text/m-objects">
17 {
18 "$rootObject": U("m-obj://gradientpicker/uuid?mId=js/components/gradientpicker", {
19 "element": E("#gradientpicker")
20 })
21 }
22 </script>
23
24 <script type="text/montage-serialization"> 16 <script type="text/montage-serialization">
25 { 17 {
26 "owner": { 18 "owner": {