diff options
Diffstat (limited to 'js')
21 files changed, 206 insertions, 164 deletions
diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html index 2c91ca13..4448e1f1 100644 --- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html +++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html | |||
@@ -11,7 +11,7 @@ | |||
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "codeCompleteCheck":{ | 13 | "codeCompleteCheck":{ |
14 | "prototype": "montage/ui/checkbox.reel", | 14 | "prototype": "montage/ui/input-checkbox.reel", |
15 | "properties": { | 15 | "properties": { |
16 | "element": {"#": "codeComplete"} | 16 | "element": {"#": "codeComplete"} |
17 | }, | 17 | }, |
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html index 68f3be2b..ee314628 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.html +++ b/js/components/layout/bread-crumb.reel/bread-crumb.html | |||
@@ -21,7 +21,7 @@ | |||
21 | }, | 21 | }, |
22 | 22 | ||
23 | "breadCrumbButton": { | 23 | "breadCrumbButton": { |
24 | "prototype": "montage/ui/button.reel", | 24 | "prototype": "montage/ui/native/button.reel", |
25 | "properties": { | 25 | "properties": { |
26 | "element": {"#": "breadcrumb_button"} | 26 | "element": {"#": "breadcrumb_button"} |
27 | }, | 27 | }, |
diff --git a/js/components/layout/document-entry.reel/document-entry.html b/js/components/layout/document-entry.reel/document-entry.html index e68d17c5..ebaa4ccd 100755 --- a/js/components/layout/document-entry.reel/document-entry.html +++ b/js/components/layout/document-entry.reel/document-entry.html | |||
@@ -20,7 +20,7 @@ | |||
20 | }, | 20 | }, |
21 | 21 | ||
22 | "closeButton": { | 22 | "closeButton": { |
23 | "prototype": "montage/ui/button.reel", | 23 | "prototype": "montage/ui/native/button.reel", |
24 | "properties": { | 24 | "properties": { |
25 | "element": {"#": "close-btn"}, | 25 | "element": {"#": "close-btn"}, |
26 | "identifier": "closeButton" | 26 | "identifier": "closeButton" |
diff --git a/js/components/toolbar.reel/toolbar-button.js b/js/components/toolbar.reel/toolbar-button.js index 74129c2a..cfa86f76 100644 --- a/js/components/toolbar.reel/toolbar-button.js +++ b/js/components/toolbar.reel/toolbar-button.js | |||
@@ -6,7 +6,7 @@ | |||
6 | 6 | ||
7 | var Montage = require("montage").Montage, | 7 | var Montage = require("montage").Montage, |
8 | Component = require("montage/ui/component").Component, | 8 | Component = require("montage/ui/component").Component, |
9 | Button = require("montage/ui/button.reel/button").Button; | 9 | Button = require("montage/ui/native/button.reel/button").Button; |
10 | 10 | ||
11 | var ToolbarButton = exports.ToolbarButton = Montage.create(Button, { | 11 | var ToolbarButton = exports.ToolbarButton = Montage.create(Button, { |
12 | hasTemplate : { | 12 | hasTemplate : { |
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html index ca447b8b..cf68520f 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.html +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html | |||
@@ -12,7 +12,7 @@ | |||
12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
13 | { | 13 | { |
14 | "useFillColor": { | 14 | "useFillColor": { |
15 | "prototype": "montage/ui/checkbox.reel", | 15 | "prototype": "montage/ui/input-checkbox.reel", |
16 | "properties": { | 16 | "properties": { |
17 | "element": {"#": "useFillColor"}, | 17 | "element": {"#": "useFillColor"}, |
18 | "identifier": "useFillColor", | 18 | "identifier": "useFillColor", |
@@ -21,7 +21,7 @@ | |||
21 | }, | 21 | }, |
22 | 22 | ||
23 | "useWebGL": { | 23 | "useWebGL": { |
24 | "prototype": "montage/ui/checkbox.reel", | 24 | "prototype": "montage/ui/input-checkbox.reel", |
25 | "properties": { | 25 | "properties": { |
26 | "element": {"#": "useWebGL"}, | 26 | "element": {"#": "useWebGL"}, |
27 | "identifier": "useWebGL", | 27 | "identifier": "useWebGL", |
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html index 5620eed8..579930f0 100755 --- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html +++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html | |||
@@ -12,7 +12,7 @@ | |||
12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
13 | { | 13 | { |
14 | "useStrokeColor": { | 14 | "useStrokeColor": { |
15 | "prototype": "montage/ui/checkbox.reel", | 15 | "prototype": "montage/ui/input-checkbox.reel", |
16 | "properties": { | 16 | "properties": { |
17 | "element": {"#": "useStrokeColor"}, | 17 | "element": {"#": "useStrokeColor"}, |
18 | "identifier": "useStrokeColor", | 18 | "identifier": "useStrokeColor", |
@@ -21,7 +21,7 @@ | |||
21 | }, | 21 | }, |
22 | 22 | ||
23 | "useBorderWidth": { | 23 | "useBorderWidth": { |
24 | "prototype": "montage/ui/checkbox.reel", | 24 | "prototype": "montage/ui/input-checkbox.reel", |
25 | "properties": { | 25 | "properties": { |
26 | "element": {"#": "useBorderWidth"}, | 26 | "element": {"#": "useBorderWidth"}, |
27 | "identifier": "useBorderWidth", | 27 | "identifier": "useBorderWidth", |
@@ -49,7 +49,7 @@ | |||
49 | }, | 49 | }, |
50 | 50 | ||
51 | "useBorderStyle": { | 51 | "useBorderStyle": { |
52 | "prototype": "montage/ui/checkbox.reel", | 52 | "prototype": "montage/ui/input-checkbox.reel", |
53 | "properties": { | 53 | "properties": { |
54 | "element": {"#": "useBorderStyle"}, | 54 | "element": {"#": "useBorderStyle"}, |
55 | "identifier": "useBorderStyle", | 55 | "identifier": "useBorderStyle", |
@@ -65,7 +65,7 @@ | |||
65 | }, | 65 | }, |
66 | 66 | ||
67 | "useStrokeSize": { | 67 | "useStrokeSize": { |
68 | "prototype": "montage/ui/checkbox.reel", | 68 | "prototype": "montage/ui/input-checkbox.reel", |
69 | "properties": { | 69 | "properties": { |
70 | "element": {"#": "useStrokeSize"}, | 70 | "element": {"#": "useStrokeSize"}, |
71 | "identifier": "useStrokeSize", | 71 | "identifier": "useStrokeSize", |
@@ -94,7 +94,7 @@ | |||
94 | }, | 94 | }, |
95 | 95 | ||
96 | "useWebGL": { | 96 | "useWebGL": { |
97 | "prototype": "montage/ui/checkbox.reel", | 97 | "prototype": "montage/ui/input-checkbox.reel", |
98 | "properties": { | 98 | "properties": { |
99 | "element": {"#": "useWebGL"}, | 99 | "element": {"#": "useWebGL"}, |
100 | "identifier": "useWebGL", | 100 | "identifier": "useWebGL", |
diff --git a/js/components/ui/label-checkbox.reel/label-checkbox.html b/js/components/ui/label-checkbox.reel/label-checkbox.html index 0efc7ae0..d39fca9b 100755 --- a/js/components/ui/label-checkbox.reel/label-checkbox.html +++ b/js/components/ui/label-checkbox.reel/label-checkbox.html | |||
@@ -20,7 +20,7 @@ | |||
20 | }, | 20 | }, |
21 | 21 | ||
22 | "checkbox": { | 22 | "checkbox": { |
23 | "prototype": "montage/ui/checkbox.reel", | 23 | "prototype": "montage/ui/input-checkbox.reel", |
24 | "properties": { | 24 | "properties": { |
25 | "element": {"#": "checkbox"}, | 25 | "element": {"#": "checkbox"}, |
26 | "checked": false | 26 | "checked": false |
diff --git a/js/helper-classes/3D/StageLine.js b/js/helper-classes/3D/StageLine.js index b86673d1..23e8cf5b 100755 --- a/js/helper-classes/3D/StageLine.js +++ b/js/helper-classes/3D/StageLine.js | |||
@@ -184,138 +184,183 @@ var StageLine = exports.StageLine = Object.create(Object.prototype, { | |||
184 | }, | 184 | }, |
185 | 185 | ||
186 | doCoplanarIntersection: { | 186 | doCoplanarIntersection: { |
187 | value: function( plane ) | 187 | value: function( plane ) |
188 | { | 188 | { |
189 | // get the boundary points for the plane | 189 | // get the boundary points for the plane |
190 | var boundaryPts = plane.getBoundaryPoints(); | 190 | var boundaryPts = plane.getBoundaryPoints(); |
191 | var planeEq = plane.getPlaneEq(); |