aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorKruti Shah2012-05-31 10:44:45 -0700
committerKruti Shah2012-05-31 10:44:45 -0700
commitc350cc1c060fdf17357ddadce024267943784593 (patch)
tree453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js
parentfdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff)
parent121d0e616f48aa7cd048763554089c20a1883d7a (diff)
downloadninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js')
-rwxr-xr-xjs/components/checkbox.reel/checkbox.html23
-rwxr-xr-xjs/components/checkbox.reel/checkbox.js120
-rw-r--r--js/components/controllers/tree-controller.js10
-rw-r--r--js/components/converter/string-units-converter.js31
-rw-r--r--js/components/converter/string-value-converter.js29
-rw-r--r--js/components/editable.reel/editable.js43
-rw-r--r--js/components/hintable.reel/hintable.js50
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html37
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.js28
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.js14
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.html24
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.html4
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.js11
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html26
-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/radio.reel/radio.html9
-rwxr-xr-xjs/components/radio.reel/radio.js24
-rw-r--r--js/components/toolbar.reel/toolbar.css62
-rw-r--r--js/components/toolbar.reel/toolbar.html53
-rw-r--r--js/components/toolbar.reel/toolbar.js123
-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.html60
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.js87
-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
-rw-r--r--js/components/treeview/tree-node.js4
-rw-r--r--js/components/treeview/treeview.reel/treeview.js5
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.css10
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.js13
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.js2
-rwxr-xr-xjs/components/ui/input-group.reel/input-group.html3
-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.js14
-rw-r--r--js/controllers/code-editor-controller.js40
-rwxr-xr-xjs/controllers/color-controller.js16
-rwxr-xr-xjs/controllers/document-controller.js555
-rwxr-xr-xjs/controllers/elements/body-controller.js30
-rwxr-xr-xjs/controllers/elements/component-controller.js4
-rwxr-xr-xjs/controllers/elements/element-controller.js22
-rwxr-xr-xjs/controllers/elements/shapes-controller.js4
-rwxr-xr-xjs/controllers/selection-controller.js40
-rwxr-xr-xjs/controllers/styles-controller.js196
-rwxr-xr-xjs/data/menu-data.js47
-rw-r--r--js/data/panels-data.js12
-rwxr-xr-xjs/data/pi/pi-data.js18
-rwxr-xr-xjs/data/tools-data.js89
-rwxr-xr-xjs/document/_toDelete/html-document.js (renamed from js/document/html-document.js)147
-rwxr-xr-xjs/document/_toDelete/text-document.js (renamed from js/document/text-document.js)0
-rwxr-xr-xjs/document/document-html.js469
-rwxr-xr-xjs/document/document-text.js57
-rwxr-xr-xjs/document/helpers/url-parser.js86
-rwxr-xr-xjs/document/helpers/webgl-helper.js218
-rwxr-xr-xjs/document/models/base.js214
-rwxr-xr-xjs/document/models/html.js76
-rwxr-xr-xjs/document/models/text.js57
-rw-r--r--js/document/templates/app/main.js (renamed from js/document/templates/montage-web/main.reel/main.js)18
-rwxr-xr-xjs/document/templates/app/package.json (renamed from js/document/templates/montage-html/package.json)1
-rwxr-xr-xjs/document/templates/banner/index.html108
-rwxr-xr-xjs/document/templates/html/index.html83
-rwxr-xr-xjs/document/templates/montage-html/default_html.css74
-rwxr-xr-xjs/document/templates/montage-html/index.html48
-rw-r--r--js/document/templates/montage-html/main.reel/main.js48
-rwxr-xr-xjs/document/templates/montage-web/default_html.css28
-rwxr-xr-xjs/document/templates/montage-web/index.html38
-rwxr-xr-xjs/document/templates/montage-web/package.json8
-rwxr-xr-xjs/document/templates/preview/banner.html64
-rwxr-xr-xjs/document/views/base.js48
-rwxr-xr-xjs/document/views/code.js142
-rwxr-xr-xjs/document/views/design.js431
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js111
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js179
-rwxr-xr-xjs/helper-classes/3D/view-utils.js101
-rwxr-xr-xjs/io/system/coreioapi.js64
-rwxr-xr-xjs/io/system/fileio.js4
-rw-r--r--js/io/system/ninjalibrary.js137
-rw-r--r--js/io/system/ninjalibrary.json4
-rw-r--r--js/io/templates/descriptor.json68
-rwxr-xr-xjs/io/templates/files/animation.txt23
-rwxr-xr-xjs/io/templates/files/banner.txt23
-rwxr-xr-xjs/io/templates/files/html.txt1
-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/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js11
-rw-r--r--js/io/ui/save-as-dialog.reel/save-as-dialog.js2
-rwxr-xr-xjs/lib/NJUtils.js12
-rwxr-xr-xjs/lib/geom/circle.js124
-rwxr-xr-xjs/lib/geom/rectangle.js190
-rw-r--r--js/lib/geom/shape-primitive.js27
-rwxr-xr-xjs/lib/rdge/materials/linear-gradient-material.js36
-rwxr-xr-xjs/lib/rdge/materials/material.js4
-rwxr-xr-xjs/lib/rdge/materials/radial-gradient-material.js70
-rwxr-xr-xjs/mediators/element-mediator.js14
-rw-r--r--js/mediators/io-mediator.js410
-rwxr-xr-xjs/med