aboutsummaryrefslogtreecommitdiff
path: root/js/panels/css-panel/style-sheet.reel
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/style-sheet.reel
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/style-sheet.reel')
-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
2 files changed, 32 insertions, 1 deletions
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 7e27dd93..d08453fa 100644
--- a/js/panels/css-panel/style-sheet.reel/style-sheet.html
+++ b/js/panels/css-panel/style-sheet.reel/style-sheet.html
@@ -27,7 +27,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
27 "properties": { 27 "properties": {
28 "element": {"#": "sheet-name"}, 28 "element": {"#": "sheet-name"},
29 "identifier": "nameText", 29 "identifier": "nameText",
30 "defaultText": "Style sheet" 30 "defaultValue": "Style sheet"
31 }, 31 },
32 "bindings": { 32 "bindings": {
33 "value": {"<-": "@owner.name"} 33 "value": {"<-": "@owner.name"}
diff --git a/js/panels/css-panel/style-sheet.reel/style-sheet.js b/js/panels/css-panel/style-sheet.reel/style-sheet.js
index cb69d25b..8ce8da0e 100644
--- a/js/panels/css-panel/style-sheet.reel/style-sheet.js
+++ b/js/panels/css-panel/style-sheet.reel/style-sheet.js
@@ -8,6 +8,37 @@ var Montage = require("montage/core/core").Montage,
8 Component = require("montage/ui/component").Component; 8 Component = require("montage/ui/component").Component;
9 9
10exports.StyleSheet = Montage.create(Component, { 10exports.StyleSheet = Montage.create(Component, {
11
12 nameText: {
13 value: null,
14 serializable: true
15 },
16
17 mediaInput: {
18 value: null,
19 serializable: true
20 },
21
22 editButton: {
23 value: null,
24 serializable: true
25 },
26
27 editView: {
28 value: null,
29 serializable: true
30 },
31
32 disableButton: {
33 value: null,
34 serializable: true
35 },
36
37 deleteButton: {
38 value: null,
39 serializable: true
40 },
41
11 _translateDistance: { 42 _translateDistance: {
12 value: null 43 value: null
13 }, 44 },