aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Duran2012-03-12 16:58:33 -0700
committerJonathan Duran2012-03-12 16:58:33 -0700
commite4c13b0febab589b881b2c997ce122c4d359c560 (patch)
treead5a69e84714a3f7fa579fb58951f3b06f4cf3f1
parenta28cb88194f45325e42dd8c774469424712dd6f4 (diff)
parentc24f58c10231c30d3a8a4c9fb9a4f395dd746180 (diff)
downloadninja-e4c13b0febab589b881b2c997ce122c4d359c560.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.css2
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html15
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.js20
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.css2
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html15
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.js19
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html19
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.js17
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html16
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.js21
-rwxr-xr-xjs/ninja.reel/ninja.js1
11 files changed, 139 insertions, 8 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.css b/js/components/layout/bread-crumb.reel/bread-crumb.css
index 67497e10..dcfd471c 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.css
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.css
@@ -8,7 +8,7 @@
8 background-color: #282828; 8 background-color: #282828;
9 border-style: double; 9 border-style: double;
10 height: 26px; 10 height: 26px;
11 11 position:relative;
12 -webkit-box-flex: 0; 12 -webkit-box-flex: 0;
13} 13}
14 14
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index f2368e9a..413f588d 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
@@ -60,6 +60,20 @@
60 "oneway": true 60 "oneway": true
61 } 61 }
62 } 62 }
63 },
64
65 "disable": {
66 "prototype": "montage/ui/condition.reel",
67 "properties": {
68 "element": {"#": "disabledCondition"}
69 },
70 "bindings": {
71 "condition": {
72 "boundObject": {"@": "owner"},
73 "boundObjectPropertyPath": "disabled",
74 "oneway": true
75 }
76 }
63 } 77 }
64 } 78 }
65 </script> 79 </script>
@@ -71,6 +85,7 @@
71 <div id="breadcrumb_container"> 85 <div id="breadcrumb_container">
72 <button id="breadcrumb_button" class="nj-skinned"></button> 86 <button id="breadcrumb_button" class="nj-skinned"></button>
73 </div> 87 </div>
88 <div id="disabledCondition" class="panelDisabled"></div>
74 </section> 89 </section>
75 90
76 </body> 91 </body>
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index b2fa42b1..ab390fc6 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -9,6 +9,24 @@ var Montage = require("montage/core/core").Montage,
9 9
10exports.Breadcrumb = Montage.create(Component, { 10exports.Breadcrumb = Montage.create(Component, {
11 11
12 disabled: {
13 value: true
14 },
15
16 handleOpenDocument: {
17 value: function(){
18 this.disabled = false;
19 }
20 },
21
22 handleCloseDocument: {
23 value: function(){
24 if(!this.application.ninja.documentController.activeDocument) {
25 this.disabled = true;
26 }
27 }
28 },
29
12 _container:{ 30 _container:{
13 value:null 31 value:null
14 }, 32 },
@@ -31,6 +49,8 @@ exports.Breadcrumb = Montage.create(Component, {
31 49
32 prepareForDraw: { 50 prepareForDraw: {
33 value: function() { 51 value: function() {
52 this.eventManager.addEventListener("openDocument", this, false);
53 this.eventManager.addEventListener("closeDocument", this, false);
34 this.breadcrumbBt.addEventListener("action", this, false); 54 this.breadcrumbBt.addEventListener("action", this, false);
35 } 55 }
36 }, 56 },
diff --git a/js/components/layout/document-bar.reel/document-bar.css b/js/components/layout/document-bar.reel/document-bar.css
index 2a147964..f3e5de07 100755
--- a/js/components/layout/document-bar.reel/document-bar.css
+++ b/js/components/layout/document-bar.reel/document-bar.css
@@ -4,8 +4,6 @@
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5 </copyright> */ 5 </copyright> */
6.documentBar { 6.documentBar {
7 height: 25px;
8 width: 1000px;
9 position: relative; 7 position: relative;
10 overflow: hidden; 8 overflow: hidden;
11 color: white; 9 color: white;
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html
index 48f1423c..bd13f231 100755
--- a/js/components/layout/document-bar.reel/document-bar.html
+++ b/js/components/layout/document-bar.reel/document-bar.html
@@ -32,6 +32,20 @@
32 } 32 }
33 }, 33 },
34 34
35 "disable": {
36 "prototype": "montage/ui/condition.reel",
37 "properties": {
38 "element": {"#": "disabledCondition"}
39 },
40 "bindings": {
41 "condition": {
42 "boundObject": {"@": "owner"},
43 "boundObjectPropertyPath": "disabled",
44 "oneway": true
45 }
46 }
47 },
48
35 "owner": { 49 "owner": {
36 "module": "js/components/layout/document-bar.reel", 50 "module": "js/components/layout/document-bar.reel",
37 "name": "DocumentBar", 51 "name": "DocumentBar",
@@ -53,6 +67,7 @@
53 <input class="zoomHotText label" id="zoomControlHT"/> 67 <input class="zoomHotText label" id="zoomControlHT"/>
54 <span class="design-view disable" id="design">Design View</span> 68 <span class="design-view disable" id="design">Design View</span>
55 <span class="code-view disable" id="code">Code View</span> 69 <span class="code-view disable" id="code">Code View</span>
70 <div id="disabledCondition" class="panelDisabled"></div>
56 </div> 71 </div>
57</body> 72</body>
58</html> \ No newline at end of file 73</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 ea5e3280..4dc39fd6 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -13,6 +13,9 @@ exports.DocumentBar = Montage.create(Component, {
13 codeView: { value: null, enumerable: false}, 13 codeView: { value: null, enumerable: false},
14 zoomControl: { value: null, enumerable: false }, 14 zoomControl: { value: null, enumerable: false },
15 _type: { enumerable: false, value: null }, 15 _type: { enumerable: false, value: null },
16 disabled: { value: true },
17
18
16 19
17 type: { 20 type: {
18 enumerable: false, 21 enumerable: false,
@@ -84,6 +87,8 @@ exports.DocumentBar = Montage.create(Component, {
84 87
85 prepareForDraw: { 88 prepareForDraw: {
86 value: function() { 89 value: function() {
90 this.eventManager.addEventListener( "openDocument", this, false);
91 this.eventManager.addEventListener( "closeDocument", this, false);
87 this.designView.addEventListener("click", this, false); 92 this.designView.addEventListener("click", this, false);
88 this.codeView.addEventListener("click", this, false); 93 this.codeView.addEventListener("click", this, false);
89 94
@@ -99,6 +104,20 @@ exports.DocumentBar = Montage.create(Component, {
99 } 104 }
100 }, 105 },
101 106
107 handleOpenDocument: {
108 value: function() {
109 this.disabled = false;
110 }
111 },
112
113 handleCloseDocument: {
114 value: function() {
115 if(!this.application.ninja.documentController.activeDocument) {
116 this.disabled = true;
117 }
118 }
119 },
120
102 handleOnDocumentChanged:{ 121 handleOnDocumentChanged:{
103 value:function(event){ 122 value:function(event){
104 123
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index 2c5617e5..5996e446 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -136,6 +136,21 @@
136 "name": "ZoomTool" 136 "name": "ZoomTool"
137 }, 137 },
138 138
139 "disable": {
140 "module": "montage/ui/condition.reel",
141 "name": "Condition",
142