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/panels/css-panel/css-style.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/panels/css-panel/css-style.reel')
| -rw-r--r-- | js/panels/css-panel/css-style.reel/css-style.html | 2 | ||||
| -rw-r--r-- | js/panels/css-panel/css-style.reel/css-style.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/css-panel/css-style.reel/css-style.html b/js/panels/css-panel/css-style.reel/css-style.html index 55e162b0..87f7d519 100644 --- a/js/panels/css-panel/css-style.reel/css-style.html +++ b/js/panels/css-panel/css-style.reel/css-style.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/panels/css-panel/css-style.reel/css-style.js b/js/panels/css-panel/css-style.reel/css-style.js index e0b24b58..cc41ca23 100644 --- a/js/panels/css-panel/css-style.reel/css-style.js +++ b/js/panels/css-panel/css-style.reel/css-style.js | |||
| @@ -337,7 +337,7 @@ exports.CssStyle = Montage.create(Component, { | |||
| 337 | } else if (value !== '0') { | 337 | } else if (value !== '0') { |
| 338 | this.units = units; | 338 | this.units = units; |
| 339 | } | 339 | } |
| 340 | 340 | ||
| 341 | this.valueField.value = value; | 341 | this.valueField.value = value; |
| 342 | 342 | ||
| 343 | this.delegate.handleValueChange(rule, property, value, this); | 343 | this.delegate.handleValueChange(rule, property, value, this); |