diff options
Diffstat (limited to 'js/components')
20 files changed, 22 insertions, 1269 deletions
diff --git a/js/components/colorwheel.reel/colorwheel.html b/js/components/colorwheel.reel/colorwheel.html index 0374e6a3..a9fbfbd9 100755 --- a/js/components/colorwheel.reel/colorwheel.html +++ b/js/components/colorwheel.reel/colorwheel.html | |||
@@ -12,15 +12,7 @@ | |||
12 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 12 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
13 | 13 | ||
14 | <link rel="stylesheet" type="text/css" href="css/colorwheel.css"> | 14 | <link rel="stylesheet" type="text/css" href="css/colorwheel.css"> |
15 | 15 | ||
16 | <script type="text/m-objects"> | ||
17 | { | ||
18 | "$rootObject": U("m-obj://colorwheel/uuid?mId=js/components/colorwheel", { | ||
19 | "element": E("#colorwheel") | ||
20 | }) | ||
21 | } | ||
22 | </script> | ||
23 | |||
24 | <script type="text/montage-serialization"> | 16 | <script type="text/montage-serialization"> |
25 | { | 17 | { |
26 | "owner": { | 18 | "owner": { |
diff --git a/js/components/gradientpicker.reel/gradientpicker.html b/js/components/gradientpicker.reel/gradientpicker.html index 361e36b2..f71c6705 100755 --- a/js/components/gradientpicker.reel/gradientpicker.html +++ b/js/components/gradientpicker.reel/gradientpicker.html | |||
@@ -12,15 +12,7 @@ | |||
12 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 12 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
13 | 13 | ||
14 | <link rel="stylesheet" type="text/css" href="css/gradientpicker.css"> | 14 | <link rel="stylesheet" type="text/css" href="css/gradientpicker.css"> |
15 | 15 | ||
16 | <script type="text/m-objects"> | ||
17 | { | ||
18 | "$rootObject": U("m-obj://gradientpicker/uuid?mId=js/components/gradientpicker", { | ||
19 | "element": E("#gradientpicker") | ||
20 | }) | ||
21 | } | ||
22 | </script> | ||
23 | |||
24 | <script type="text/montage-serialization"> | 16 | <script type="text/montage-serialization"> |
25 | { | 17 | { |
26 | "owner": { | 18 | "owner": { |
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js index f35972b6..597577f1 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.js +++ b/js/components/layout/bread-crumb.reel/bread-crumb.js | |||
@@ -63,16 +63,27 @@ exports.Breadcrumb = Montage.create(Component, { | |||
63 | 63 | ||
64 | parentNode = this.container; | 64 | parentNode = this.container; |
65 | 65 | ||
66 | while(parentNode.id !== "UserContent") { | 66 | // This is for the old template support. |
67 | // TODO: Remove marker for old template: NINJA-STAGE-REWORK | ||
68 | if(this.application.ninja.currentDocument.documentRoot.id === "UserContent") { | ||
69 | while(parentNode.id !== "UserContent") { | ||
70 | this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName}); | ||
71 | parentNode = parentNode.parentNode; | ||
72 | } | ||
73 | |||
74 | // This is always the top container which is now hardcoded to body | ||
75 | this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"}); | ||
76 | } else { | ||
77 | while(parentNode !== this.application.ninja.currentDocument.documentRoot) { | ||
78 | this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName}); | ||
79 | parentNode = parentNode.parentNode; | ||
80 | } | ||
81 | |||
82 | // This is always the top container which is now hardcoded to body | ||
67 | this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName}); | 83 | this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName}); |
68 | parentNode = parentNode.parentNode; | 84 | console.log("this works!"); |
69 | } | 85 | } |
70 | 86 | ||
71 | // This is always the top container which is now hardcoded to body | ||
72 | this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"}); | ||
73 | |||
74 | |||
75 | |||
76 | } | 87 | } |
77 | }, | 88 | }, |
78 | 89 | ||
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html index 98442164..d9c35dc2 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.html +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html | |||
@@ -84,7 +84,7 @@ | |||
84 | </head> | 84 | </head> |
85 | 85 | ||
86 | <body> | 86 | <body> |
87 | <div id="brushProperties" class="subToolHolderPanel"> | 87 | <div data-montage-id="brushProperties" class="subToolHolderPanel"> |
88 | <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> | 88 | <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> |
89 | <label class="label"> Width:</label> | 89 | <label class="label"> Width:</label> |
90 | <div id="strokeSize" class="label"></div> | 90 | <div id="strokeSize" class="label"></div> |
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html index 74a3a747..acbedcac 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html | |||
@@ -39,7 +39,7 @@ | |||
39 | </head> | 39 | </head> |
40 | 40 | ||
41 | <body> | 41 | <body> |
42 | <div id="penProperties" class="subToolHolderPanel"> | 42 | <div data-montage-id="penProperties" class="subToolHolderPanel"> |
43 | <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> | 43 | <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> |
44 | <label class="label"> Stroke:</label> | 44 | <label class="label"> Stroke:</label> |
45 | <div id="strokeSize" class="label"></div> | 45 | <div id="strokeSize" class="label"></div> |
diff --git a/js/components/tree.reel/tree.css b/js/components/tree.reel/tree.css deleted file mode 100755 index 8872341f..00000000 --- a/js/components/tree.reel/tree.css +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
7 | .tree | ||
8 | { | ||
9 | -webkit-user-select:none; | ||
10 | cursor:default; | ||
11 | float: left; | ||
12 | padding-left: 0; | ||
13 | } | ||
14 | |||
15 | .tree li | ||
16 | { | ||
17 | -webkit-margin-before: 0px; | ||
18 | -webkit-margin-after: 0px; | ||
19 | list-style-type:none; | ||
20 | } | ||
21 | |||
22 | .tree li > text > img | ||
23 | { | ||
24 | margin-right:8px; | ||
25 | -webkit-transition: -webkit-transform 0.05s linear; | ||
26 | } \ No newline at end of file | ||
diff --git a/js/components/tree.reel/tree.html b/js/components/tree.reel/tree.html deleted file mode 100755 index 66838d82..00000000 --- a/js/components/tree.reel/tree.html +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | <!DOCTYPE HTML> | ||
2 | <!-- <copyright> | ||
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
6 | </copyright> --> | ||
7 | <html> | ||
8 | <head> | ||
9 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
10 | <script type="text/montage-serialization"> | ||
11 | { | ||
12 | "owner": { | ||
13 | "module": "js/components/tree.reel", | ||
14 | "name": "Tree", | ||
15 | "properties": { | ||
16 | "element": {"#": "tree"} | ||
17 | } | ||
18 | } | ||
19 | |||
20 | } | ||
21 | </script> | ||
22 | |||
23 | </head> | ||
24 | <body> | ||
25 | <ul id="tree" class="tree"> | ||
26 | </ul> | ||
27 | </body> | ||
28 | </html> \ No newline at end of file | ||
diff --git a/js/components/tree.reel/tree.js b/js/components/tree.reel/tree.js deleted file mode 100755 index 7084ba99..00000000 --- a/js/components/tree.reel/tree.js +++ /dev/null | |||
@@ -1,789 +0,0 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
7 | var Montage = require("montage/core/core").Montage; | ||
8 | var Component = require("montage/ui/component").Component; | ||
9 | var nj = require("js/lib/NJUtils").NJUtils; | ||
10 | |||
11 | exports.Tree = Montage.create(Component, { | ||
12 | |||
13 | _treeDepth: { | ||
14 | value: 1 | ||
15 | }, | ||
16 | treeDepth: { | ||
17 | get: function() { | ||
18 | return this._treeDepth; | ||