aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Guzman2012-05-17 17:43:05 -0700
committerEric Guzman2012-05-17 17:43:05 -0700
commit458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7 (patch)
treeee329e409fe28ae54c894b9e27e82e1f85aefc85
parent82954f400f7f8609aef0d2bc1f44c9d960907be6 (diff)
parent52394cdd71bd62c8c109fd135fa146b7183fbd1f (diff)
downloadninja-458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7.tar.gz
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Conflicts: js/document/templates/montage-html/default_html.css js/lib/NJUtils.js
-rwxr-xr-xjs/components/checkbox.reel/checkbox.html23
-rwxr-xr-xjs/components/checkbox.reel/checkbox.js120
-rw-r--r--js/components/converter/string-units-converter.js31
-rw-r--r--js/components/converter/string-value-converter.js29
-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.js10
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.html24
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.js2
-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--[-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.js2
-rwxr-xr-xjs/controllers/document-controller.js391
-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.js29
-rwxr-xr-xjs/controllers/styles-controller.js13
-rwxr-xr-xjs/data/menu-data.js47
-rwxr-xr-xjs/data/pi/pi-data.js18
-rwxr-xr-xjs/document/document-html.js448
-rwxr-xr-xjs/document/helpers/url-parser.js86
-rwxr-xr-xjs/document/helpers/webgl-helper.js218
-rwxr-xr-xjs/document/html-document.js65
-rwxr-xr-xjs/document/models/base.js200
-rwxr-xr-xjs/document/models/html.js49
-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.html79
-rwxr-xr-xjs/document/templates/montage-html/default_html.css78
-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.js46
-rwxr-xr-xjs/document/views/design.js382
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js94
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js20
-rwxr-xr-xjs/helper-classes/3D/view-utils.js15
-rwxr-xr-xjs/io/system/coreioapi.js64
-rwxr-xr-xjs/io/system/fileio.js4
-rw-r--r--js/io/system/ninjalibrary.js2
-rw-r--r--js/io/system/ninjalibrary.json2
-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/mediators/element-mediator.js6
-rw-r--r--js/mediators/io-mediator.js224
-rwxr-xr-xjs/mediators/keyboard-mediator.js33
-rwxr-xr-xjs/ninja.reel/ninja.html14
-rwxr-xr-xjs/ninja.reel/ninja.js60
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js4
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js4
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js4
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.js26
-rwxr-xr-xjs/panels/properties.reel/properties.css8
-rwxr-xr-xjs/panels/properties.reel/properties.html10
-rwxr-xr-xjs/panels/properties.reel/properties.js157
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js16
-rwxr-xr-xjs/panels/properties.reel/sections/position-size.reel/position-size.css (renamed from js/panels/properties.reel/sections/position-and-size.reel/position-and-size.css)0
-rwxr-xr-xjs/panels/properties.reel/sections/position-size.reel/position-size.html (renamed from js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html)36
-rwxr-xr-xjs/panels/properties.reel/sections/position-size.reel/position-size.js (renamed from js/panels/properties.reel/sections/position-and-size.reel/position-and-size.js)14
-rwxr-xr-xjs/stage/layout.js2
-rwxr-xr-xjs/stage/stage-deps.js10
-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.js116
-rwxr-xr-xjs/tools/PanTool.js65
-rwxr-xr-xjs/tools/RotateStage3DTool.js20
-rwxr-xr-xjs/tools/SelectionTool.js5
-rwxr-xr-xjs/tools/ShapeTool.js2
-rwxr-xr-xjs/tools/ZoomTool.js4
-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/extras/array.js292
-rw-r--r--node_modules/montage/core/extras/object.js256
-rwxr-xr-xnode_modules/montage/core/extras/string.js (renamed from node_modules/montage/core/shim/string.js)2
-rw-r--r--node_modules/montage/core/promise-queue.js2
-rwxr-xr-xnode_modules/montage/core/selector.js9
-rw-r--r--node_modules/montage/core/selector/abstract-language.js303
-rw-r--r--node_modules/montage/core/selector/abstract-selector.js189
-rw-r--r--node_modules/montage/core/selector/abstract-semantics.js100
-rw-r--r--node_modules/montage/core/selector/language.js381
-rw-r--r--node_modules/montage/core/selector/parser.js62
-rw-r--r--node_modules/montage/core/selector/property-language.js346
-rw-r--r--node_modules/montage/core/selector/semantics.js392
-rwxr-xr-xnode_modules/montage/core/serializer.js18
-rw-r--r--[-rwxr-xr-x]node_modules/montage/core/shim/array.js51
-rw-r--r--node_modules/montage/core/shim/immediate.js57
-rw-r--r--node_modules/montage/core/shim/object.js36
-rwxr-xr-xnode_modules/montage/package.json1
-rwxr-xr-xnode_modules/montage/require/browser.js2
-rwxr-xr-xnode_modules/montage/require/require.js20
-rw-r--r--node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.js126
-rw-r--r--node_modules/montage/ui/autocomplete/result-item.reel/result-item.js33
-rw-r--r--node_modules/montage/ui/autocomplete/results-list.reel/results-list.html5
-rw-r--r--node_modules/montage/ui/autocomplete/results-list.reel/results-list.js7
-rw-r--r--node_modules/montage/ui/button.reel/button.js6
-rwxr-xr-xnode_modules/montage/ui/component-placeholder.reel/component-placeholder.js146
-rwxr-xr-xnode_modules/montage/ui/component.js163
-rw-r--r--node_modules/montage/ui/composer/key-composer.js385
-rw-r--r--node_modules/montage/ui/composer/translate-composer.js230
-rwxr-xr-xnode_modules/montage/ui/condition.reel/condition.js79
-rw-r--r--node_modules/montage/ui/controller/array-controller.js53
-rwxr-xr-xnode_modules/montage/ui/flow-bezier-spline.js163
-rw-r--r--node_modules/montage/ui/flow-path-cubic.js115
-rw-r--r--node_modules/montage/ui/flow-path-lerp.js112
-rw-r--r--node_modules/montage/ui/flow-path-linear.js83
-rw-r--r--node_modules/montage/ui/flow-path-sigmoid.js148
-rw-r--r--node_modules/montage/ui/flow-path.js215
-rw-r--r--node_modules/montage/ui/flow.r