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 /node_modules/montage/ui/native | |
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 'node_modules/montage/ui/native')
3 files changed, 20 insertions, 20 deletions
diff --git a/node_modules/montage/ui/native/anchor.reel/anchor.js b/node_modules/montage/ui/native/anchor.reel/anchor.js index 6e72ea95..cae5ac2d 100644 --- a/node_modules/montage/ui/native/anchor.reel/anchor.js +++ b/node_modules/montage/ui/native/anchor.reel/anchor.js | |||
@@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
29 | </copyright> */ | 29 | </copyright> */ |
30 | 30 | ||
31 | /** | 31 | /** |
32 | @module "montage/ui/anchor.reel" | 32 | @module "montage/ui/anchor.reel" |
33 | @requires montage/core/core | 33 | @requires montage/core/core |
34 | @requires montage/ui/native-control | 34 | @requires montage/ui/native-control |
35 | */ | 35 | */ |
diff --git a/node_modules/montage/ui/native/input-date.reel/input-date.js b/node_modules/montage/ui/native/input-date.reel/input-date.js index 6af953e6..44dc964f 100644 --- a/node_modules/montage/ui/native/input-date.reel/input-date.js +++ b/node_modules/montage/ui/native/input-date.reel/input-date.js | |||
@@ -39,7 +39,7 @@ var Montage = require("montage").Montage, | |||
39 | TextInput = require("ui/text-input").TextInput; | 39 | TextInput = require("ui/text-input").TextInput; |
40 | 40 | ||
41 | /** | 41 | /** |
42 | Wraps an <input type="date"> element as a component. | 42 | Wraps an <input type="date"> element as a component. |
43 | @class module:"montage/ui/input-date.reel".InputDate | 43 | @class module:"montage/ui/input-date.reel".InputDate |
44 | @extends module:montage/ui/text-input.TextInput | 44 | @extends module:montage/ui/text-input.TextInput |
45 | */ | 45 | */ |
@@ -49,22 +49,22 @@ var InputDate = exports.InputDate = Montage.create(TextInput, { | |||
49 | InputDate.addAttributes( /** @lends module:"montage/ui/input-date.reel".InputDate# */{ | 49 | InputDate.addAttributes( /** @lends module:"montage/ui/input-date.reel".InputDate# */{ |
50 | 50 | ||
51 | /** | 51 | /** |
52 | The upper bound for the element’s value represented in the "full-date" format, (for example, 2001-05-24). | 52 | The upper bound for the element’s value represented in the "full-date" format, (for example, 2001-05-24). |
53 | @type {string} | 53 | @type {string} |
54 | @default: null | 54 | @default: null |
55 | */ | 55 | */ |
56 | max: null, | 56 | max: null, |
57 | /** | 57 | /** |
58 | The lower bound for the element’s value represented in the "full-date" format, (for example, 2001-05-24). | 58 | The lower bound for the element’s value represented in the "full-date" format, (for example, 2001-05-24). |
59 | @type {string} | 59 | @type {string} |
60 | @default: null | 60 | @default: null |
61 | */ | 61 | */ |
62 | min: null, | 62 | min: null, |
63 | 63 | ||
64 | /** | 64 | /** |
65 | The amount the date changes with each step. | 65 | The amount the date changes with each step. |
66 | @type {string|number} | 66 | @type {string|number} |
67 | @default null | 67 | @default null |
68 | */ | 68 | */ |
69 | step: null | 69 | step: null |
70 | }); | 70 | }); |
diff --git a/node_modules/montage/ui/native/input-number.reel/input-number.js b/node_modules/montage/ui/native/input-number.reel/input-number.js index 33700b92..f0f88bb6 100644 --- a/node_modules/montage/ui/native/input-number.reel/input-number.js +++ b/node_modules/montage/ui/native/input-number.reel/input-number.js | |||
@@ -50,23 +50,23 @@ var InputNumber = exports.InputNumber = Montage.create(TextInput, { | |||
50 | InputNumber.addAttributes(/** @lends module:"montage/ui/input-number.reel".InputNumber */{ | 50 | InputNumber.addAttributes(/** @lends module:"montage/ui/input-number.reel".InputNumber */{ |
51 | 51 | ||
52 | /** | 52 | /** |
53 | The maximum value displayed but the number control. | 53 | The maximum value displayed but the number control. |
54 | @type {number} | 54 | @type {number} |
55 | @default null | 55 | @default null |
56 | */ | 56 | */ |
57 | max: {dataType: 'number'}, | 57 | max: {dataType: 'number'}, |
58 | 58 | ||
59 | /** | 59 | /** |
60 | The minimum value displayed but the number control. | 60 | The minimum value displayed but the number control. |
61 | @type {number} | 61 | @type {number} |
62 | @default null | 62 | @default null |
63 | */ | 63 | */ |
64 | min: {dataType: 'number'}, | 64 | min: {dataType: 'number'}, |
65 | 65 | ||
66 | /** | 66 | /** |
67 | The amount the number changes with each step. | 67 | The amount the number changes with each step. |
68 | @type {number} | 68 | @type {number} |
69 | @default null | 69 | @default null |
70 | */ | 70 | */ |
71 | step: null // number or 'any' | 71 | step: null // number or 'any' |
72 | }); | 72 | }); |