aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/ui
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts: js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/components/ui')
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.html4
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.js6
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.html2
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.js4
-rwxr-xr-xjs/components/ui/icon-list-basic/icon.reel/icon.html2
-rwxr-xr-xjs/components/ui/icon-list-basic/icon.reel/icon.js22
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.css2
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.html2
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.js18
-rwxr-xr-xjs/components/ui/input-group.reel/input-group.html2
-rwxr-xr-xjs/components/ui/input-group.reel/input-group.js4
-rwxr-xr-xjs/components/ui/label-checkbox.reel/label-checkbox.html2
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.html2
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.js20
-rwxr-xr-xjs/components/ui/tree-basic/tree.reel/tree.html2
-rwxr-xr-xjs/components/ui/tree-basic/tree.reel/tree.js18
-rwxr-xr-xjs/components/ui/tree-basic/treeItem.reel/treeItem.html2
-rwxr-xr-xjs/components/ui/tree-basic/treeItem.reel/treeItem.js16
18 files changed, 68 insertions, 62 deletions
diff --git a/js/components/ui/color-chip.reel/color-chip.html b/js/components/ui/color-chip.reel/color-chip.html
index 4cc7bb29..fb862a4d 100755
--- a/js/components/ui/color-chip.reel/color-chip.html
+++ b/js/components/ui/color-chip.reel/color-chip.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
@@ -46,7 +46,7 @@ POSSIBILITY OF SUCH DAMAGE.
46 </script> 46 </script>
47</head> 47</head>
48<body> 48<body>
49 <!-- TODO: This should not use the 'colortoolbar' class, this is the wrong application of this class --> 49 <!-- TODO: This should not use the 'colortoolbar' class, this is the wrong application of this class -->
50 <div data-montage-id="colorChipContainer" class="colortoolbar"> 50 <div data-montage-id="colorChipContainer" class="colortoolbar">
51 <div data-montage-id="chipIcon"></div> 51 <div data-montage-id="chipIcon"></div>
52 <div class="chipContainer"> 52 <div class="chipContainer">
diff --git a/js/components/ui/color-chip.reel/color-chip.js b/js/components/ui/color-chip.reel/color-chip.js
index 1c1c6054..2353d2a5 100755
--- a/js/components/ui/color-chip.reel/color-chip.js
+++ b/js/components/ui/color-chip.reel/color-chip.js
@@ -107,9 +107,9 @@ var ColorChip = exports.ColorChip = Montage.create(Component, {
107 var mode = "rgb", r = 0, g = 0, b = 0, a = 1, css = "rgb(0,0,0)"; 107 var mode = "rgb", r = 0, g = 0, b = 0, a = 1, css = "rgb(0,0,0)";
108 108
109 if(this.color && this.color.color) { 109 if(this.color && this.color.color) {
110 var g = this.color.color; 110 var g = this.color.color;
111 g.wasSetByCode = true; 111 g.wasSetByCode = true;
112 this.chipBtn.color(this.color.mode, g); 112 this.chipBtn.color(this.color.mode, g);
113 } else if (this.color) { 113 } else if (this.color) {
114 var colorObj = this.application.ninja.colorController.getColorObjFromCss(this.color.css); 114 var colorObj = this.application.ninja.colorController.getColorObjFromCss(this.color.css);
115 mode = colorObj.mode; 115 mode = colorObj.mode;
diff --git a/js/components/ui/file-input.reel/file-input.html b/js/components/ui/file-input.reel/file-input.html
index d7506260..0997ec20 100755
--- a/js/components/ui/file-input.reel/file-input.html
+++ b/js/components/ui/file-input.reel/file-input.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
diff --git a/js/components/ui/file-input.reel/file-input.js b/js/components/ui/file-input.reel/file-input.js
index e8ea8ba9..66a52b22 100755
--- a/js/components/ui/file-input.reel/file-input.js
+++ b/js/components/ui/file-input.reel/file-input.js
@@ -71,7 +71,7 @@ var FileInput = exports.FileInput = Montage.create(Component, {
71 handleChange: 71 handleChange:
72 { 72 {
73 value:function(event) 73 value:function(event)
74 { 74 {
75 if(event.currentTarget.type === "file") 75 if(event.currentTarget.type === "file")
76 { 76 {
77 this.filePath = this.inputField.value; 77 this.filePath = this.inputField.value;
@@ -86,7 +86,7 @@ var FileInput = exports.FileInput = Montage.create(Component, {
86 e.type = "change"; 86 e.type = "change";
87 e.filePath = this.filePath; 87 e.filePath = this.filePath;
88 this.dispatchEvent(e); 88 this.dispatchEvent(e);
89 } 89 }
90 }, 90 },
91 91
92 prepareForDraw: { 92 prepareForDraw: {
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.html b/js/components/ui/icon-list-basic/icon.reel/icon.html
index 2ae24b10..0c192673 100755
--- a/js/components/ui/icon-list-basic/icon.reel/icon.html
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.js b/js/components/ui/icon-list-basic/icon.reel/icon.js
index 11cf3b12..d0954324 100755
--- a/js/components/ui/icon-list-basic/icon.reel/icon.js
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.js
@@ -70,14 +70,14 @@ exports.Icon = Montage.create(Component, {
70 }, 70 },
71 71
72 willDraw: { 72 willDraw: {
73 enumerable: false, 73 enumerable: false,
74 value: function() { 74 value: function() {
75 75
76 } 76 }
77 }, 77 },
78 draw: { 78 draw: {
79 enumerable: false, 79 enumerable: false,
80 value: function() { 80 value: function() {
81 if(this.icondata.type === "directory"){ 81 if(this.icondata.type === "directory"){
82 this.iconImg.src = this.imgStore.img_root + this.imgStore.directory; 82 this.iconImg.src = this.imgStore.img_root + this.imgStore.directory;
83 }else{ 83 }else{
@@ -91,11 +91,11 @@ exports.Icon = Montage.create(Component, {
91 } 91 }
92 this.iconImg.src = fileImg; 92 this.iconImg.src = fileImg;
93 } 93 }
94 } 94 }
95 }, 95 },
96 didDraw: { 96 didDraw: {
97 enumerable: false, 97 enumerable: false,
98 value: function() { 98 value: function() {
99 var that = this; 99 var that = this;
100 100
101 var icon = this.iconImg; 101 var icon = this.iconImg;
@@ -131,7 +131,7 @@ exports.Icon = Montage.create(Component, {
131 selectedItemEvent.uri = this.icondata.uri; 131 selectedItemEvent.uri = this.icondata.uri;
132 this.element.dispatchEvent(selectedItemEvent); 132 this.element.dispatchEvent(selectedItemEvent);
133 } 133 }
134 } 134 }
135 }, 135 },
136 136
137 /** 137 /**
@@ -195,12 +195,12 @@ exports.Icon = Montage.create(Component, {
195 formatTimestamp:{ 195 formatTimestamp:{
196 writable:false, 196 writable:false,
197 enumerable: false, 197 enumerable: false,
198 value: function(timestamp) { 198 value: function(timestamp) {
199 var aDate = new Date(); 199 var aDate = new Date();
200 timestamp = timestamp - (aDate.getTimezoneOffset()*60*1000);//convert from GMT to local timestamp 200 timestamp = timestamp - (aDate.getTimezoneOffset()*60*1000);//convert from GMT to local timestamp
201 aDate = new Date(timestamp); 201 aDate = new Date(timestamp);
202 return aDate.toLocaleString(); 202 return aDate.toLocaleString();
203 } 203 }
204 }, 204 },
205 205
206 imgStore:{ 206 imgStore:{
diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.css b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.css
index e04bdf5d..1b7f2286 100755
--- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.css
+++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.css
@@ -29,5 +29,5 @@ POSSIBILITY OF SUCH DAMAGE.
29</copyright> */ 29</copyright> */
30 30
31.list{ 31.list{
32 32
33} 33}
diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
index a26a3910..5d404ff9 100755
--- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
+++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js
index 8b40f102..c2e2d46f 100755
--- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js
+++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js
@@ -55,22 +55,22 @@ var IconsList = exports.IconsList = Montage.create(Component, {
55 }, 55 },
56 56
57 willDraw: { 57 willDraw: {
58 enumerable: false, 58 enumerable: false,
59 value: function() { 59 value: function() {
60 60
61 } 61 }
62 }, 62 },
63 draw: {<