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/eyedropper-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/eyedropper-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html | 8 | ||||
| -rwxr-xr-x | js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html index 022e7bd0..031b40bf 100755 --- a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html +++ b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-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. |
| @@ -42,9 +42,9 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 42 | "element": {"#": "eyedropperProperties"} | 42 | "element": {"#": "eyedropperProperties"} |
| 43 | } | 43 | } |
| 44 | } | 44 | } |
| 45 | } | 45 | } |
| 46 | </script> | 46 | </script> |
| 47 | 47 | ||
| 48 | </head> | 48 | </head> |
| 49 | 49 | ||
| 50 | <body> | 50 | <body> |
diff --git a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js index e788b5f6..3442f95c 100755 --- a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js +++ b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js | |||
| @@ -34,7 +34,7 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T | |||
| 34 | 34 | ||
| 35 | exports.EyedropperProperties = Montage.create(ToolProperties, { | 35 | exports.EyedropperProperties = Montage.create(ToolProperties, { |
| 36 | 36 | ||
| 37 | 37 | ||
| 38 | _subPrepare: { | 38 | _subPrepare: { |
| 39 | value: function() { | 39 | value: function() { |
| 40 | //this.divElement.addEventListener("click", this, false); | 40 | //this.divElement.addEventListener("click", this, false); |