aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/layout
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components/layout')
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html19
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.js5
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html18
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.js2
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.html11
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.html17
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.html9
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.css4
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.html7
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.css4
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.html7
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html87
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html92
13 files changed, 111 insertions, 171 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..ae3e2022 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 },
@@ -81,11 +78,11 @@
81 </head> 78 </head>
82 <body> 79 <body>
83 80
84 <section id="breadcrumbTrail" class="breadcrumbTrail"> 81 <section data-montage-id="breadcrumbTrail" class="breadcrumbTrail">
85 <div id="breadcrumb_container"> 82 <div data-montage-id="breadcrumb_container">
86 <button id="breadcrumb_button" class="nj-skinned"></button> 83 <button data-montage-id="breadcrumb_button" class="nj-skinned"></button>
87 </div> 84 </div>
88 <div id="disabledCondition" class="panelDisabled"></div> 85 <div data-montage-id="disabledCondition" class="panelDisabled"></div>
89 </section> 86 </section>
90 87
91 </body> 88 </body>
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index ea7238fc..c1b021a3 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -23,7 +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 this.application.ninja.currentSelectedContainer = (this.application.ninja.currentDocument ? this.application.ninja.currentDocument.documentRoot : null);
27 } 27 }
28 } 28 }
29 }, 29 },
@@ -82,7 +82,6 @@ exports.Breadcrumb = Montage.create(Component, {
82 82
83 // 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
84 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName}); 84 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
85 console.log("this works!");
86 } 85 }
87 86
88 } 87 }
@@ -90,8 +89,6 @@ exports.Breadcrumb = Montage.create(Component, {
90 89
91 handleAction: { 90 handleAction: {
92 value: function(evt) { 91 value: function(evt) {
93
94// this.application.ninja.currentDocument.breadCrumbClick=true;
95 if(evt.target.value === this.container.uuid) { 92 if(evt.target.value === this.container.uuid) {
96 return; 93 return;
97 } 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..760186ba 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"},
@@ -63,11 +61,11 @@
63</head> 61</head>
64 62
65<body> 63<body>
66 <div id="documentBar"> 64 <div data-montage-id="documentBar">
67 <input class="zoomHotText label" id="zoomControlHT"/> 65 <input class="zoomHotText label" data-montage-id="zoomControlHT"/>
68 <span class="design-view disable" id="design">Design View</span> 66 <span class="design-view disable" data-montage-id="design">Design View</span>
69 <span class="code-view disable" id="code">Code View</span> 67 <span class="code-view disable" data-montage-id="code">Code View</span>
70 <div id="disabledCondition" class="panelDisabled"></div> 68 <div data-montage-id="disabledCondition" class="panelDisabled"></div>
71 </div> 69 </div>
72</body> 70</body>
73</html> \ No newline at end of file 71</html> \ No newline at end of file
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index 66a02725..56b61f1d 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -99,7 +99,7 @@ exports.DocumentBar = Montage.create(Component, {
99 if(event._event.target.id === this.currentView) return; 99 if(event._event.target.id === this.currentView) return;
100 100
101 this.currentView = event._event.target.id; 101 this.currentView = event._event.target.id;
102 this.application.ninja.documentController.stage.stageView.switchViews(event._event.target.id);//switch between design view 102 this.application.ninja.documentController.stage.stageView.switchDesignDocViews(event._event.target.id);//switch between design view
103 } 103 }
104 }, 104 },
105 105
diff --git a/js/components/layout/document-entry.reel/document-entry.html b/js/components/layout/document-entry.reel/document-entry.html
index 1cf01737..679ebb62 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"},