aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/tools-list.reel
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/layout/tools-list.reel
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts: js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/components/layout/tools-list.reel')
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html6
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.js2
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>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All 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;