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/rule-list-container.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/rule-list-container.reel')
| -rw-r--r-- | js/panels/css-panel/rule-list-container.reel/rule-list-container.html | 2 | ||||
| -rw-r--r-- | js/panels/css-panel/rule-list-container.reel/rule-list-container.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/css-panel/rule-list-container.reel/rule-list-container.html b/js/panels/css-panel/rule-list-container.reel/rule-list-container.html index e3e9f50a..e0348d1e 100644 --- a/js/panels/css-panel/rule-list-container.reel/rule-list-container.html +++ b/js/panels/css-panel/rule-list-container.reel/rule-list-container.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/rule-list-container.reel/rule-list-container.js b/js/panels/css-panel/rule-list-container.reel/rule-list-container.js index 230af089..031398cb 100644 --- a/js/panels/css-panel/rule-list-container.reel/rule-list-container.js +++ b/js/panels/css-panel/rule-list-container.reel/rule-list-container.js | |||
| @@ -200,9 +200,9 @@ exports.RuleListContainer = Montage.create(Component, { | |||
| 200 | }, this); | 200 | }, this); |
| 201 | this.ruleListsToDraw.length = 0; | 201 | this.ruleListsToDraw.length = 0; |
| 202 | } | 202 | } |
| 203 | 203 | ||
| 204 | }, | 204 | }, |
| 205 | 205 | ||
| 206 | didDraw: { | 206 | didDraw: { |
| 207 | value: function() { | 207 | value: function() { |
| 208 | if(this.ruleListDrawn === true) { | 208 | if(this.ruleListDrawn === true) { |