aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-07 16:30:19 -0700
committerJohn Mayhew2012-05-07 16:30:19 -0700
commitdb4ba95f50148198759dde503ec1c778184d9dbe (patch)
tree8b79ad58108af2f17d15abc8cdc33d35229ab20d
parent843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
Diffstat
-rwxr-xr-xcss/ninja.css22
-rw-r--r--imports/codemirror/lib/codemirror.css2
-rw-r--r--imports/codemirror/lib/codemirror.js247
-rw-r--r--imports/codemirror/lib/util/closetag.js174
-rw-r--r--imports/codemirror/lib/util/foldcode.js2
-rw-r--r--imports/codemirror/lib/util/formatting.js2
-rw-r--r--imports/codemirror/lib/util/javascript-hint.js6
-rw-r--r--imports/codemirror/lib/util/simple-hint.js6
-rw-r--r--imports/codemirror/mode/clike/index.html2
-rw-r--r--imports/codemirror/mode/clojure/clojure.js26
-rw-r--r--imports/codemirror/mode/css/css.js2
-rw-r--r--imports/codemirror/mode/htmlmixed/htmlmixed.js2
-rw-r--r--imports/codemirror/mode/javascript/javascript.js6
-rw-r--r--imports/codemirror/mode/less/index.html39
-rw-r--r--imports/codemirror/mode/less/less.js143
-rw-r--r--imports/codemirror/mode/markdown/index.html1
-rw-r--r--imports/codemirror/mode/markdown/markdown.js89
-rwxr-xr-ximports/codemirror/mode/properties/index.html4
-rwxr-xr-ximports/codemirror/mode/properties/properties.css3
-rwxr-xr-ximports/codemirror/mode/properties/properties.js28
-rw-r--r--imports/codemirror/mode/scheme/scheme.js402
-rw-r--r--imports/codemirror/mode/smarty/index.html82
-rw-r--r--imports/codemirror/mode/smarty/smarty.js148
-rw-r--r--imports/codemirror/mode/stex/stex.js17
-rw-r--r--imports/codemirror/mode/stex/test.html251
-rw-r--r--imports/codemirror/mode/tiddlywiki/index.html69
-rw-r--r--imports/codemirror/mode/tiddlywiki/tiddlywiki.css2
-rw-r--r--imports/codemirror/mode/tiddlywiki/tiddlywiki.js72
-rw-r--r--imports/codemirror/mode/vbscript/index.html42
-rw-r--r--imports/codemirror/mode/vbscript/vbscript.js26
-rw-r--r--imports/codemirror/mode/xml/xml.js3
-rw-r--r--imports/codemirror/mode/xmlpure/index.html1
-rw-r--r--imports/codemirror/mode/xquery/LICENSE20
-rw-r--r--imports/codemirror/mode/xquery/index.html222
-rw-r--r--imports/codemirror/mode/xquery/test/index.html27
-rw-r--r--imports/codemirror/mode/xquery/test/testBase.js42
-rw-r--r--imports/codemirror/mode/xquery/test/testEmptySequenceKeyword.js16
-rw-r--r--imports/codemirror/mode/xquery/test/testMultiAttr.js16
-rw-r--r--imports/codemirror/mode/xquery/test/testNamespaces.js91
-rw-r--r--imports/codemirror/mode/xquery/test/testProcessingInstructions.js16
-rw-r--r--imports/codemirror/mode/xquery/test/testQuotes.js19
-rw-r--r--imports/codemirror/mode/xquery/xquery.js448
-rw-r--r--imports/codemirror/theme/eclipse.css2
-rw-r--r--imports/codemirror/theme/elegant.css4
-rw-r--r--imports/codemirror/theme/lesser-dark.css45
-rw-r--r--imports/codemirror/theme/neat.css6
-rw-r--r--imports/codemirror/theme/rubyblue.css2
-rw-r--r--imports/codemirror/theme/xq-dark.css46
-rwxr-xr-ximports/codemirror/version.txt2
-rwxr-xr-xindex.html26
-rw-r--r--js/code-editor/codemirror-ninja/lib/ninja-simple-hint.js86
-rw-r--r--js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css54
-rw-r--r--js/code-editor/codemirror-ninja/theme/rubyblue-ninja.css30
-rw-r--r--js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css54
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css112
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html87
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js79
-rw-r--r--js/components/about-box.reel/about-box.html2
-rwxr-xr-xjs/components/checkbox.reel/checkbox.html2
-rwxr-xr-xjs/components/colorbar.reel/colorbar.html2
-rwxr-xr-xjs/components/colorwheel.reel/colorwheel.html2
-rwxr-xr-xjs/components/combobox.reel/combobox.html2
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.html2
-rwxr-xr-xjs/components/hottext.reel/hottext.html2
-rwxr-xr-xjs/components/hottextunit.reel/hottextunit.html2
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html8
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html10
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.js2
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.html6
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.html6
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.html4
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.css4
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.html2
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.css4
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.html2
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html10
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html32
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.html10
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.html10
-rwxr-xr-xjs/components/menu/menu.reel/menu.html6
-rwxr-xr-xjs/components/popup-manager.reel/popup-manager.html2
-rwxr-xr-xjs/components/popup.reel/popup.html2
-rwxr-xr-xjs/components/radio.reel/radio.html2
-rwxr-xr-xjs/components/slider.reel/slider.html8
-rwxr-xr-xjs/components/textfield.reel/textfield.html2
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html16
-rwxr-xr-xjs/components/tools-properties/eraser-properties.reel/eraser-properties.html2
-rwxr-xr-xjs/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html2
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html10
-rwxr-xr-xjs/components/tools-properties/line-properties.reel/line-properties.html2
-rwxr-xr-xjs/components/tools-properties/object3d-properties.reel/object3d-properties.html6
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.html4
-rwxr-xr-xjs/components/tools-properties/pan-properties.reel/pan-properties.html2
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html8
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html12
-rwxr-xr-xjs/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html2
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.html6
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html28
-rwxr-xr-xjs/components/tools-properties/subselection-properties.reel/subselection-properties.html2
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.html24
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.js6
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html38
-rwxr-xr-xjs/components/tools-properties/zoom-properties.reel/zoom-properties.html6
-rw-r--r--js/components/treeview/branch.reel/branch.html8
-rw-r--r--js/components/treeview/leaf.reel/leaf.html4
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.html10
-rw-r--r--js/components/treeview/ninja-leaf.reel/ninja-leaf.html4
-rw-r--r--js/components/treeview/treeview.reel/treeview.html4
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.html12
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.html6
-rwxr-xr-xjs/components/ui/icon-list-basic/icon.reel/icon.html6
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.html6
-rwxr-xr-xjs/components/ui/input-group.reel/input-group.html6
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.html8
-rwxr-xr-xjs/components/ui/tree-basic/tree.reel/tree.html6
-rwxr-xr-xjs/components/ui/tree-basic/treeItem.reel/treeItem.html8
-rw-r--r--js/controllers/code-editor-controller.js258
-rwxr-xr-xjs/controllers/document-controller.js5
-rwxr-xr-xjs/controllers/elements/body-controller.js51
-rwxr-xr-xjs/controllers/elements/controller-factory.js2
-rwxr-xr-xjs/controllers/elements/element-controller.js16
-rwxr-xr-xjs/controllers/elements/shapes-controller.js2
-rwxr-xr-xjs/data/pi/pi-data.js6
-rwxr-xr-xjs/document/templates/montage-web/default_html.css9
-rwxr-xr-xjs/document/templates/montage-web/index.html