diff options
| author | hwc487 | 2012-02-23 15:21:56 -0800 |
|---|---|---|
| committer | hwc487 | 2012-02-23 15:21:56 -0800 |
| commit | 26bb2894c29d4608e843de01829d352dd3d00823 (patch) | |
| tree | c5a9d10976304fe5b3dec59f40977d8c72df57de /js/components/layout/tool-button.reel/tool-button.html | |
| parent | 64280907f31e6f6e5659acb0893df3e0da5bb044 (diff) | |
| parent | 81ce79819ba574b03b46e91e9a153dab82b550cd (diff) | |
| download | ninja-26bb2894c29d4608e843de01829d352dd3d00823.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts:
js/helper-classes/RDGE/GLWorld.js
js/helper-classes/RDGE/Materials/PulseMaterial.js
js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
js/helper-classes/RDGE/src/tools/rdge-compiled.js
js/preloader/Preloader.js
Diffstat (limited to 'js/components/layout/tool-button.reel/tool-button.html')
| -rwxr-xr-x | js/components/layout/tool-button.reel/tool-button.html | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/js/components/layout/tool-button.reel/tool-button.html b/js/components/layout/tool-button.reel/tool-button.html index 81a9b927..476b66f3 100755 --- a/js/components/layout/tool-button.reel/tool-button.html +++ b/js/components/layout/tool-button.reel/tool-button.html | |||
| @@ -16,8 +16,7 @@ | |||
| 16 | "module": "js/components/layout/tool-button.reel", | 16 | "module": "js/components/layout/tool-button.reel", |
| 17 | "name": "ToolButton", | 17 | "name": "ToolButton", |
| 18 | "properties": { | 18 | "properties": { |
| 19 | "element": {"#": "buttonBackground"}, | 19 | "element": {"#": "toolBarButton"} |
| 20 | "button": {"#": "toolBarButton"} | ||
| 21 | } | 20 | } |
| 22 | } | 21 | } |
| 23 | } | 22 | } |
| @@ -27,9 +26,7 @@ | |||
| 27 | </head> | 26 | </head> |
| 28 | 27 | ||
| 29 | <body> | 28 | <body> |
| 30 | <div id="buttonBackground" class="buttonBackground"> | 29 | <div id="toolBarButton"></div> |
| 31 | <div id="toolBarButton" class="toolBarButton"></div> | ||
| 32 | </div> | ||
| 33 | </body> | 30 | </body> |
| 34 | 31 | ||
| 35 | </html> | 32 | </html> |