diff options
author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/components/ui/icon-list-basic/iconsList.reel | |
parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz |
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
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 | }); |