aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhwc4872012-07-10 09:16:36 -0700
committerhwc4872012-07-10 09:16:36 -0700
commit05542267c8c443a995a2221a2e7976d9894850ba (patch)
tree9eab323c983bdf6fe4a1a22c284c913a74013fa6
parent7e5c17d1732606b3e32da054e73fe42813cf7326 (diff)
parentf83c329796eae9f11630b0d58d1b21d1ff71655a (diff)
downloadninja-05542267c8c443a995a2221a2e7976d9894850ba.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
-rw-r--r--assets/canvas-runtime.js23
-rw-r--r--assets/descriptor.json1
-rw-r--r--assets/shaders/Basic.frag.glsl23
-rwxr-xr-xassets/shaders/Basic.vert.glsl23
-rw-r--r--assets/shaders/BasicTex.frag.glsl23
-rw-r--r--assets/shaders/Cloud.frag.glsl23
-rw-r--r--assets/shaders/Cloud.vert.glsl23
-rw-r--r--assets/shaders/Flag.frag.glsl23
-rw-r--r--assets/shaders/Flag.vert.glsl23
-rw-r--r--assets/shaders/Taper.frag.glsl23
-rw-r--r--assets/shaders/Taper.vert.glsl23
-rw-r--r--assets/shaders/TwistVert.frag.glsl23
-rw-r--r--assets/shaders/TwistVert.vert.glsl23
-rwxr-xr-xassets/shaders/linearGradient.frag.glsl23
-rwxr-xr-xassets/shaders/linearGradient.vert.glsl23
-rw-r--r--assets/shaders/radialGradient.frag.glsl23
-rw-r--r--assets/shaders/radialGradient.vert.glsl23
-rwxr-xr-xassets/shaders/test_fshader.glsl23
-rwxr-xr-xassets/shaders/test_fshader_full.glsl23
-rwxr-xr-xassets/shaders/test_vshader.glsl23
-rwxr-xr-xassets/shaders/ub_fshader.glsl23
-rwxr-xr-xassets/shaders/ub_vshader.glsl23
-rw-r--r--credits.html27
-rwxr-xr-xcss/ninja.css23
-rwxr-xr-xindex.html52
-rw-r--r--js/clipboard/external-apps-clipboard-agent.js32
-rw-r--r--js/clipboard/internal-ops/component-clipboard-agent.js23
-rw-r--r--js/clipboard/internal-ops/css-clipboard-agent.js23
-rw-r--r--js/clipboard/internal-ops/elements-clipboard-agent.js30
-rw-r--r--js/clipboard/internal-ops/timeline-clipboard-agent.js23
-rw-r--r--js/clipboard/util.js23
-rw-r--r--js/code-editor/code-editor-wrapper.js24
-rw-r--r--js/code-editor/codemirror-ninja/lib/ninja-simple-hint.js23
-rw-r--r--js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css78
-rw-r--r--js/code-editor/codemirror-ninja/theme/rubyblue-ninja.css23
-rw-r--r--js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css78
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css23
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html27
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js23
-rwxr-xr-xjs/components/SliderBase.js23
-rw-r--r--js/components/about-box.reel/about-box.css23
-rw-r--r--js/components/about-box.reel/about-box.html27
-rw-r--r--js/components/about-box.reel/about-box.js23
-rwxr-xr-xjs/components/colorbar.reel/colorbar.html25
-rwxr-xr-xjs/components/colorbar.reel/colorbar.js23
-rwxr-xr-xjs/components/colorbar.reel/css/colorbar.css23
-rwxr-xr-xjs/components/colorbar.reel/css/colorbar.scss23
-rwxr-xr-xjs/components/colorwheel.reel/colorwheel.html25
-rwxr-xr-xjs/components/colorwheel.reel/colorwheel.js23
-rwxr-xr-xjs/components/colorwheel.reel/css/colorwheel.css23
-rwxr-xr-xjs/components/colorwheel.reel/css/colorwheel.scss23
-rwxr-xr-xjs/components/combobox.reel/combobox.html25
-rwxr-xr-xjs/components/combobox.reel/combobox.js23
-rw-r--r--js/components/controllers/tree-controller.js23
-rw-r--r--js/components/converter/string-units-converter.js23
-rw-r--r--js/components/converter/string-value-converter.js23
-rwxr-xr-xjs/components/core/class-uuid.js23
-rw-r--r--js/components/editable.reel/editable.js23
-rw-r--r--js/components/focus-manager.reel/focus-manager.js23
-rwxr-xr-xjs/components/gradientpicker.reel/css/gradientpicker.css23
-rwxr-xr-xjs/components/gradientpicker.reel/css/gradientpicker.scss23
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.html25
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.js23
-rw-r--r--js/components/hintable.reel/hintable.js23
-rwxr-xr-xjs/components/hottext.reel/hottext.css23
-rwxr-xr-xjs/components/hottext.reel/hottext.html25
-rwxr-xr-xjs/components/hottext.reel/hottext.js23
-rwxr-xr-xjs/components/hottextunit.reel/hottextunit.css23
-rwxr-xr-xjs/components/hottextunit.reel/hottextunit.html25
-rwxr-xr-xjs/components/hottextunit.reel/hottextunit.js23
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.css23
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html25
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.js23
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.css23
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html25
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.js23
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.css23
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.html25
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.js23
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.css23
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.html25
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.js23
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.css23
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.html25
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.js23
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.css23
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.html25
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.js23
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.css23
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.html25
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.js23
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.css23
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html25
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.js23
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.css23
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html25
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.js23
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.css23
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.html25
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.js23
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.css23
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.html25
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.js23
-rwxr-xr-xjs/components/menu/menu.reel/menu.css23
-rwxr-xr-xjs/components/menu/menu.reel/menu.html25
-rwxr-xr-xjs/components/menu/menu.reel/menu.js23
-rwxr-xr-xjs/components/popup-manager.reel/popup-manager.html25
-rwxr-xr-xjs/components/popup-manager.reel/popup-manager.js23
-rwxr-xr-xjs/components/popup.reel/css/popup.css23
-rwxr-xr-xjs/components/popup.reel/css/popup.scss23
-rwxr-xr-xjs/components/popup.reel/popup.html25
-rwxr-xr-xjs/components/popup.reel/popup.js23
-rw-r--r--js/components/prompt.reel/prompt.js23
-rwxr-xr-xjs/components/radio.reel/radio.html25
-rwxr-xr-xjs/components/radio.reel/radio.js23
-rwxr-xr-xjs/components/slider.reel/slider.css23
-rwxr-xr-xjs/components/slider.reel/slider.html25
-rwxr-xr-xjs/components/slider.reel/slider.js23
-rwxr-xr-xjs/components/textfield.reel/textfield.html25
-rwxr-xr-xjs/components/textfield.reel/textfield.js23
-rw-r--r--js/components/toolbar.reel/toolbar-button.js23
-rw-r--r--js/components/toolbar.reel/toolbar.css23
-rw-r--r--js/components/toolbar.reel/toolbar.html25
-rw-r--r--js/components/toolbar.reel/toolbar.js23
-rwxr-xr-xjs/components/tools-properties/binding-properties.reel/binding-properties.css23
-rwxr-xr-xjs/components/tools-properties/binding-properties.reel/binding-properties.html25
-rwxr-xr-xjs/components/tools-properties/binding-properties.reel/binding-properties.js23
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.css23
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html25
-rwxr-xr-x