diff options
Diffstat (limited to 'js/components/layout')
10 files changed, 65 insertions, 121 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html index 413f588d..7e14157e 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.html +++ b/js/components/layout/bread-crumb.reel/bread-crumb.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 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/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
@@ -13,8 +13,7 @@ | |||
13 | <script type="text/montage-serialization"> | 13 | <script type="text/montage-serialization"> |
14 | { | 14 | { |
15 | "owner": { | 15 | "owner": { |
16 | "module": "js/components/layout/bread-crumb.reel", | 16 | "prototype": "js/components/layout/bread-crumb.reel[Breadcrumb]", |
17 | "name": "Breadcrumb", | ||
18 | "properties": { | 17 | "properties": { |
19 | "element": {"#": "breadcrumbTrail"}, | 18 | "element": {"#": "breadcrumbTrail"}, |
20 | "breadcrumbBt": {"@": "breadCrumbButton"} | 19 | "breadcrumbBt": {"@": "breadCrumbButton"} |
@@ -22,8 +21,7 @@ | |||
22 | }, | 21 | }, |
23 | 22 | ||
24 | "breadCrumbButton": { | 23 | "breadCrumbButton": { |
25 | "module": "montage/ui/button.reel", | 24 | "prototype": "montage/ui/button.reel", |
26 | "name": "Button", | ||
27 | "properties": { | 25 | "properties": { |
28 | "element": {"#": "breadcrumb_button"} | 26 | "element": {"#": "breadcrumb_button"} |
29 | }, | 27 | }, |
@@ -48,8 +46,7 @@ | |||
48 | }, | 46 | }, |
49 | 47 | ||
50 | "repetition1": { | 48 | "repetition1": { |
51 | "module": "montage/ui/repetition.reel", | 49 | "prototype": "montage/ui/repetition.reel", |
52 | "name": "Repetition", | ||
53 | "properties": { | 50 | "properties": { |
54 | "element": {"#": "breadcrumb_container"} | 51 | "element": {"#": "breadcrumb_container"} |
55 | }, | 52 | }, |
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js index 597577f1..e396bdbf 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.js +++ b/js/components/layout/bread-crumb.reel/bread-crumb.js | |||
@@ -23,6 +23,7 @@ exports.Breadcrumb = Montage.create(Component, { | |||
23 | value: function(){ | 23 | value: function(){ |
24 | if(!this.application.ninja.documentController.activeDocument) { | 24 | if(!this.application.ninja.documentController.activeDocument) { |
25 | this.disabled = true; | 25 | this.disabled = true; |
26 | this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot; | ||
26 | } | 27 | } |
27 | } | 28 | } |
28 | }, | 29 | }, |
@@ -81,7 +82,6 @@ exports.Breadcrumb = Montage.create(Component, { | |||
81 | 82 | ||
82 | // This is always the top container which is now hardcoded to body | 83 | // This is always the top container which is now hardcoded to body |
83 | this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName}); | 84 | this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName}); |
84 | console.log("this works!"); | ||
85 | } | 85 | } |
86 | 86 | ||
87 | } | 87 | } |
@@ -89,7 +89,6 @@ exports.Breadcrumb = Montage.create(Component, { | |||
89 | 89 | ||
90 | handleAction: { | 90 | handleAction: { |
91 | value: function(evt) { | 91 | value: function(evt) { |
92 | |||
93 | if(evt.target.value === this.container.uuid) { | 92 | if(evt.target.value === this.container.uuid) { |
94 | return; | 93 | return; |
95 | } | 94 | } |
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html index bd13f231..8dcaf178 100755 --- a/js/components/layout/document-bar.reel/document-bar.html +++ b/js/components/layout/document-bar.reel/document-bar.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 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/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
@@ -13,8 +13,7 @@ | |||
13 | <script type="text/montage-serialization"> | 13 | <script type="text/montage-serialization"> |
14 | { | 14 | { |
15 | "hottext1": { | 15 | "hottext1": { |
16 | "module": "js/components/hottextunit.reel", | 16 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
17 | "name": "HotTextUnit", | ||
18 | "properties": { | 17 | "properties": { |
19 | "element": {"#": "zoomControlHT"}, | 18 | "element": {"#": "zoomControlHT"}, |
20 | "minValue":25, | 19 | "minValue":25, |
@@ -47,8 +46,7 @@ | |||
47 | }, | 46 | }, |
48 | 47 | ||
49 | "owner": { | 48 | "owner": { |
50 | "module": "js/components/layout/document-bar.reel", | 49 | "prototype": "js/components/layout/document-bar.reel", |
51 | "name": "DocumentBar", | ||
52 | "properties": { | 50 | "properties": { |
53 | "element": {"#": "documentBar"}, | 51 | "element": {"#": "documentBar"}, |
54 | "designView": {"#": "design"}, | 52 | "designView": {"#": "design"}, |
diff --git a/js/components/layout/document-entry.reel/document-entry.html b/js/components/layout/document-entry.reel/document-entry.html index 1cf01737..451d9cc4 100755 --- a/js/components/layout/document-entry.reel/document-entry.html +++ b/js/components/layout/document-entry.reel/document-entry.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 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/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
@@ -12,8 +12,7 @@ | |||
12 | { | 12 | { |
13 | 13 | ||
14 | "owner": { | 14 | "owner": { |
15 | "module": "js/components/layout/document-entry.reel", | 15 | "prototype": "js/components/layout/document-entry.reel", |
16 | "name": "DocumentEntry", | ||
17 | "properties": { | 16 | "properties": { |
18 | "element": {"#": "documentEntry"}, | 17 | "element": {"#": "documentEntry"}, |
19 | "label": {"#": "name"}, | 18 | "label": {"#": "name"}, |
diff --git a/js/components/layout/documents-tab.reel/documents-tab.html b/js/components/layout/documents-tab.reel/documents-tab.html index 737dfbcb..1516a8ce 100755 --- a/js/components/layout/documents-tab.reel/documents-tab.html +++ b/js/components/layout/documents-tab.reel/documents-tab.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE HTML> | 1 | <!DOCTYPE HTML> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 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/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
@@ -14,16 +14,14 @@ | |||
14 | { | 14 | { |
15 | 15 | ||
16 | "owner": { | 16 | "owner": { |
17 | "module": "js/components/layout/documents-tab.reel", | 17 | "prototype": "js/components/layout/documents-tab.reel", |
18 | "name": "DocumentsTab", | ||
19 | "properties": { | 18 | "properties": { |
20 | "element": {"#": "openDocumentsTabComponent"} | 19 | "element": {"#": "openDocumentsTabComponent"} |
21 | } | 20 | } |
22 | }, | 21 | }, |
23 | 22 | ||
24 | "documentEntry": { | 23 | "documentEntry": { |
25 | "module": "js/components/layout/document-entry.reel", | 24 | "prototype": "js/components/layout/document-entry.reel", |
26 | "name": "DocumentEntry", | ||
27 | "properties": { | 25 | "properties": { |
28 | "element": {"#": "document"} | 26 | "element": {"#": "document"} |
29 | }, | 27 | }, |
@@ -52,8 +50,7 @@ | |||
52 | }, | 50 | }, |
53 | 51 | ||
54 | "repetition1": { | 52 | "repetition1": { |
55 | "module": "montage/ui/repetition.reel", | 53 | "prototype": "montage/ui/repetition.reel", |
56 | "name": "Repetition", | ||
57 | "properties": { | 54 | "properties": { |
58 | "element": {"#": "openDocuments"} | 55 | "element": {"#": "openDocuments"} |
59 | }, | 56 | }, |
diff --git a/js/components/layout/stage-mode.reel/stage-mode.html b/js/components/layout/stage-mode.reel/stage-mode.html index ab111136..15d4955c 100755 --- a/js/components/layout/stage-mode.reel/stage-mode.html +++ b/js/components/layout/stage-mode.reel/stage-mode.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE HTML> | 1 | <!DOCTYPE HTML> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 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/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
@@ -13,8 +13,7 @@ | |||
13 | <script type="text/montage-serialization"> | 13 | <script type="text/montage-serialization"> |
14 | { |