diff options
author | Jose Antonio Marquez | 2012-05-16 16:23:05 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-05-16 16:23:05 -0700 |
commit | d59cb51c275fbbef84604f9ed77afedba8168099 (patch) | |
tree | 7d3f51c20eb6b6940c1ce648d828fa1e2d8d510b /js/components/layout | |
parent | 857aafee732b6a85fa155ff4a05d1b8fde48f09d (diff) | |
parent | 92fcb770aff434e994e7a39a61d8fac4a017dca0 (diff) | |
download | ninja-d59cb51c275fbbef84604f9ed77afedba8168099.tar.gz |
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Diffstat (limited to 'js/components/layout')
4 files changed, 4 insertions, 46 deletions
diff --git a/js/components/layout/document-entry.reel/document-entry.js b/js/components/layout/document-entry.reel/document-entry.js index 4d09a362..ad0236c6 100755 --- a/js/components/layout/document-entry.reel/document-entry.js +++ b/js/components/layout/document-entry.reel/document-entry.js | |||
@@ -33,8 +33,10 @@ exports.DocumentEntry = Montage.create(Component, { | |||
33 | } | 33 | } |
34 | 34 | ||
35 | this._document = value; | 35 | this._document = value; |
36 | this._uuid = value.uuid; | 36 | |
37 | //this.needsDraw = true; | 37 | if(value) { |
38 | this._uuid = value.uuid; | ||
39 | } | ||
38 | } | 40 | } |
39 | }, | 41 | }, |
40 | 42 | ||
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html index 9aa05e5d..d5c33624 100755 --- a/js/components/layout/tools-list.reel/tools-list.html +++ b/js/components/layout/tools-list.reel/tools-list.html | |||
@@ -55,9 +55,6 @@ | |||
55 | "SelectionTool1": { | 55 | "SelectionTool1": { |
56 | "prototype": "js/tools/SelectionTool" | 56 | "prototype": "js/tools/SelectionTool" |
57 | }, | 57 | }, |
58 | "SubselectionTool1": { | ||
59 | "prototype": "js/tools/SubSelectTool" | ||
60 | }, | ||
61 | "Rotate3DTool1": { | 58 | "Rotate3DTool1": { |
62 | "prototype": "js/tools/RotateObject3DTool" | 59 | "prototype": "js/tools/RotateObject3DTool" |
63 | }, | 60 | }, |
@@ -85,9 +82,6 @@ | |||
85 | "LineTool1": { | 82 | "LineTool1": { |
86 | "prototype": "js/tools/LineTool" | 83 | "prototype": "js/tools/LineTool" |
87 | }, | 84 | }, |
88 | "PencilTool1": { | ||
89 | "prototype": "js/tools/PencilTool" | ||
90 | }, | ||
91 | "BrushTool1": { | 85 | "BrushTool1": { |
92 | "prototype": "js/tools/BrushTool" | 86 | "prototype": "js/tools/BrushTool" |
93 | }, | 87 | }, |
@@ -97,9 +91,6 @@ | |||
97 | "InkBottleTool1": { | 91 | "InkBottleTool1": { |
98 | "prototype": "js/tools/InkBottleTool" | 92 | "prototype": "js/tools/InkBottleTool" |
99 | }, | 93 | }, |
100 | "EyedropperTool1": { | ||
101 | "prototype": "js/tools/EyedropperTool" | ||
102 | }, | ||
103 | "EraserTool1": { | 94 | "EraserTool1": { |
104 | "prototype": "js/tools/EraserTool" | 95 | "prototype": "js/tools/EraserTool" |
105 | }, | 96 | }, |
@@ -132,7 +123,6 @@ | |||
132 | "properties": { | 123 | "properties": { |
133 | "element": {"#": "toolsList"}, | 124 | "element": {"#": "toolsList"}, |
134 | "SelectionTool": {"@": "SelectionTool1"}, | 125 | "SelectionTool": {"@": "SelectionTool1"}, |
135 | "SubselectionTool": {"@": "SubselectionTool1"}, | ||
136 | "Rotate3DTool": {"@": "Rotate3DTool1"}, | 126 | "Rotate3DTool": {"@": "Rotate3DTool1"}, |
137 | "Translate3DTool": {"@": "Translate3DTool1"}, | 127 | "Translate3DTool": {"@": "Translate3DTool1"}, |
138 | "TagTool": {"@": "TagTool1"}, | 128 | "TagTool": {"@": "TagTool1"}, |
@@ -142,11 +132,9 @@ | |||
142 | "OvalTool": {"@": "OvalTool1"}, | 132 | "OvalTool": {"@": "OvalTool1"}, |
143 | "RectTool": {"@": "RectTool1"}, | 133 | "RectTool": {"@": "RectTool1"}, |
144 | "LineTool": {"@": "LineTool1"}, | 134 | "LineTool": {"@": "LineTool1"}, |
145 | "PencilTool": {"@": "PencilTool1"}, | ||
146 | "BrushTool": {"@": "BrushTool1"}, | 135 | "BrushTool": {"@": "BrushTool1"}, |
147 | "FillTool": {"@": "FillTool1"}, | 136 | "FillTool": {"@": "FillTool1"}, |
148 | "InkBottleTool": {"@": "InkBottleTool1"}, | 137 | "InkBottleTool": {"@": "InkBottleTool1"}, |
149 | "EyedropperTool": {"@": "EyedropperTool1"}, | ||
150 | "EraserTool": {"@": "EraserTool1"}, | 138 | "EraserTool": {"@": "EraserTool1"}, |
151 | "RotateStageTool3D": {"@": "RotateStageTool3D1"}, | 139 | "RotateStageTool3D": {"@": "RotateStageTool3D1"}, |
152 | "PanTool": {"@": "PanTool1"}, | 140 | "PanTool": {"@": "PanTool1"}, |
@@ -169,8 +157,6 @@ | |||
169 | <hr /> | 157 | <hr /> |
170 | </div> | 158 | </div> |
171 | </div> | 159 | </div> |
172 | <!-- TODO: Remove and add as a component --> | ||
173 | <div id="colortoolbar"></div> | ||
174 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> | 160 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> |
175 | </div> | 161 | </div> |
176 | 162 | ||
diff --git a/js/components/layout/tools-list.reel/tools-list.js b/js/components/layout/tools-list.reel/tools-list.js index d68e8a56..a10b6c3e 100755 --- a/js/components/layout/tools-list.reel/tools-list.js +++ b/js/components/layout/tools-list.reel/tools-list.js | |||
@@ -10,7 +10,6 @@ var Component = require("montage/ui/component").Component; | |||
10 | exports.ToolsList = Montage.create(Component, { | 10 | exports.ToolsList = Montage.create(Component, { |
11 | 11 | ||
12 | SelectionTool: { value: null }, | 12 | SelectionTool: { value: null }, |
13 | SubselectionTool: { value: null }, | ||
14 | Rotate3DTool: { value: null }, | 13 | Rotate3DTool: { value: null }, |
15 | Translate3DTool: { value: null }, | 14 | Translate3DTool: { value: null }, |
16 | TagTool: { value: null }, | 15 | TagTool: { value: null }, |
@@ -20,11 +19,9 @@ exports.ToolsList = Montage.create(Component, { | |||
20 | OvalTool: { value: null }, | 19 | OvalTool: { value: null }, |
21 | RectTool: { value: null }, | 20 | RectTool: { value: null }, |
22 | LineTool: { value: null }, | 21 | LineTool: { value: null }, |
23 | PencilTool: { value: null }, | ||
24 | BrushTool: { value: null }, | 22 | BrushTool: { value: null }, |
25 | FillTool: { value: null }, | 23 | FillTool: { value: null }, |
26 | InkBottleTool: { value: null }, | 24 | InkBottleTool: { value: null }, |
27 | EyedropperTool: { value: null }, | ||
28 | EraserTool: { value: null }, | 25 | EraserTool: { value: null }, |
29 | RotateStageTool3D: { value: null }, | 26 | RotateStageTool3D: { value: null }, |
30 | PanTool: { value: null }, | 27 | PanTool: { value: null }, |
@@ -53,7 +50,6 @@ exports.ToolsList = Montage.create(Component, { | |||
53 | this.PenTool.options = this.application.ninja.toolsProperties.shapeProperties.lineProperties;//this.application.Ninja.toolsProperties.penProperties; | 50 | this.PenTool.options = this.application.ninja.toolsProperties.shapeProperties.lineProperties;//this.application.Ninja.toolsProperties.penProperties; |
54 | 51 | ||
55 | this.SelectionTool.options = this.application.ninja.toolsProperties.selectionProperties; | 52 | this.SelectionTool.options = this.application.ninja.toolsProperties.selectionProperties; |
56 | this.SubselectionTool.options = this.application.ninja.toolsProperties.subSelectionProperties; | ||
57 | 53 | ||
58 | this.Rotate3DTool.options = this.application.ninja.toolsProperties.rotate3DProperties; | 54 | this.Rotate3DTool.options = this.application.ninja.toolsProperties.rotate3DProperties; |
59 | this.Translate3DTool.options = this.application.ninja.toolsProperties.rotate3DProperties; | 55 | this.Translate3DTool.options = this.application.ninja.toolsProperties.rotate3DProperties; |
@@ -68,10 +64,8 @@ exports.ToolsList = Montage.create(Component, { | |||
68 | this.OvalTool.options = this.application.ninja.toolsProperties.shapeProperties.ovalProperties; | 64 | this.OvalTool.options = this.application.ninja.toolsProperties.shapeProperties.ovalProperties; |
69 | this.RectTool.options = this.application.ninja.toolsProperties.shapeProperties.rectProperties; | 65 | this.RectTool.options = this.application.ninja.toolsProperties.shapeProperties.rectProperties; |
70 | this.LineTool.options = this.application.ninja.toolsProperties.shapeProperties.lineProperties; | 66 | this.LineTool.options = this.application.ninja.toolsProperties.shapeProperties.lineProperties; |
71 | this.PencilTool.options = this.application.ninja.toolsProperties.pencilProperties; | ||
72 | this.BrushTool.options = this.application.ninja.toolsProperties.brushProperties; | 67 | this.BrushTool.options = this.application.ninja.toolsProperties.brushProperties; |
73 | 68 | ||
74 | this.EyedropperTool.options = this.application.ninja.toolsProperties.eyedropperProperties; | ||
75 | this.EraserTool.options = this.application.ninja.toolsProperties.eraserProperties; | 69 | this.EraserTool.options = this.application.ninja.toolsProperties.eraserProperties; |
76 | this.RotateStageTool3D.options = this.application.ninja.toolsProperties.rotateStageProperties; | 70 | this.RotateStageTool3D.options = this.application.ninja.toolsProperties.rotateStageProperties; |
77 | this.PanTool.options = this.application.ninja.toolsProperties.panProperties; | 71 | this.PanTool.options = this.application.ninja.toolsProperties.panProperties; |
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html index 10309ec4..e7d1ac8b 100755 --- a/js/components/layout/tools-properties.reel/tools-properties.html +++ b/js/components/layout/tools-properties.reel/tools-properties.html | |||
@@ -18,12 +18,6 @@ | |||
18 | "element": {"#": "selectionProperties"} | 18 | "element": {"#": "selectionProperties"} |
19 | } | 19 | } |
20 | }, | 20 | }, |
21 | "subSelectionProperties1": { | ||
22 | "prototype": "js/components/tools-properties/subselection-properties.reel[SubSelectionProperties]", | ||
23 | "properties": { | ||
24 | "element": {"#": "subSelectionProperties"} | ||
25 | } | ||
26 | }, | ||
27 | "object3DProperties1": { | 21 | "object3DProperties1": { |
28 | "prototype": "js/components/tools-properties/object3d-properties.reel[Object3DProperties]", | 22 | "prototype": "js/components/tools-properties/object3d-properties.reel[Object3DProperties]", |
29 | "properties": { | 23 | "properties": { |
@@ -66,12 +60,6 @@ | |||
66 | } | 60 | } |
67 | } | 61 | } |
68 | }, | 62 | }, |
69 | "pencilProperties1": { | ||
70 | "prototype": "js/components/tools-properties/pencil-properties.reel", | ||
71 | "properties": { | ||
72 | "element": {"#": "pencilProperties"} | ||
73 | } | ||
74 | }, | ||
75 | "brushProperties1": { | 63 | "brushProperties1": { |
76 | "prototype": "js/components/tools-properties/brush-properties.reel", | 64 | "prototype": "js/components/tools-properties/brush-properties.reel", |
77 | "properties": { | 65 | "properties": { |
@@ -90,12 +78,6 @@ | |||
90 | "element": {"#": "inkbottleProperties"} | 78 | "element": {"#": "inkbottleProperties"} |
91 | } | 79 | } |
92 | }, | 80 | }, |
93 | "eyedropperProperties1": { | ||
94 | "prototype": "js/components/tools-properties/eyedropper-properties.reel", | ||
95 | "properties": { | ||
96 | "element": {"#": "eyedropperProperties"} | ||
97 | } | ||
98 | }, |