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/style-sheets-view.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/style-sheets-view.reel')
| -rw-r--r-- | js/panels/css-panel/style-sheets-view.reel/style-sheets-view.html | 2 | ||||
| -rw-r--r-- | js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.html b/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.html index db2784c0..19b90bc5 100644 --- a/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.html +++ b/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.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/style-sheets-view.reel/style-sheets-view.js b/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js index 57f4bda3..2e0d97df 100644 --- a/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js +++ b/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js | |||
| @@ -75,7 +75,7 @@ exports.StyleSheetsView = Montage.create(Component, { | |||
| 75 | }, | 75 | }, |
| 76 | set: function(label) { | 76 | set: function(label) { |
| 77 | if(label === this._documentName) { return false; } | 77 | if(label === this._documentName) { return false; } |
| 78 | 78 | ||
| 79 | this._documentName = label; | 79 | this._documentName = label; |
| 80 | this.needsDraw = true; | 80 | this.needsDraw = true; |
| 81 | } | 81 | } |
| @@ -147,7 +147,7 @@ exports.StyleSheetsView = Montage.create(Component, { | |||
| 147 | 147 | ||
| 148 | /// App event handlers | 148 | /// App event handlers |
| 149 | /// -------------------------------- | 149 | /// -------------------------------- |
| 150 | 150 | ||
| 151 | handleStyleSheetsReady : { | 151 | handleStyleSheetsReady : { |
| 152 | value: function(e) { | 152 | value: function(e) { |
| 153 | this.documentName = this.stylesController.currentDocument.name; | 153 | this.documentName = this.stylesController.currentDocument.name; |
| @@ -183,7 +183,7 @@ exports.StyleSheetsView = Montage.create(Component, { | |||
| 183 | 183 | ||
| 184 | /// Draw cycle | 184 | /// Draw cycle |
| 185 | /// -------------------------------- | 185 | /// -------------------------------- |
| 186 | 186 | ||
| 187 | templateDidLoad : { | 187 | templateDidLoad : { |
| 188 | value: function() { | 188 | value: function() { |
| 189 | this.stylesController = this.application.ninja.stylesController; | 189 | this.stylesController = this.application.ninja.stylesController; |
| @@ -206,7 +206,7 @@ exports.StyleSheetsView = Montage.create(Component, { | |||
| 206 | if(this.height) { | 206 | if(this.height) { |
| 207 | this.styleSheetList.element.style.height = (this.height + this._resizedHeight) + "px"; | 207 | this.styleSheetList.element.style.height = (this.height + this._resizedHeight) + "px"; |
| 208 | } | 208 | } |
| 209 | 209 | ||
| 210 | if(this.documentName && this.documentNameLabel) { | 210 | if(this.documentName && this.documentNameLabel) { |
| 211 | this.documentNameLabel.innerHTML = this.documentName; | 211 | this.documentNameLabel.innerHTML = this.documentName; |
| 212 | this.documentNameLabel.classList.remove(this.noDocumentLabelClass); | 212 | this.documentNameLabel.classList.remove(this.noDocumentLabelClass); |