diff options
author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/panels/css-panel/style-sheets-view.reel | |
parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.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.js | 13 |
1 files changed, 12 insertions, 1 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 9e3b4a49..c090a1fc 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 | |||
@@ -8,13 +8,24 @@ var Montage = require("montage/core/core").Montage, | |||
8 | Component = require("montage/ui/component").Component; | 8 | Component = require("montage/ui/component").Component; |
9 | 9 | ||
10 | exports.StyleSheetsView = Montage.create(Component, { | 10 | exports.StyleSheetsView = Montage.create(Component, { |
11 | |||
12 | toolbar: { | ||
13 | value: null, | ||
14 | serializable: true | ||
15 | }, | ||
16 | |||
17 | styleSheetList: { | ||
18 | value: null, | ||
19 | serializable: true | ||
20 | }, | ||
21 | |||
11 | documentLoaded : { value: false }, | 22 | documentLoaded : { value: false }, |
12 | showToolbar : { value: false }, | 23 | showToolbar : { value: false }, |
13 | stylesController : { value: null }, | 24 | stylesController : { value: null }, |
14 | styleSheets : { value: [] }, | 25 | styleSheets : { value: [] }, |
15 | _initView : { value: false }, | 26 | _initView : { value: false }, |
16 | _needsScroll : { value: false }, | 27 | _needsScroll : { value: false }, |
17 | documentNameLabel : { value: null }, | 28 | documentNameLabel : { value: null, serializable: true }, |
18 | noDocumentLabelClass : { value: "no-document" }, | 29 | noDocumentLabelClass : { value: "no-document" }, |
19 | 30 | ||
20 | _activeDocument: { | 31 | _activeDocument: { |