diff options
Diffstat (limited to 'js/components/layout')
10 files changed, 211 insertions, 57 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html index 0dabc781..68f3be2b 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.html +++ b/js/components/layout/bread-crumb.reel/bread-crumb.html | |||
@@ -40,7 +40,7 @@ | |||
40 | "buttonsListController": { | 40 | "buttonsListController": { |
41 | "prototype": "montage/ui/controller/array-controller", | 41 | "prototype": "montage/ui/controller/array-controller", |
42 | "bindings": { | 42 | "bindings": { |
43 | "content": {"<<->": "@owner.containerElements"} | 43 | "content": {"<->": "@owner.containerElements"} |
44 | } | 44 | } |
45 | }, | 45 | }, |
46 | 46 | ||
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js index 260922b3..2f493102 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.js +++ b/js/components/layout/bread-crumb.reel/bread-crumb.js | |||
@@ -9,6 +9,11 @@ var Montage = require("montage/core/core").Montage, | |||
9 | 9 | ||
10 | exports.Breadcrumb = Montage.create(Component, { | 10 | exports.Breadcrumb = Montage.create(Component, { |
11 | 11 | ||
12 | breadcrumbBt: { | ||
13 | value: null, | ||
14 | serializable: true | ||
15 | }, | ||
16 | |||
12 | _currentDocument: { | 17 | _currentDocument: { |
13 | enumerable: false, | 18 | enumerable: false, |
14 | value: null | 19 | value: null |
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html index a35b5590..889160ad 100755 --- a/js/components/layout/document-bar.reel/document-bar.html +++ b/js/components/layout/document-bar.reel/document-bar.html | |||
@@ -45,8 +45,6 @@ | |||
45 | "prototype": "js/components/layout/document-bar.reel", | 45 | "prototype": "js/components/layout/document-bar.reel", |
46 | "properties": { | 46 | "properties": { |
47 | "element": {"#": "documentBar"}, | 47 | "element": {"#": "documentBar"}, |
48 | "designView": {"#": "design"}, | ||
49 | "codeView": {"#": "code"}, | ||
50 | "zoomControl": {"@": "hottext1"} | 48 | "zoomControl": {"@": "hottext1"} |
51 | } | 49 | } |
52 | } | 50 | } |
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js index 1cb0bd90..74ba11c2 100755 --- a/js/components/layout/document-bar.reel/document-bar.js +++ b/js/components/layout/document-bar.reel/document-bar.js | |||
@@ -61,7 +61,8 @@ exports.DocumentBar = Montage.create(Component, { | |||
61 | }, | 61 | }, |
62 | 62 | ||
63 | zoomControl: { | 63 | zoomControl: { |
64 | value: null | 64 | value: null, |
65 | serializable: true | ||
65 | }, | 66 | }, |
66 | 67 | ||
67 | _type: { | 68 | _type: { |
@@ -148,8 +149,8 @@ exports.DocumentBar = Montage.create(Component, { | |||
148 | 149 | ||
149 | prepareForDraw: { | 150 | prepareForDraw: { |
150 | value: function() { | 151 | value: function() { |
151 | this.designView.addEventListener("click", this, false); | 152 | // this.designView.addEventListener("click", this, false); |
152 | this.codeView.addEventListener("click", this, false); | 153 | // this.codeView.addEventListener("click", this, false); |
153 | 154 | ||
154 | } | 155 | } |
155 | }, | 156 | }, |
diff --git a/js/components/layout/documents-tab.reel/documents-tab.js b/js/components/layout/documents-tab.reel/documents-tab.js index 41c98b30..b72056f8 100755 --- a/js/components/layout/documents-tab.reel/documents-tab.js +++ b/js/components/layout/documents-tab.reel/documents-tab.js | |||
@@ -9,6 +9,7 @@ var Component = require("montage/ui/component").Component; | |||
9 | 9 | ||
10 | exports.DocumentsTab = Montage.create(Component, { | 10 | exports.DocumentsTab = Montage.create(Component, { |
11 | contentController: { | 11 | contentController: { |
12 | value: null | 12 | value: null, |
13 | serializable: true | ||
13 | } | 14 | } |
14 | }); \ No newline at end of file | 15 | }); \ No newline at end of file |
diff --git a/js/components/layout/tool-button.reel/tool-button.html b/js/components/layout/tool-button.reel/tool-button.html index a329f646..936c47ef 100755 --- a/js/components/layout/tool-button.reel/tool-button.html +++ b/js/components/layout/tool-button.reel/tool-button.html | |||
@@ -18,7 +18,7 @@ | |||
18 | "element": {"#": "toolBarButton"} | 18 | "element": {"#": "toolBarButton"} |
19 | }, | 19 | }, |
20 | "bindings": { | 20 | "bindings": { |
21 | "selected": {"<<->": "@owner.data.selected"}, | 21 | "selected": {"<->": "@owner.data.selected"}, |
22 | "subselected": {"<-": "@owner.data.subtools.selected"} | 22 | "subselected": {"<-": "@owner.data.subtools.selected"} |
23 | } | 23 | } |
24 | } | 24 | } |
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html index 4e5b85ee..3a9661f5 100755 --- a/js/components/layout/tools-list.reel/tools-list.html +++ b/js/components/layout/tools-list.reel/tools-list.html | |||
@@ -126,10 +126,7 @@ | |||
126 | "EraserTool": {"@": "EraserTool1"}, | 126 | "EraserTool": {"@": "EraserTool1"}, |
127 | "RotateStageTool3D": {"@": "RotateStageTool3D1"}, | 127 | "RotateStageTool3D": {"@": "RotateStageTool3D1"}, |
128 | "PanTool": {"@": "PanTool1"}, | 128 | "PanTool": {"@": "PanTool1"}, |
129 | "ZoomTool": {"@": "ZoomTool1"}, | 129 | "ZoomTool": {"@": "ZoomTool1"} |
130 | "components": [ | ||
131 | {"@": "repetition1"} | ||
132 | ] | ||
133 | } | 130 | } |
134 | } | 131 | } |
135 | } | 132 | } |
diff --git a/js/components/layout/tools-list.reel/tools-list.js b/js/components/layout/tools-list.reel/tools-list.js index c46c065e..e36001a3 100755 --- a/js/components/layout/tools-list.reel/tools-list.js +++ b/js/components/layout/tools-list.reel/tools-list.js | |||
@@ -9,23 +9,95 @@ var Component = require("montage/ui/component").Component; | |||
9 | 9 | ||
10 | exports.ToolsList = Montage.create(Component, { | 10 | exports.ToolsList = Montage.create(Component, { |
11 | 11 | ||
12 | SelectionTool: { value: null }, | 12 | toolsData: { |
13 | Rotate3DTool: { value: null }, | 13 | value: null, |
14 | Translate3DTool: { value: null }, | 14 | serializable: true |
15 | TagTool: { value: null }, | 15 | }, |
16 | PenTool: { value: null }, | 16 | |
17 | TextTool: { value: null }, | 17 | SelectionTool: { |
18 | ShapeTool: { value: null }, | 18 | value: null, |
19 | OvalTool: { value: null }, | 19 | serializable: true |
20 | RectTool: { value: null }, | 20 | }, |
21 | LineTool: { value: null }, | 21 | |
22 | BrushTool: { value: null }, | 22 | Rotate3DTool: { |
23 | FillTool: { value: null }, | 23 | value: null, |
24 | InkBottleTool: { value: null }, | 24 | serializable: true |
25 | EraserTool: { value: null }, | 25 | }, |
26 | RotateStageTool3D: { value: null }, | 26 | |
27 | PanTool: { value: null }, | 27 | Translate3DTool: { |
28 | ZoomTool: { value: null }, | 28 | value: null, |
29 | serializable: true | ||
30 | }, | ||
31 | |||
32 | TagTool: { | ||
33 | value: null, | ||
34 | serializable: true | ||
35 | }, | ||
36 | |||
37 | PenTool: { | ||
38 | value: null, | ||
39 | serializable: true | ||
40 | }, | ||
41 | |||
42 | TextTool: { | ||
43 | value: null, | ||
44 | serializable: true | ||
45 | }, | ||
46 | |||
47 | ShapeTool: { | ||
48 | value: null, | ||
49 | serializable: true | ||
50 | }, | ||
51 | |||
52 | OvalTool: { | ||
53 | value: null, | ||
54 | serializable: true | ||
55 | }, | ||
56 | |||
57 | RectTool: { | ||
58 | value: null, | ||
59 | serializable: true | ||
60 | }, | ||
61 | |||
62 | LineTool: { | ||
63 | value: null, | ||
64 | serializable: true | ||
65 | }, | ||
66 | |||
67 | BrushTool: { | ||
68 | value: null, | ||
69 | serializable: true | ||
70 | }, | ||
71 | |||
72 | FillTool: { | ||
73 | value: null, | ||
74 | serializable: true | ||
75 | }, | ||
76 | |||
77 | InkBottleTool: { | ||
78 | value: null, | ||
79 | serializable: true | ||
80 | }, | ||
81 | |||
82 | EraserTool: { |