Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

Conflicts: js/helper-classes/3D/StageLine.js
author: hwc487 2012-07-09 16:08:02 -0700
committer: hwc487 2012-07-09 16:08:02 -0700
commit: 5085d0f67df89a21715308956004164597a6ba79 (patch)
tree: 2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/ui/icon-list-basic
parent: 51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent: 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
download: ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
5 files changed, 23 insertions, 23 deletions
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 @@
-<!DOCTYPE HTML>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All 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, {
    },
    willDraw: {
-        enumerable: false,
+        enumerable: false,
-        value: function() {
+        value: function() {
-        }
+        }
    },
    draw: {
-        enumerable: false,
+        enumerable: false,
-        value: function() {
+        value: function() {
            if(this.icondata.type === "directory"){
                this.iconImg.src = this.imgStore.img_root + this.imgStore.directory;
            }else{
@@ -91,11 +91,11 @@ exports.Icon = Montage.create(Component, {
                }
                this.iconImg.src = fileImg;
            }
-        }
+        }
    },
    didDraw: {
-        enumerable: false,
+        enumerable: false,
-        value: function() {
+        value: function() {
            var that = this;
            var icon = this.iconImg;
@@ -131,7 +131,7 @@ exports.Icon = Montage.create(Component, {
                selectedItemEvent.uri = this.icondata.uri;
                this.element.dispatchEvent(selectedItemEvent);
            }
-        }
+        }
    },
    /**
@@ -195,12 +195,12 @@ exports.Icon = Montage.create(Component, {
    formatTimestamp:{
        writable:false,
        enumerable: false,
-        value: function(timestamp) {
+        value: function(timestamp) {
            var aDate = new Date();
            timestamp = timestamp - (aDate.getTimezoneOffset()*60*1000);//convert from GMT to local timestamp
            aDate = new Date(timestamp);
            return aDate.toLocaleString();
-        }
+        }
    },
    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.
 </copyright> */
 .list{
-    
 }
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 @@
-<!DOCTYPE HTML>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All 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, {
    },
    willDraw: {
-        enumerable: false,
+        enumerable: false,
-        value: function() {
+        value: function() {
-        }
+        }
    },
    draw: {
-        enumerable: false,
+        enumerable: false,
-        value: function() {
+        value: function() {
-        }
+        }
    },
    didDraw: {
-        enumerable: false,
+        enumerable: false,
-        value: function() {
+        value: function() {
-        }
+        }
    }
 });
author	hwc487	2012-07-09 16:08:02 -0700
committer	hwc487	2012-07-09 16:08:02 -0700
commit	5085d0f67df89a21715308956004164597a6ba79 (patch)
tree	2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/ui/icon-list-basic
parent	51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent	84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
download	ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz

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>
3	Copyright (c) 2012, Motorola Mobility, Inc	3	Copyright (c) 2012, Motorola Mobility, Inc
4	All Rights Reserved.	4	All 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()601000);//convert from GMT to local timestamp	200	timestamp = timestamp - (aDate.getTimezoneOffset()601000);//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>
3	Copyright (c) 2012, Motorola Mobility, Inc	3	Copyright (c) 2012, Motorola Mobility, Inc
4	All Rights Reserved.	4	All 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: {	63	draw: {
64	enumerable: false,	64	enumerable: false,
65	value: function() {	65	value: function() {
66		66
67	}	67	}
68	},	68	},
69	didDraw: {	69	didDraw: {
70	enumerable: false,	70	enumerable: false,
71	value: function() {	71	value: function() {
72		72
73	}	73	}
74	}	74	}
75		75
76	});	76	});