aboutsummaryrefslogtreecommitdiff
path: root/js/panels/css-panel
diff options
context:
space:
mode:
authorJon Reid2012-06-15 10:10:41 -0700
committerJon Reid2012-06-15 10:10:41 -0700
commit526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch)
tree65939e59615aaa10a7db77211e71616ad531bd0e /js/panels/css-panel
parentb5b760ee82e5cc4da176914983a6002cbf86c11a (diff)
parent5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff)
downloadninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'js/panels/css-panel')
-rw-r--r--js/panels/css-panel/css-panel.reel/css-panel.js10
-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.js21
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html23
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js5
-rw-r--r--js/panels/css-panel/rule-list-container.reel/rule-list-container.js10
-rw-r--r--js/panels/css-panel/rule-list.reel/rule-list.js5
-rw-r--r--js/panels/css-panel/style-declaration.reel/style-declaration.html6
-rw-r--r--js/panels/css-panel/style-declaration.reel/style-declaration.js12
-rw-r--r--js/panels/css-panel/style-sheet.reel/style-sheet.html2
-rw-r--r--js/panels/css-panel/style-sheet.reel/style-sheet.js31
-rw-r--r--js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js13
-rw-r--r--js/panels/css-panel/styles-view-container.reel/styles-view-container.html1
-rw-r--r--js/panels/css-panel/styles-view-container.reel/styles-view-container.js19
-rw-r--r--js/panels/css-panel/styles-view-delegate.js6
15 files changed, 137 insertions, 29 deletions
diff --git a/js/panels/css-panel/css-panel.reel/css-panel.js b/js/panels/css-panel/css-panel.reel/css-panel.js
index 96d94b36..a2a288c9 100644
--- a/js/panels/css-panel/css-panel.reel/css-panel.js
+++ b/js/panels/css-panel/css-panel.reel/css-panel.js
@@ -9,6 +9,16 @@ var Montage = require("montage/core/core").Montage,
9 9
10exports.CssPanel = Montage.create(Component, { 10exports.CssPanel = Montage.create(Component, {
11 11
12 styleSheetsView: {
13 value: null,
14 serializable: true
15 },
16
17 stylesViewContainer: {
18 value: null,
19 serializable: true
20 },
21
12 _currentDocument: { 22 _currentDocument: {
13 value : null 23 value : null
14 }, 24 },
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 00cebf39..0f16b3d8 100644
--- a/js/panels/css-panel/css-style.reel/css-style.html
+++ b/js/panels/css-panel/css-style.reel/css-style.html
@@ -30,7 +30,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
30 "checked": true 30 "checked": true
31 }, 31 },
32 "bindings": { 32 "bindings": {
33 "checked" : {"<<->": "@owner.enabled" } 33 "checked" : {"<->": "@owner.enabled" }
34 } 34 }
35 }, 35 },
36 "property": { 36 "property": {
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 84841f5b..294d49a9 100644
--- a/js/panels/css-panel/css-style.reel/css-style.js
+++ b/js/panels/css-panel/css-style.reel/css-style.js
@@ -8,6 +8,27 @@ var Montage = require("montage/core/core").Montage,
8 Component = require("montage/ui/component").Component; 8 Component = require("montage/ui/component").Component;
9 9
10exports.CssStyle = Montage.create(Component, { 10exports.CssStyle = Montage.create(Component, {
11 declaration: {
12 value: null
13 },
14
15 addStyleButton: {
16 value: null,
17 serializable: true
18 },
19
20 propertyField: {
21 value: null
22 },
23
24 valueField: {
25 value: null
26 },
27
28 propertyNames: {
29 value: null
30 },
31
11 delegate : { value: null }, 32 delegate : { value: null },
12 disabledClass : { value: 'style-item-disabled' }, 33 disabledClass : { value: 'style-item-disabled' },
13 editingStyleClass : { value: 'edit-style-item' }, 34 editingStyleClass : { value: 'edit-style-item' },
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 f203b61f..8b0c3101 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
@@ -34,7 +34,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
34 "element": {"#": "rule-selector"} 34 "element": {"#": "rule-selector"}
35 }, 35 },
36 "bindings": { 36 "bindings": {
37 "value" : {"<<->":"@owner.selector" } 37 "value" : {"<->":"@owner.selector" }
38 } 38 }
39 }, 39 },
40 "declaration": { 40 "declaration": {
@@ -56,27 +56,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
56 } 56 }
57 } 57 }
58 </script> 58 </script>
59 <script type="text/json">
60 "declaration": {
61 "module": "js/panels/css-panel/declaration.reel",
62 "name": "Declaration",
63 "properties": {
64 "element": {"#": "declaration-list"}
65 },
66 "bindings": {
67 "focusDelegate" : {
68 "boundObject": {"@": "owner"},
69 "boundObjectPropertyPath": "focusDelegate",
70 "oneway": true
71 },
72 "declaration" : {
73 "boundObject": {"@": "owner"},
74 "boundObjectPropertyPath": "_declaration",
75 "oneway": true
76 }
77 }
78 },
79 </script>
80</head> 59</head>
81<body> 60<body>
82<li data-montage-id="rule-item" class="css-style-rule-item"> 61<li data-montage-id="rule-item" class="css-style-rule-item">
diff --git a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js
index 54181bf3..5361e5cc 100644
--- a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js
+++ b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js
@@ -8,6 +8,11 @@ var Montage = require("montage/core/core").Montage,
8 Component = require("montage/ui/component").Component; 8 Component = require("montage/ui/component").Component;
9 9
10exports.CssStyleRule = Montage.create(Component, { 10exports.CssStyleRule = Montage.create(Component, {
11
12 selectorField: {
13 value: null
14 },
15
11 addClassNameOnChange : { 16 addClassNameOnChange : {
12 value: null 17 value: null
13 }, 18 },
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 c7766d08..509ca565 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
@@ -8,6 +8,16 @@ var Montage = require("montage/core/core").Montage,
8 Component = require("montage/ui/component").Component; 8 Component = require("montage/ui/component").Component;
9 9
10exports.RuleListContainer = Montage.create(Component, { 10exports.RuleListContainer = Montage.create(Component, {
11 focusDelegate: {
12 value: null,
13 serializable: true
14 },
15
16 ruleListComponent: {
17 value: null,
18 serializable: true
19 },
20
11 _instanceToAdd : { value: null }, 21 _instanceToAdd : { value: null },
12 _appendElement : { value: null }, 22 _appendElement : { value: null },
13 _lastDisplayedList : { value: null }, 23 _lastDisplayedList : { value: null },
diff --git a/js/panels/css-panel/rule-list.reel/rule-list.js b/js/panels/css-panel/rule-list.reel/rule-list.js
index 3e18c3bf..27d74b2f 100644
--- a/js/panels/css-panel/rule-list.reel/rule-list.js
+++ b/js/panels/css-panel/rule-list.reel/rule-list.js
@@ -8,6 +8,11 @@ var Montage = require("montage/core/core").Montage,
8 Component = require("montage/ui/component").Component; 8 Component = require("montage/ui/component").Component;
9 9
10exports.RuleList = Montage.create(Component, { 10exports.RuleList = Montage.create(Component, {
11 supportedRules: {
12 value: null,
13 serializable: true
14 },
15
11 focusDelegate : { value: null }, 16 focusDelegate : { value: null },
12 ruleNodeName : { value: 'li' }, 17 ruleNodeName : { value: 'li' },
13 _needsScrollToBottom: { value: null }, 18 _needsScrollToBottom: { value: null },
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 fad54453..4cdf0741 100644
--- a/js/panels/css-panel/style-declaration.reel/style-declaration.html
+++ b/js/panels/css-panel/style-declaration.reel/style-declaration.html
@@ -43,9 +43,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
43 }, 43 },
44 "bindings": { 44 "bindings": {
45 "source": {"<-": "@repetition.objectAtCurrentIteration" }, 45 "source": {"<-": "@repetition.objectAtCurrentIteration" },
46 "propertyText": {"<<->": "@repetition.objectAtCurrentIteration.name" }, 46 "propertyText": {"<->": "@repetition.objectAtCurrentIteration.name" },
47 "valueText": {"<<->": "@repetition.objectAtCurrentIteration.value" }, 47 "valueText": {"<->": "@repetition.objectAtCurrentIteration.value" },
48 "empty": {"<<->": "@repetition.objectAtCurrentIteration.isEmpty" }, 48 "empty": {"<->": "@repetition.objectAtCurrentIteration.isEmpty" },
49 "delegate": {"<-": "@owner.focusDelegate" }