aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPushkar Joshi2012-04-27 15:05:38 -0700
committerPushkar Joshi2012-04-27 15:05:38 -0700
commitc8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc (patch)
tree74fcb9818a917d4f8ddb0db0c78a8cff9af86339
parent28d1594b868e3c08e5603adbd5b29df1e24d57e9 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc.tar.gz
Merge branch 'master' into pentool
-rw-r--r--.gitignore1
-rw-r--r--assets/canvas-runtime.js40
-rw-r--r--images/transparent.pngbin0 -> 158 bytes
-rwxr-xr-xindex.html3
-rw-r--r--js/components/about-box.reel/about-box.html5
-rwxr-xr-xjs/components/checkbox.reel/checkbox.html3
-rwxr-xr-xjs/components/colorbar.reel/colorbar.html5
-rwxr-xr-xjs/components/colorwheel.reel/colorwheel.html5
-rwxr-xr-xjs/components/combobox.reel/combobox.html3
-rw-r--r--js/components/editable.reel/editable.js18
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.html5
-rw-r--r--js/components/hintable.reel/hintable.js20
-rwxr-xr-xjs/components/hottext.reel/hottext.html5
-rwxr-xr-xjs/components/hottextunit.reel/hottextunit.html5
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html11
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.js3
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html8
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.js1
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.html5
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.html11
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.html5
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.html5
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.html5
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html77
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html56
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.html14
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.html14
-rwxr-xr-xjs/components/menu/menu.reel/menu.html17
-rwxr-xr-xjs/components/popup-manager.reel/popup-manager.html5
-rwxr-xr-xjs/components/popup-manager.reel/popup-manager.js4
-rwxr-xr-xjs/components/popup.reel/popup.html5
-rwxr-xr-xjs/components/radio.reel/radio.html3
-rwxr-xr-xjs/components/slider.reel/slider.html5
-rwxr-xr-xjs/components/textfield.reel/textfield.html3
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html17
-rwxr-xr-xjs/components/tools-properties/eraser-properties.reel/eraser-properties.html5
-rwxr-xr-xjs/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html5
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html8
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css24
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html151
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js49
-rwxr-xr-xjs/components/tools-properties/line-properties.reel/line-properties.html5
-rwxr-xr-xjs/components/tools-properties/object3d-properties.reel/object3d-properties.html5
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.html8
-rwxr-xr-xjs/components/tools-properties/pan-properties.reel/pan-properties.html5
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html8
-rwxr-xr-xjs/components/tools-properties/pencil-properties.reel/pencil-properties.html5
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html17
-rwxr-xr-xjs/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html5
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.html3
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html27
-rwxr-xr-xjs/components/tools-properties/subselection-properties.reel/subselection-properties.html5
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.html3
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html56
-rwxr-xr-xjs/components/tools-properties/zoom-properties.reel/zoom-properties.html5
-rw-r--r--js/components/treeview/branch.reel/branch.html23
-rw-r--r--js/components/treeview/leaf.reel/leaf.html8
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.html23
-rw-r--r--js/components/treeview/ninja-leaf.reel/ninja-leaf.html8
-rw-r--r--js/components/treeview/treeview.reel/treeview.html17
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.html5
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.html5
-rwxr-xr-xjs/components/ui/icon-list-basic/icon.reel/icon.html5
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.html11
-rwxr-xr-xjs/components/ui/input-group.reel/input-group.html14
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.html8
-rwxr-xr-xjs/components/ui/tree-basic/tree.reel/tree.html11
-rwxr-xr-xjs/components/ui/tree-basic/treeItem.reel/treeItem.html5
-rwxr-xr-xjs/controllers/elements/body-controller.js44
-rwxr-xr-xjs/controllers/elements/controller-factory.js5
-rwxr-xr-xjs/controllers/elements/element-controller.js16
-rwxr-xr-xjs/controllers/elements/shapes-controller.js20
-rwxr-xr-xjs/controllers/elements/stage-controller.js2
-rwxr-xr-xjs/data/pi/pi-data.js14
-rwxr-xr-xjs/document/document-html.js46
-rwxr-xr-xjs/document/html-document.js10
-rwxr-xr-xjs/document/models/base.js8
-rwxr-xr-xjs/document/templates/montage-html/index.html3
-rwxr-xr-xjs/document/templates/montage-web/default_html.css2
-rwxr-xr-xjs/document/templates/montage-web/index.html5
-rw-r--r--js/io/system/ninjalibrary.json2
-rwxr-xr-xjs/io/ui/cloudpopup.reel/cloudpopup.html5
-rwxr-xr-xjs/io/ui/file-picker/file-input-field.reel/file-input-field.html5
-rwxr-xr-xjs/io/ui/file-picker/picker-navigator.reel/picker-navigator.html5
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html14
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html8
-rw-r--r--js/io/ui/save-as-dialog.reel/save-as-dialog.html8
-rwxr-xr-xjs/lib/NJUtils.js14
-rwxr-xr-xjs/lib/geom/circle.js4
-rwxr-xr-xjs/lib/geom/rectangle.js20
-rwxr-xr-xjs/mediators/drag-drop-mediator.js14
-rwxr-xr-xjs/mediators/keyboard-mediator.js2
-rwxr-xr-xjs/models/element-model.js35
-rwxr-xr-xjs/models/properties-3d.js3
-rwxr-xr-xjs/ninja.reel/ninja.html116
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html11
-rwxr-xr-xjs/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html5
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.html17
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html18
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js21
-rwxr-xr-xjs/panels/Panel.reel/Panel.html24
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.html24
-rwxr-xr-xjs/panels/Project/projectpanelbase.reel/projectpanelbase.html5
-rw-r--r--js/panels/Timeline/DragDrop.js136
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.html5
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html116
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js338
-rw-r--r--js/panels/Timeline/Layer.reel/css/Layer.css99
-rw-r--r--js/panels/Timeline/Layer.reel/scss/Layer.scss50
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html5
-rw-r--r--js/panels/Timeline/Span.reel/Span.html5
-rw-r--r--js/panels/Timeline/Style.reel/Style.html14
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html83
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js1590
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css424
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/icon-checkmark.pngbin0 -> 1083 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/icon-gear.pngbin0 -> 1397 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss373
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/scss/config.rb10
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html40
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js236
-rw-r--r--js/panels/Timeline/Track.reel/Track.html11
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html5
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.html11
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js78
-rwxr-xr-xjs/panels/color/colorchippopup.reel/colorchippopup.html5
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.html5