diff options
| author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
| commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
| tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/components/layout/tools-list.reel | |
| parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
| parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
| download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz | |
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/components/layout/tools-list.reel')
| -rwxr-xr-x | js/components/layout/tools-list.reel/tools-list.html | 6 | ||||
| -rwxr-xr-x | js/components/layout/tools-list.reel/tools-list.js | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html index 76422d9e..300c8069 100755 --- a/js/components/layout/tools-list.reel/tools-list.html +++ b/js/components/layout/tools-list.reel/tools-list.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE HTML> | 1 | <!doctype html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
| 4 | All Rights Reserved. | 4 | All Rights Reserved. |
| @@ -160,8 +160,8 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 160 | ] | 160 | ] |
| 161 | } | 161 | } |
| 162 | } | 162 | } |
| 163 | } | 163 | } |
| 164 | </script> | 164 | </script> |
| 165 | 165 | ||
| 166 | </head> | 166 | </head> |
| 167 | 167 | ||
diff --git a/js/components/layout/tools-list.reel/tools-list.js b/js/components/layout/tools-list.reel/tools-list.js index a20aa6ad..e5d34bdb 100755 --- a/js/components/layout/tools-list.reel/tools-list.js +++ b/js/components/layout/tools-list.reel/tools-list.js | |||
| @@ -181,7 +181,7 @@ exports.ToolsList = Montage.create(Component, { | |||
| 181 | this.RectTool.options = this.application.ninja.toolsProperties.shapeProperties.rectProperties; | 181 | this.RectTool.options = this.application.ninja.toolsProperties.shapeProperties.rectProperties; |
| 182 | this.LineTool.options = this.application.ninja.toolsProperties.shapeProperties.lineProperties; | 182 | this.LineTool.options = this.application.ninja.toolsProperties.shapeProperties.lineProperties; |
| 183 | this.BrushTool.options = this.application.ninja.toolsProperties.brushProperties; | 183 | this.BrushTool.options = this.application.ninja.toolsProperties.brushProperties; |
| 184 | 184 | ||
| 185 | this.EraserTool.options = this.application.ninja.toolsProperties.eraserProperties; | 185 | this.EraserTool.options = this.application.ninja.toolsProperties.eraserProperties; |
| 186 | this.RotateStageTool3D.options = this.application.ninja.toolsProperties.rotateStageProperties; | 186 | this.RotateStageTool3D.options = this.application.ninja.toolsProperties.rotateStageProperties; |
| 187 | this.PanTool.options = this.application.ninja.toolsProperties.panProperties; | 187 | this.PanTool.options = this.application.ninja.toolsProperties.panProperties; |