aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-03 12:20:10 -0800
committerValerio Virgillito2012-02-03 12:20:10 -0800
commite6e539f345f5e1ac36a595db5d1a1c3700715e88 (patch)
tree39846bf1570f9b5a4057b726c54905de9e9e1c02
parent7950424cf704bb221971f4645406b01e6979db18 (diff)
parentc630ead20487c3948fa36448d3e7d5f7b5cba782 (diff)
downloadninja-e6e539f345f5e1ac36a595db5d1a1c3700715e88.tar.gz
Merge branch 'master' into components
Conflicts: node_modules/montage/ui/bluemoon/progress.reel/progress.html node_modules/montage/ui/image2.reel/image2.html node_modules/ninja-components/effect/desaturate-effect.js node_modules/ninja-components/effect/effect.js node_modules/ninja-components/effect/invert-effect.js node_modules/ninja-components/effect/kaliedoscope-effect.js node_modules/ninja-components/effect/multiply-effect.js node_modules/ninja-components/effect/sepia-effect.js node_modules/ninja-components/flow-controller.reel/flow-controller.html node_modules/ninja-components/flow-controller.reel/flow-controller.js node_modules/ninja-components/flow-offset.js node_modules/ninja-components/hottext.reel/hottext.css node_modules/ninja-components/hottext.reel/hottext.html node_modules/ninja-components/hottext.reel/hottext.js node_modules/ninja-components/hottextunit.reel/hottextunit.css node_modules/ninja-components/hottextunit.reel/hottextunit.html node_modules/ninja-components/hottextunit.reel/hottextunit.js node_modules/ninja-components/image2.reel/image2.html node_modules/ninja-components/image2.reel/image2.js node_modules/ninja-components/image3d.reel/image3d.html node_modules/ninja-components/image3d.reel/image3d.js node_modules/ninja-components/photo-editor.reel/photo-editor.css node_modules/ninja-components/photo-editor.reel/photo-editor.html node_modules/ninja-components/photo-editor.reel/photo-editor.js node_modules/ninja-components/slider-base.js user-document-templates/montage-application-cloud/appdelegate.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat
-rw-r--r--.gitignore3
-rw-r--r--_scss/compass_app_log.txt108
-rw-r--r--_scss/imports/scss/_Base.scss21
-rw-r--r--_scss/imports/scss/_PanelUI.scss2
-rw-r--r--_scss/imports/themes/default/_colors.scss2
-rw-r--r--css/ninja.css10
-rw-r--r--js/components/layout/bread-crumb.reel/bread-crumb.css1
-rw-r--r--js/components/tools-properties/rect-properties.reel/rect-properties.js2
-rw-r--r--js/components/tree.reel/tree.js2
-rw-r--r--js/controllers/elements/canvas-controller.js14
-rw-r--r--js/controllers/elements/element-controller.js61
-rw-r--r--js/controllers/elements/shapes-controller.js28
-rw-r--r--js/controllers/styles-controller.js2
-rw-r--r--js/data/pi/pi-data.js48
-rw-r--r--js/helper-classes/3D/draw-utils.js28
-rw-r--r--js/helper-classes/3D/math-utils.js54
-rw-r--r--js/helper-classes/3D/snap-manager.js11
-rw-r--r--js/helper-classes/Properties3D.js82
-rw-r--r--js/helper-classes/RDGE/GLBrushStroke.js1
-rw-r--r--js/helper-classes/RDGE/GLSubpath.js1
-rw-r--r--js/mediators/element-mediator.js5
-rw-r--r--js/models/properties-3d.js6
-rw-r--r--js/ninja.reel/ninja.js15
-rw-r--r--js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js2
-rw-r--r--js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.js2
-rw-r--r--js/panels/Color/colorchippopup.reel/colorchippopup.js2
-rw-r--r--js/panels/Color/colorpopup-manager.js64
-rw-r--r--js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js4
-rw-r--r--js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js6
-rw-r--r--js/panels/properties/content.reel/content.js7
-rw-r--r--js/panels/properties/sections/three-d-view.reel/three-d-view.html12
-rw-r--r--js/panels/properties/sections/three-d-view.reel/three-d-view.js86
-rw-r--r--js/stage/layout.js67
-rw-r--r--js/stage/stage.reel/stage.js63
-rw-r--r--js/tools/PanTool.js33
-rw-r--r--js/tools/SelectionTool.js1
-rw-r--r--js/tools/ZoomTool.js39
-rw-r--r--js/tools/drawing-tool-base.js1
-rwxr-xr-xnode_modules/montage/core/converter/date-converter.js9
-rwxr-xr-xnode_modules/montage/core/core.js26
-rwxr-xr-xnode_modules/montage/core/deserializer.js104
-rwxr-xr-xnode_modules/montage/core/event/binding.js93
-rwxr-xr-xnode_modules/montage/core/event/event-manager.js15
-rwxr-xr-xnode_modules/montage/core/event/mutable-event.js5
-rwxr-xr-xnode_modules/montage/core/jshint.js2
-rwxr-xr-xnode_modules/montage/core/logger.js14
-rw-r--r--node_modules/montage/core/next-tick.js91
-rwxr-xr-xnode_modules/montage/core/promise.js115
-rwxr-xr-xnode_modules/montage/core/serializer.js21
-rwxr-xr-xnode_modules/montage/core/shim.js2
-rw-r--r--[-rwxr-xr-x]node_modules/montage/core/shim/immediate.js (renamed from node_modules/montage/core/shim/timers.js)44
-rwxr-xr-xnode_modules/montage/core/shim/structures.js22
-rw-r--r--node_modules/montage/core/url.js2
-rwxr-xr-xnode_modules/montage/core/uuid.js96
-rwxr-xr-xnode_modules/montage/montage.js213
-rw-r--r--node_modules/montage/node.js79
-rwxr-xr-xnode_modules/montage/package.json13
-rwxr-xr-xnode_modules/montage/require/browser.js183
-rw-r--r--node_modules/montage/require/node.js101
-rwxr-xr-xnode_modules/montage/require/require.js997
-rw-r--r--node_modules/montage/ui/anchor.reel/anchor.js26
-rwxr-xr-xnode_modules/montage/ui/application.js128
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/bluemoon/button-group.reel/button-group.css (renamed from node_modules/montage/ui/button-group.reel/button-group.css)0
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/bluemoon/button-group.reel/button-group.html (renamed from node_modules/montage/ui/button-group.reel/button-group.html)2
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/bluemoon/button-group.reel/button-group.js (renamed from node_modules/montage/ui/button-group.reel/button-group.js)6
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/bluemoon/button.reel/button.css (renamed from node_modules/montage/ui/button.reel/button.css)0
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/bluemoon/button.reel/button.html (renamed from node_modules/montage/ui/button.reel/button.html)2
-rw-r--r--node_modules/montage/ui/bluemoon/button.reel/button.js743
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.css (renamed from node_modules/montage/ui/checkbox.reel/checkbox.css)2
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.html (renamed from node_modules/montage/ui/checkbox.reel/checkbox.html)0
-rw-r--r--node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.js452
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/bluemoon/checkbox.reel/checkmark-dark-disabled.svg (renamed from node_modules/montage/ui/checkbox.reel/checkmark-dark-disabled.svg)0
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/bluemoon/checkbox.reel/checkmark-dark.svg (renamed from node_modules/montage/ui/checkbox.reel/checkmark-dark.svg)0
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/bluemoon/checkbox.reel/checkmark-light-disabled.svg (renamed from node_modules/montage/ui/checkbox.reel/checkmark-light-disabled.svg)0
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/bluemoon/checkbox.reel/checkmark.svg (renamed from node_modules/montage/ui/checkbox.reel/checkmark.svg)0
-rw-r--r--node_modules/montage/ui/bluemoon/progress.reel/progress.css51
-rw-r--r--node_modules/montage/ui/bluemoon/progress.reel/progress.html32
-rw-r--r--node_modules/montage/ui/bluemoon/progress.reel/progress.js139
-rw-r--r--node_modules/montage/ui/bluemoon/progress.reel/rule.pngbin0 -> 956 bytes
-rw-r--r--node_modules/montage/ui/bluemoon/progress.reel/scroll.pngbin0 -> 272 bytes
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/bluemoon/slider.reel/slider.css (renamed from node_modules/montage/ui/slider.reel/slider.css)4
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/bluemoon/slider.reel/slider.html (renamed from node_modules/montage/ui/slider.reel/slider.html)2
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/bluemoon/slider.reel/slider.js (renamed from node_modules/montage/ui/slider.reel/slider.js)8
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/bluemoon/textarea.reel/textarea.css (renamed from node_modules/montage/ui/textarea.reel/textarea.css)0
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/bluemoon/textarea.reel/textarea.html (renamed from node_modules/montage/ui/textarea.reel/textarea.html)0
-rw-r--r--node_modules/montage/ui/bluemoon/textarea.reel/textarea.js29
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/bluemoon/textfield.reel/textfield.css (renamed from node_modules/montage/ui/textfield.reel/textfield.css)0
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/bluemoon/textfield.reel/textfield.html (renamed from node_modules/montage/ui/textfield.reel/textfield.html)4
-rw-r--r--node_modules/montage/ui/bluemoon/textfield.reel/textfield.js56
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/bluemoon/toggle.reel/toggle.css (renamed from node_modules/montage/ui/toggle.reel/toggle.css)0
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/bluemoon/toggle.reel/toggle.html (renamed from node_modules/montage/ui/toggle.reel/toggle.html)4
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/bluemoon/toggle.reel/toggle.js (renamed from node_modules/montage/ui/toggle.reel/toggle.js)6
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/button.reel/button.js655
-rw-r--r--node_modules/montage/ui/check-input.js46
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/checkbox.reel/checkbox.js464
-rwxr-xr-xnode_modules/montage/ui/component.js292
-rw-r--r--node_modules/montage/ui/composer/composer.js142
-rw-r--r--node_modules/montage/ui/composer/long-press-composer.js232
-rw-r--r--node_modules/montage/ui/composer/swipe-composer.js303
-rw-r--r--node_modules/montage/ui/composer/translate-composer.js775
-rwxr-xr-xnode_modules/montage/ui/controller/array-controller.js73
-rw-r--r--node_modules/montage/ui/date-input.reel/date-input.js31
-rwxr-xr-xnode_modules/montage/ui/dom.js30
-rw-r--r--node_modules/montage/ui/flow-path-cubic.js32
-rw-r--r--node_modules/montage/ui/flow-path-lerp.js36
-rw-r--r--node_modules/montage/ui/flow-path-linear.js26
-rw-r--r--node_modules/montage/ui/flow-path-sigmoid.js42
-rw-r--r--node_modules/montage/ui/flow-path.js46
-rw-r--r--node_modules/montage/ui/flow.reel/flow.html4
-rw-r--r--node_modules/montage/ui/flow.reel/flow.js658
-rwxr-xr-x[-rw-r--r--]node_modules/montage/ui/image.reel/image.js65
-rwxr-xr-xnode_modules/montage/ui/list.reel/list.html34
-rwxr-xr-xnode_modules/montage/ui/list.reel/list.js192
-rwxr-xr-xnode_modules/montage/ui/loader.reel/loader.js7
-rwxr-xr-xnode_modules/montage/ui/loading-panel.reel/loading-panel.html2
-rw-r--r--node_modules/montage/ui/native-control.js240
-rw-r--r--node_modules/montage/ui/nearest-neighbor-component-search.js458
-rw-r--r--node_modules/montage/ui/number-input.reel/number-input.js17
-rwxr-xr-xnode_modules/montage/ui/popup/alert.reel/alert.css8
-rwxr-xr-xnode_modules/montage/ui/popup/alert.reel/alert.html14
-rwxr-xr-xnode_modules/montage/ui/popup/confirm.reel/confirm.css2