aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-17 14:01:38 -0700
committerArmen Kesablyan2012-05-17 14:01:38 -0700
commit6c8f3525b839e82cf43df43700a0160ee2c5458f (patch)
tree3fb801fa54b759c5568d75bb467e02652ce77c3e
parente8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff)
parent342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff)
downloadninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com>
-rwxr-xr-ximages/optionsbar/link.pngbin1295 -> 1248 bytes
-rw-r--r--images/optionsbar/options3D/rotate-globally.pngbin0 -> 753 bytes
-rw-r--r--images/optionsbar/options3D/rotate-locally.pngbin0 -> 626 bytes
-rw-r--r--images/optionsbar/pen/penMinus.pngbin0 -> 392 bytes
-rw-r--r--images/optionsbar/pen/penPlus.pngbin0 -> 403 bytes
-rwxr-xr-ximages/optionsbar/rectangle/cornerRadius.pngbin2955 -> 1187 bytes
-rwxr-xr-ximages/optionsbar/selection/AlignBottom.pngbin2852 -> 2887 bytes
-rw-r--r--[-rwxr-xr-x]images/optionsbar/selection/AlignCenter.png (renamed from images/optionsbar/selection/alignHcenter.png)bin2859 -> 2859 bytes
-rw-r--r--[-rwxr-xr-x]images/optionsbar/selection/AlignMiddle.png (renamed from images/optionsbar/selection/alignVcenter.png)bin2864 -> 2864 bytes
-rw-r--r--[-rwxr-xr-x]images/optionsbar/selection/ArrangeBringForward.png (renamed from images/tools/pencil_up.png)bin3101 -> 2877 bytes
-rw-r--r--images/optionsbar/selection/ArrangeBringToFront.pngbin0 -> 2877 bytes
-rw-r--r--images/optionsbar/selection/ArrangeSendBackward.pngbin0 -> 2873 bytes
-rw-r--r--images/optionsbar/selection/ArrangeSendToBack.pngbin0 -> 2877 bytes
-rw-r--r--images/optionsbar/selection/DistBottom.pngbin0 -> 2888 bytes
-rw-r--r--[-rwxr-xr-x]images/optionsbar/selection/DistMiddle.png (renamed from images/optionsbar/selection/distVcenter.png)bin2868 -> 2868 bytes
-rw-r--r--images/optionsbar/tag/canvas-tag.pngbin0 -> 1529 bytes
-rw-r--r--images/optionsbar/tag/custom-tag.pngbin0 -> 738 bytes
-rw-r--r--images/optionsbar/tag/div-tag.pngbin0 -> 637 bytes
-rw-r--r--images/optionsbar/tag/img-tag.pngbin0 -> 715 bytes
-rw-r--r--images/optionsbar/tag/vid-tag.pngbin0 -> 389 bytes
-rw-r--r--images/optionsbar/text/AlignCenter.pngbin0 -> 1045 bytes
-rw-r--r--images/optionsbar/text/AlignJustified.pngbin0 -> 1053 bytes
-rw-r--r--images/optionsbar/text/AlignLeft.pngbin0 -> 1032 bytes
-rw-r--r--images/optionsbar/text/AlignRight.pngbin0 -> 1033 bytes
-rw-r--r--images/optionsbar/text/BulletedList.pngbin0 -> 1060 bytes
-rw-r--r--images/optionsbar/text/NumberedList.pngbin0 -> 1144 bytes
-rwxr-xr-ximages/optionsbar/unlinked.pngbin1581 -> 1193 bytes
-rwxr-xr-ximages/optionsbar/zoom/zoom_minus.pngbin3117 -> 648 bytes
-rwxr-xr-ximages/optionsbar/zoom/zoom_plus.pngbin3128 -> 691 bytes
-rw-r--r--images/tools/Tool-FillColor.pngbin1111 -> 1400 bytes
-rw-r--r--[-rwxr-xr-x]images/tools/inkbottle_cursor.png (renamed from images/tools/inkbottle_down.png)bin3352 -> 3352 bytes
-rwxr-xr-ximages/tools/pencil_down.pngbin3103 -> 0 bytes
-rwxr-xr-ximages/tools/sprite-toolbar-3d.pngbin2599 -> 0 bytes
-rwxr-xr-ximages/tools/sprite-toolbar-tag.pngbin6403 -> 0 bytes
-rwxr-xr-xjs/components/checkbox.reel/checkbox.html23
-rwxr-xr-xjs/components/checkbox.reel/checkbox.js120
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html37
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.js24
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.js8
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html14
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.js6
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html24
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.js2
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.css1
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html27
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.js49
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.css8
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html19
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.js51
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css17
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html32
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js48
-rwxr-xr-xjs/components/tools-properties/line-properties.reel/line-properties.js8
-rwxr-xr-xjs/components/tools-properties/object3d-properties.reel/object3d-properties.html6
-rwxr-xr-xjs/components/tools-properties/object3d-properties.reel/object3d-properties.js18
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.css11
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.html6
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.js8
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html23
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.js83
-rwxr-xr-xjs/components/tools-properties/pencil-properties.reel/pencil-properties.html31
-rwxr-xr-xjs/components/tools-properties/pencil-properties.reel/pencil-properties.js25
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.css6
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html14
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.js10
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.css3
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.html71
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.js30
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.css16
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html33
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.js126
-rwxr-xr-xjs/components/tools-properties/subselection-properties.reel/subselection-properties.html32
-rwxr-xr-xjs/components/tools-properties/subselection-properties.reel/subselection-properties.js14
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.css1
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.html46
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.js47
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.css28
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html55
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.js1
-rwxr-xr-xjs/components/tools-properties/zoom-properties.reel/zoom-properties.html6
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.css10
-rw-r--r--[-rwxr-xr-x]js/components/ui/label-checkbox.reel/label-checkbox.css (renamed from js/components/tools-properties/pencil-properties.reel/pencil-properties.css)3
-rwxr-xr-xjs/components/ui/label-checkbox.reel/label-checkbox.html54
-rwxr-xr-xjs/components/ui/label-checkbox.reel/label-checkbox.js87
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.js2
-rwxr-xr-xjs/controllers/color-controller.js16
-rwxr-xr-xjs/controllers/document-controller.js300
-rwxr-xr-xjs/controllers/styles-controller.js11
-rwxr-xr-xjs/data/menu-data.js39
-rwxr-xr-xjs/data/tools-data.js76
-rwxr-xr-xjs/document/document-html.js49
-rwxr-xr-xjs/document/html-document.js65
-rwxr-xr-xjs/document/models/base.js23
-rwxr-xr-xjs/document/models/html.js5
-rw-r--r--js/document/templates/app/main.js (renamed from js/document/templates/banner/main.js)18
-rwxr-xr-xjs/document/templates/app/package.json (renamed from js/document/templates/banner/package.json)1
-rwxr-xr-xjs/document/templates/banner/index.html2
-rwxr-xr-xjs/document/templates/html/index.html7
-rw-r--r--js/document/templates/html/main.js49
-rwxr-xr-xjs/document/templates/html/package.json8
-rwxr-xr-xjs/document/templates/preview/banner.html64
-rwxr-xr-xjs/document/views/design.js6
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js76
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js8
-rw-r--r--js/io/system/ninjalibrary.json2
-rwxr-xr-xjs/io/templates/files/animation.txt6
-rwxr-xr-xjs/io/templates/files/banner.txt6
-rwxr-xr-xjs/io/ui/file-picker/file-input-field.reel/file-input-field.js2
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js2
-rw-r--r--js/io/ui/save-as-dialog.reel/save-as-dialog.js2
-rw-r--r--js/mediators/io-mediator.js88
-rwxr-xr-xjs/mediators/keyboard-mediator.js45
-rwxr-xr-xjs/ninja.reel/ninja.html14
-rwxr-xr-xjs/ninja.reel/ninja.js12
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js2
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.js2836
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.js14
-rwxr-xr-xjs/panels/properties.reel/properties.css23
-rwxr-xr-xjs/panels/properties.reel/properties.js2
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js16
-rwxr-xr-xjs/stage/stage-deps.js6
-rwxr-xr-xjs/stage/stage-view.reel/stage-view.js50
-rwxr-xr-xjs/stage/stage.reel/stage.html3
-rwxr-xr-xjs/stage/stage.reel/stage.js73
-rw-r--r--js/tools/BrushTool.js2
-rwxr-xr-xjs/tools/FillTool.js7
-rwxr-xr-xjs/tools/InkBottleTool.js2
-rwxr-xr-xjs/tools/LineTool.js6
-rwxr-xr-xjs/tools/OvalTool.js4
-rwxr-xr-xjs/tools/PenTool.js6
-rwxr-xr-xjs/tools/PencilTool.js32
-rwxr-xr-xjs/tools/RectTool.js4
-rwxr-xr-xjs/tools/ShapeTool.js2
-rwxr-xr-xjs/tools/TagTool.js5
-rw-r--r--node_modules/descriptor.json42
-rw-r--r--node_modules/montage/core/change-notification.js1418
-rwxr-xr-xnode_modules/montage/core/converter/date-converter.js4
-rwxr-xr-xnode_modules/montage/core/core.js600
-rwxr-xr-xnode_modules/montage/core/deserializer.js4
-rwxr-xr-xnode_modules/montage/core/event/binding.js953
-rwxr-xr-xnode_modules/montage/core/event/event-manager.js56
-rw-r--r--node_modules/montage/core/event/key-manager.js978
-rwxr-xr-xnode_modules/montage/core/exception.js2
-rwxr-xr-xnode_modules/montage/core/extra