aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
Diffstat (limited to 'js/components')
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.js22
-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.js23
-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/components/tools-properties/brush-properties.reel/brush-properties.html56
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.js26
-rw-r--r--js/components/treeview/ninja-leaf.reel/ninja-leaf.css14
14 files changed, 228 insertions, 39 deletions
diff --git a/js/components/gradientpicker.reel/gradientpicker.js b/js/components/gradientpicker.reel/gradientpicker.js
index da4e8c0f..b10f6624 100755
--- a/js/components/gradientpicker.reel/gradientpicker.js
+++ b/js/components/gradientpicker.reel/gradientpicker.js
@@ -213,21 +213,13 @@ exports.GradientPicker = Montage.create(Component, {
213 removeStop: { 213 removeStop: {
214 enumerable: false, 214 enumerable: false,
215 value: function(stop) { 215 value: function(stop) {
216 //Removing stops
217 this.element._components.stopsContainer.removeChild(stop);
218 //Stopping events related to this current stop
219 this.removeStopMoving();
220 //Resetting stops if less than 2
221 var i, buttons = this.element._components.stopsContainer.getElementsByTagName('button'); 216 var i, buttons = this.element._components.stopsContainer.getElementsByTagName('button');
222 if (buttons.length < 2) { 217 //
223 //Removing remaining stops prior to resetting 218 if (buttons.length > 2) {
224 for (i=0; buttons[i]; i++) { 219 //Removing stops
225 this.element._components.stopsContainer.removeChild(buttons[i].stop); 220 this.element._components.stopsContainer.removeChild(stop);
226 } 221 //Stopping events related to this current stop
227 //Nulling then adding defaults 222 this.removeStopMoving();
228 this.value = null;
229 this.addDefaultStops();
230 this._dispatchEvent('change', false);
231 } 223 }
232 } 224 }
233 }, 225 },
@@ -327,7 +319,7 @@ exports.GradientPicker = Montage.create(Component, {
327 // 319 //
328 this.application.ninja.colorController.colorPopupManager.hideColorChipPopup(); 320 this.application.ninja.colorController.colorPopupManager.hideColorChipPopup();
329 // 321 //
330 if ((e._event.y+this.hack.y) > this.element._trackY+50 || (e._event.y+this.hack.y) < this.element._trackY) { 322 if ((e._event.y+this.hack.y) > this.element._trackY+70 || (e._event.y+this.hack.y) < this.element._trackY) {
331 this.removeStop(this.currentStop); 323 this.removeStop(this.currentStop);
332 } 324 }
333 // 325 //
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..f35972b6 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 },
@@ -51,8 +71,7 @@ exports.Breadcrumb = Montage.create(Component, {
51 // This is always the top container which is now hardcoded to body 71 // This is always the top container which is now hardcoded to body
52 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"}); 72 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"});
53 73
54 // This is for the timeline -- Disable it since the timeline should not know about this object 74
55 // NJevent('layerBinding',{selected:false ,element:this.container})
56 75
57 } 76 }
58 }, 77 },
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>