aboutsummaryrefslogtreecommitdiff
path: root/js/panels/css-panel
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels/css-panel
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-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')
-rw-r--r--js/panels/css-panel/css-panel.reel/css-panel.html2
-rw-r--r--js/panels/css-panel/css-style.reel/css-style.html2
-rw-r--r--js/panels/css-panel/css-style.reel/css-style.js2
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html2
-rw-r--r--js/panels/css-panel/rule-list-container.reel/rule-list-container.html2
-rw-r--r--js/panels/css-panel/rule-list-container.reel/rule-list-container.js4
-rw-r--r--js/panels/css-panel/rule-list.reel/rule-list.html2
-rw-r--r--js/panels/css-panel/style-declaration.reel/style-declaration.html2
-rw-r--r--js/panels/css-panel/style-sheet.reel/style-sheet.html2
-rw-r--r--js/panels/css-panel/style-sheets-view.reel/style-sheets-view.html2
-rw-r--r--js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js8
-rw-r--r--js/panels/css-panel/styles-view-container.reel/styles-view-container.html2
12 files changed, 16 insertions, 16 deletions
diff --git a/js/panels/css-panel/css-panel.reel/css-panel.html b/js/panels/css-panel/css-panel.reel/css-panel.html
index 74d7a962..324d3112 100644
--- a/js/panels/css-panel/css-panel.reel/css-panel.html
+++ b/js/panels/css-panel/css-panel.reel/css-panel.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
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>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All 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);
diff --git a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html
index cbdd474a..dc88fb2a 100644
--- a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html
+++ b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
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>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All 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) {
diff --git a/js/panels/css-panel/rule-list.reel/rule-list.html b/js/panels/css-panel/rule-list.reel/rule-list.html
index 0009e6ee..f0bba1ed 100644
--- a/js/panels/css-panel/rule-list.reel/rule-list.html
+++ b/js/panels/css-panel/rule-list.reel/rule-list.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
diff --git a/js/panels/css-panel/style-declaration.reel/style-declaration.html b/js/panels/css-panel/style-declaration.reel/style-declaration.html
index e1576e27..5422e732 100644
--- a/js/panels/css-panel/style-declaration.reel/style-declaration.html
+++ b/js/panels/css-panel/style-declaration.reel/style-declaration.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
diff --git a/js/panels/css-panel/style-sheet.reel/style-sheet.html b/js/panels/css-panel/style-sheet.reel/style-sheet.html
index 6905f3df..f037a17e 100644
--- a/js/panels/css-panel/style-sheet.reel/style-sheet.html
+++ b/js/panels/css-panel/style-sheet.reel/style-sheet.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
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>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All 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);
diff --git a/js/panels/css-panel/styles-view-container.reel/styles-view-container.html b/js/panels/css-panel/styles-view-container.reel/styles-view-container.html
index 1b781bbc..7690e2df 100644
--- a/js/panels/css-panel/styles-view-container.reel/styles-view-container.html
+++ b/js/panels/css-panel/styles-view-container.reel/styles-view-container.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 05:27:14 +0000