diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/tools-properties/rect-properties.reel | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-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/tools-properties/rect-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/rect-properties.reel/rect-properties.html | 6 | ||||
| -rwxr-xr-x | js/components/tools-properties/rect-properties.reel/rect-properties.js | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.html b/js/components/tools-properties/rect-properties.reel/rect-properties.html index e2161e9b..b44e79ae 100755 --- a/js/components/tools-properties/rect-properties.reel/rect-properties.html +++ b/js/components/tools-properties/rect-properties.reel/rect-properties.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. |
| @@ -125,8 +125,8 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 125 | "BRRadiusControl": {"@": "hottext4"} | 125 | "BRRadiusControl": {"@": "hottext4"} |
| 126 | } | 126 | } |
| 127 | } | 127 | } |
| 128 | } | 128 | } |
| 129 | </script> | 129 | </script> |
| 130 | 130 | ||
| 131 | </head> | 131 | </head> |
| 132 | 132 | ||
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.js b/js/components/tools-properties/rect-properties.reel/rect-properties.js index 53539113..faf6ee7b 100755 --- a/js/components/tools-properties/rect-properties.reel/rect-properties.js +++ b/js/components/tools-properties/rect-properties.reel/rect-properties.js | |||
| @@ -76,7 +76,7 @@ exports.RectProperties = Montage.create(ToolProperties, { | |||
| 76 | use3D: { | 76 | use3D: { |
| 77 | get: function() { return this.base._use3D; } | 77 | get: function() { return this.base._use3D; } |
| 78 | }, | 78 | }, |
| 79 | 79 | ||
| 80 | strokeSize: { | 80 | strokeSize: { |
| 81 | get: function() { return this.base._strokeSize; } | 81 | get: function() { return this.base._strokeSize; } |
| 82 | }, | 82 | }, |