aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Duran2012-05-31 08:54:48 -0700
committerJonathan Duran2012-05-31 08:54:48 -0700
commitf297093b5bfa62c9832829751a12f0e556bb5cc0 (patch)
tree6e04cdf142cb1b36e2197970c9dc2141017a2be7
parent9253e2ce98d748edd8c3929f113a597923960387 (diff)
parentd49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff)
downloadninja-f297093b5bfa62c9832829751a12f0e556bb5cc0.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/properties.reel/properties.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat
-rw-r--r--assets/canvas-runtime.js32
-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.js44
-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.html12
-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/rect-properties.reel/rect-properties.html46
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.js79
-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.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 node_modules/montage/core/shim.js)11
-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/document-controller.js555
-rwxr-xr-xjs/controllers/elements/body-controller.js30
-rwxr-xr-xjs/controllers/elements/component-controller.js4
-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.js13
-rwxr-xr-xjs/document/_toDelete/html-document.js (renamed from js/document/html-document.js)143
-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.js33
-rwxr-xr-xjs/helper-classes/3D/view-utils.js88
-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/mediators/element-mediator.js10
-rw-r--r--js/mediators/io-mediator.js410
-rwxr-xr-xjs/mediators/keyboard-mediator.js33
-rwxr-xr-xjs/ninja.reel/ninja.html14
-rwxr-xr-xjs/ninja.reel/ninja.js96
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js21
-rwxr-xr-xjs/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html12
-rwxr-xr-xjs/panels/CSSPanel/ComputedStyleSubPanel.reel/computed-style-sub-panel.css32
-rwxr-xr-xjs/panels/CSSPanel/css-property-name-list.js2
-rwxr-xr-xjs/panels/CSSPanel/css-shorthand-map.js45
-rwxr-xr-xjs/panels/CSSPanel/css-value-completion-map.js5
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html2
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js7
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.html3
-rwxr-xr-xjs/panels/Splitter.js7
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js6
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js17
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js14
-rw-r--r--js/panels/collapse-composer.js137
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.js26
-rw-r--r--js/panels/css-panel/css-panel-container.js15
-rw-r--r--js/panels/css-panel/css-panel.reel/css-panel.css63
-rw-r--r--js/panels/css-panel/css-panel.reel/css-panel.html56
-rw-r--r--js/panels/css-panel/css-panel.reel/css-panel.js19
-rw-r--r--js/panels/css-panel/css-style.reel/css-style.css188
-rw-r--r--js/panels/css-panel/css-style.reel/css-style.html87
-rw-r--r--js/panels/css-panel/css-style.reel/css-style.js416
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.css93
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html90
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js174
-rw-r--r--js/panels/css-panel/rule-list-container.reel/rule-list-container.html48
-rw-r--r--js/panels/css-panel/rule-list-container.reel/rule-list-container.js185
-rw-r--r--js/panels/css-panel/rule-list.reel/rule-list.css30
-rw-r--r--js/panels/css-panel/rule-list.reel/rule-list.html25
-rw-r--r--js/panels/css-panel/rule-list.reel/rule-list.js213
-rw-r--r--js/panels/css-panel/style-declaration.reel/style-declaration.css13
-rw-r--r--js/panels/css-panel/style-declaration.reel/style-declaration.html63
-rw-r--r--js/panels/css-panel/style-declaration.reel/style-declaration.js326
-rw-r--r--js/panels/css-panel/style-sheet.reel/style-sheet.css145
-rw-r--r--js/panels/css-panel/style-sheet.reel/style-sheet.html101
-rw-r--r--js/panels/css-panel/style-sheet.reel/style-sheet.js267
-rw-r--r--js/panels/css-panel/style-sheets-view.reel/style-sheets-view.css53
-rw-r--r--js/panels/css-panel/style-sheets-view.reel/style-sheets-view.html116
-rw-r--r--js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js270
-rw-r--r--js/panels/css-panel/styles-view-container.reel/styles-view-container.css33
-rw-r--r--js/panels/css-panel/styles-view-container.reel/styles-view-container.html82