diff options
author | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
commit | 263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch) | |
tree | 7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/components/layout/tools-list.reel | |
parent | 1bb2778224982aea7b9781c6559bb659983a400f (diff) | |
parent | a827f2769d75848c0ba0bff03a927c1f2706322b (diff) | |
download | ninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz |
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts:
js/panels/properties.reel/sections/position-size.reel/position-size.html
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/components/layout/tools-list.reel')
-rwxr-xr-x | js/components/layout/tools-list.reel/tools-list.html | 5 | ||||
-rwxr-xr-x | js/components/layout/tools-list.reel/tools-list.js | 106 |
2 files changed, 90 insertions, 21 deletions
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: { | ||
83 | value: null, | ||
84 | serializable: true | ||
85 | }, | ||
86 | |||
87 | RotateStageTool3D: { | ||
88 | value: null, | ||
89 | serializable: true | ||
90 | }, | ||
91 | |||
92 | PanTool: { | ||
93 | value: null, | ||
94 | serializable: true | ||
95 | }, | ||
96 | |||
97 | ZoomTool: { | ||
98 | value: null, | ||
99 | serializable: true | ||
100 | }, | ||
29 | 101 | ||
30 | _currentDocument: { | 102 | _currentDocument: { |
31 | enumerable: false, | 103 | enumerable: false, |