diff options
Diffstat (limited to 'js')
66 files changed, 2245 insertions, 2520 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/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js index 4dc39fd6..66a02725 100755 --- a/js/components/layout/document-bar.reel/document-bar.js +++ b/js/components/layout/document-bar.reel/document-bar.js | |||
@@ -57,7 +57,6 @@ exports.DocumentBar = Montage.create(Component, { | |||
57 | this._zoomFactor = value; | 57 | this._zoomFactor = value; |
58 | if (!this._firstDraw) | 58 | if (!this._firstDraw) |
59 | { | 59 | { |
60 | var viewUtils = this.application.ninja.stage.viewUtils; | ||
61 | this.application.ninja.stage.setZoom(value); | 60 | this.application.ninja.stage.setZoom(value); |
62 | } | 61 | } |
63 | } | 62 | } |
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"> |