diff options
author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js | |
parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
download | ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/document/document-html.js
js/document/templates/app/main.js
js/panels/Panel.reel/Panel.js
node_modules/montage/ui/native-control.js
Signed-off-by: Armen Kesablyan <armen@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.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: { |