aboutsummaryrefslogtreecommitdiff
path: root/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 14:35:44 -0700
committerValerio Virgillito2012-07-09 14:35:44 -0700
commit84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js
parentc0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
downloadninja-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/style-sheets-view.reel/style-sheets-view.js')
-rw-r--r--js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js8
1 files changed, 4 insertions, 4 deletions
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);