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/tag-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/tag-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/tag-properties.reel/tag-properties.html | 8 | ||||
| -rwxr-xr-x | js/components/tools-properties/tag-properties.reel/tag-properties.js | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.html b/js/components/tools-properties/tag-properties.reel/tag-properties.html index a69ea94e..8480bef2 100755 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.html +++ b/js/components/tools-properties/tag-properties.reel/tag-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. |
| @@ -55,9 +55,9 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 55 | "customLabel": {"#": "customContainer"} | 55 | "customLabel": {"#": "customContainer"} |
| 56 | } | 56 | } |
| 57 | } | 57 | } |
| 58 | } | 58 | } |
| 59 | </script> | 59 | </script> |
| 60 | 60 | ||
| 61 | </head> | 61 | </head> |
| 62 | 62 | ||
| 63 | <body> | 63 | <body> |
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.js b/js/components/tools-properties/tag-properties.reel/tag-properties.js index ce122681..58d70105 100755 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.js +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.js | |||
| @@ -74,7 +74,7 @@ var TagProperties = exports.TagProperties = Montage.create(ToolProperties, { | |||
| 74 | value: function() { | 74 | value: function() { |
| 75 | this.customName.style["display"] = "none"; | 75 | this.customName.style["display"] = "none"; |
| 76 | this.customLabel.style["display"] = "none"; | 76 | this.customLabel.style["display"] = "none"; |
| 77 | 77 | ||
| 78 | this.divElement.addEventListener("click", this, false); | 78 | this.divElement.addEventListener("click", this, false); |
| 79 | this.imageElement.addEventListener("click", this, false); | 79 | this.imageElement.addEventListener("click", this, false); |
| 80 | this.videoElement.addEventListener("click", this, false); | 80 | this.videoElement.addEventListener("click", this, false); |