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/panels/css-panel/css-style.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/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); |