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/ui/icon-list-basic/iconsList.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/ui/icon-list-basic/iconsList.reel')
3 files changed, 11 insertions, 11 deletions
diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.css b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.css index e04bdf5d..1b7f2286 100755 --- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.css +++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.css | |||
| @@ -29,5 +29,5 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 29 | </copyright> */ | 29 | </copyright> */ |
| 30 | 30 | ||
| 31 | .list{ | 31 | .list{ |
| 32 | 32 | ||
| 33 | } | 33 | } |
diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html index a26a3910..5d404ff9 100755 --- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html +++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.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. |
diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js index 8b40f102..c2e2d46f 100755 --- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js +++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js | |||
| @@ -55,22 +55,22 @@ var IconsList = exports.IconsList = Montage.create(Component, { | |||
| 55 | }, | 55 | }, |
| 56 | 56 | ||
| 57 | willDraw: { | 57 | willDraw: { |
| 58 | enumerable: false, | 58 | enumerable: false, |
| 59 | value: function() { | 59 | value: function() { |
| 60 | 60 | ||
| 61 | } | 61 | } |
| 62 | }, | 62 | }, |
| 63 | draw: { | 63 | draw: { |
| 64 | enumerable: false, | 64 | enumerable: false, |
| 65 | value: function() { | 65 | value: function() { |
| 66 | 66 | ||
| 67 | } | 67 | } |
| 68 | }, | 68 | }, |
| 69 | didDraw: { | 69 | didDraw: { |
| 70 | enumerable: false, | 70 | enumerable: false, |
| 71 | value: function() { | 71 | value: function() { |
| 72 | 72 | ||
| 73 | } | 73 | } |
| 74 | } | 74 | } |
| 75 | 75 | ||
| 76 | }); | 76 | }); |