aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/bread-crumb.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-16 13:14:52 -0700
committerValerio Virgillito2012-07-16 13:14:52 -0700
commit156f15cec3203528a78783d075d4b8f1eb40c06d (patch)
treee9ccf39a596658a0a09180442bc26b87ed5f193c /js/components/layout/bread-crumb.reel
parent04beac89aba08179a446cd36b8a7f2dc833ac80b (diff)
parentec3f0a848f264f466c3cd5dec60e27a84216d288 (diff)
downloadninja-156f15cec3203528a78783d075d4b8f1eb40c06d.tar.gz
Merge pull request #392 from joseeight/Document
New: Improved layout of components for breadcrumb and UI buttons for views
Diffstat (limited to 'js/components/layout/bread-crumb.reel')
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.css10
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html17
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.js2
3 files changed, 10 insertions, 19 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.css b/js/components/layout/bread-crumb.reel/bread-crumb.css
index 2dd34af3..a80b6052 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.css
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.css
@@ -37,15 +37,13 @@ POSSIBILITY OF SUCH DAMAGE.
37 -webkit-box-flex: 0; 37 -webkit-box-flex: 0;
38} 38}
39 39
40.mainContentContainer > section.breadcrumbTrail { 40.mainContentContainer section.breadcrumbTrail {
41 border:0; 41 border:0;
42 margin:0; 42 margin:0;
43 border-bottom:1px solid #000; 43 border-bottom:1px solid #000;
44 margin-bottom:1px; 44 margin-bottom:1px;
45} 45}
46.breadcrumbTrail button.nj-skinned {
47 float: left;
48 width: 60px;
49 margin: 2px;
50}
51 46
47.breadcrumbTrail div:first-child {
48 margin-left: 2px;
49}
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index 19707632..2c6d941f 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
@@ -40,22 +40,15 @@ POSSIBILITY OF SUCH DAMAGE.
40 "owner": { 40 "owner": {
41 "prototype": "js/components/layout/bread-crumb.reel[Breadcrumb]", 41 "prototype": "js/components/layout/bread-crumb.reel[Breadcrumb]",
42 "properties": { 42 "properties": {
43 "element": {"#": "breadcrumbTrail"}, 43 "element": {"#": "breadcrumbTrail"}
44 "breadcrumbBt": {"@": "breadCrumbButton"}
45 } 44 }
46 }, 45 },
47 46
48 "breadCrumbButton": { 47 "breadcrumbButton": {
49 "prototype": "montage/ui/native/button.reel", 48 "prototype": "js/components/layout/bread-crumb-button.reel",
50 "properties": { 49 "properties": {
51 "element": {"#": "breadcrumb_button"} 50 "element": {"#": "breadcrumbButton"}
52 }, 51 },
53 "listeners": [
54 {
55 "type": "action",
56 "listener": {"@": "owner"}
57 }
58 ],
59 "bindings": { 52 "bindings": {
60 "label": {"<-": "@buttonsList.objectAtCurrentIteration.label"}, 53 "label": {"<-": "@buttonsList.objectAtCurrentIteration.label"},
61 "value": {"<-": "@buttonsList.objectAtCurrentIteration.nodeUuid"} 54 "value": {"<-": "@buttonsList.objectAtCurrentIteration.nodeUuid"}
@@ -94,7 +87,7 @@ POSSIBILITY OF SUCH DAMAGE.
94 87
95 <section data-montage-id="breadcrumbTrail" class="breadcrumbTrail"> 88 <section data-montage-id="breadcrumbTrail" class="breadcrumbTrail">
96 <div data-montage-id="breadcrumb_container"> 89 <div data-montage-id="breadcrumb_container">
97 <button data-montage-id="breadcrumb_button" class="nj-skinned"></button> 90 <div data-montage-id="breadcrumbButton"></div>
98 </div> 91 </div>
99 <div data-montage-id="disabledCondition" class="panelDisabled"></div> 92 <div data-montage-id="disabledCondition" class="panelDisabled"></div>
100 </section> 93 </section>
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index 40494bc3..efa0dfd5 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -87,7 +87,7 @@ exports.Breadcrumb = Montage.create(Component, {
87 87
88 prepareForDraw: { 88 prepareForDraw: {
89 value: function() { 89 value: function() {
90 this.breadcrumbBt.addEventListener("action", this, false); 90 this.addEventListener("action", this, false);
91 this.addPropertyChangeListener("currentDocument.model.domContainer", this) 91 this.addPropertyChangeListener("currentDocument.model.domContainer", this)
92 } 92 }
93 }, 93 },