aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-02 18:00:45 -0800
committerJose Antonio Marquez2012-02-02 18:00:45 -0800
commit04d89daed90c35a4393773ca2e2d0ac3a4c15cd4 (patch)
treed0041abc7379ef38b20cce148e5dea6f531b8569
parent4d8306b638c53899403a4f0328c02bf1ab893e8f (diff)
parentc630ead20487c3948fa36448d3e7d5f7b5cba782 (diff)
downloadninja-04d89daed90c35a4393773ca2e2d0ac3a4c15cd4.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts: .gitignore js/ninja.reel/ninja.js
-rwxr-xr-x_scss/imports/scss/_Base.scss7
-rwxr-xr-x_scss/imports/scss/_PanelUI.scss2
-rwxr-xr-x_scss/imports/themes/default/_colors.scss2
-rwxr-xr-xcss/ninja.css8
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.js2
-rwxr-xr-xjs/components/tree.reel/tree.js2
-rwxr-xr-xjs/controllers/elements/canvas-controller.js14
-rwxr-xr-xjs/controllers/elements/element-controller.js61
-rwxr-xr-xjs/controllers/elements/shapes-controller.js28
-rwxr-xr-xjs/controllers/styles-controller.js2
-rwxr-xr-xjs/data/pi/pi-data.js48
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js28
-rwxr-xr-xjs/helper-classes/3D/math-utils.js54
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js11
-rwxr-xr-xjs/helper-classes/Properties3D.js82
-rwxr-xr-xjs/helper-classes/RDGE/GLBrushStroke.js1
-rwxr-xr-xjs/helper-classes/RDGE/GLSubpath.js1
-rwxr-xr-xjs/mediators/element-mediator.js5
-rwxr-xr-xjs/models/properties-3d.js6
-rwxr-xr-xjs/ninja.reel/ninja.js17
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js2
-rwxr-xr-xjs/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.js2
-rwxr-xr-xjs/panels/Color/colorchippopup.reel/colorchippopup.js2
-rwxr-xr-xjs/panels/Color/colorpopup-manager.js64
-rwxr-xr-xjs/panels/PanelContainer/PanelContainer.reel/PanelContainer.js4
-rwxr-xr-xjs/panels/Project/projectpanelbase.reel/ProjectPanelBase.js6
-rwxr-xr-xjs/panels/properties/content.reel/content.js7
-rwxr-xr-xjs/panels/properties/sections/three-d-view.reel/three-d-view.html12
-rwxr-xr-xjs/panels/properties/sections/three-d-view.reel/three-d-view.js86
-rwxr-xr-xjs/stage/layout.js67
-rwxr-xr-xjs/stage/stage.reel/stage.js63
-rwxr-xr-xjs/tools/PanTool.js33
-rwxr-xr-xjs/tools/SelectionTool.js1
-rwxr-xr-xjs/tools/ZoomTool.js39
-rwxr-xr-xjs/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
-rwxr-xr-xnode_modules/montage/core/url.js2
-rwxr-xr-xnode_modules/montage/core/uuid.js96
-rwxr-xr-xnode_modules/montage/effect/desaturate-effect.js25
-rwxr-xr-xnode_modules/montage/effect/effect.js15
-rwxr-xr-xnode_modules/montage/effect/invert-effect.js23
-rwxr-xr-xnode_modules/montage/effect/kaliedoscope-effect.js17
-rwxr-xr-xnode_modules/montage/effect/multiply-effect.js23
-rwxr-xr-xnode_modules/montage/effect/sepia-effect.js25
-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
-rwxr-xr-xnode_modules/montage/ui/bluemoon/progress.reel/progress.html (renamed from node_modules/montage/ui/image2.reel/image2.html)33
-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
-rwxr-xr-xnode_modules/montage/ui/flow-controller.reel/flow-controller.html275
-rwxr-xr-xnode_modules/montage/ui/flow-controller.reel/flow-controller.js288
-rwxr-xr-xnode_modules/montage/ui/flow-offset.js389
-rwxr-xr-xnode_modules/montage/ui/flow-path-cubic.js32
-rwxr-xr-xnode_modules/montage/ui/flow-path-lerp.js36
-rwxr-xr-xnode_modules/montage/ui/flow-path-linear.js26
-rwxr-xr-xnode_modules/montage/ui/flow-path-sigmoid.js42
-rwxr-xr-xnode_modules/montage/ui/flow-path.js46
-rwxr-xr-xnode_modules/montage/ui/flow.reel/flow.html4
-rwxr-xr-xnode_modules/montage/ui/flow.reel/flow.js658
-rwxr-xr-xnode_modules/montage/ui/hottext.reel/hottext.css27
-rwxr-xr-xnode_modules/montage/ui/hottext.reel/hottext.html29
-rwxr-xr-xnode_modules/montage/ui/hottext.reel/hottext.js376
-rwxr-xr-xnode_modules/montage/ui/hottextunit.reel/hottextunit.css41
-rwxr-xr-xnode_modules/montage/ui/hottextunit.reel/hottextunit.html28
-rwxr-xr-xnode_modules/montage/ui/hottextunit.reel/hottextunit.js185
-rwxr-xr-xnode_modules/montage/ui/image.reel/image.js65
-rwxr-xr-xnode_modules/montage/ui/image2.reel/image2.js26