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/io/ui/file-picker/picker-navigator.reel
parent: 51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent: 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
download: ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
3 files changed, 18 insertions, 18 deletions
diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.css b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.css
index e4ecf167..7c6e5d3a 100644
--- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.css
+++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.css
@@ -39,8 +39,8 @@ POSSIBILITY OF SUCH DAMAGE.
    background-color:#494949;
    font-family: 'Droid Sans', sans-serif;
    border-radius: 8px;
-        box-shadow: 0px 0px 8px rgba(0, 0, 0, .8);
+    box-shadow: 0px 0px 8px rgba(0, 0, 0, .8);
-        text-shadow: 1px 1px 1px #000;
+    text-shadow: 1px 1px 1px #000;
 }
 .picker .pickerHeader{
@@ -229,13 +229,13 @@ POSSIBILITY OF SUCH DAMAGE.
 }
 .picker .buttons button {
-        float: left;
+    float: left;
-        width: 100px;
+    width: 100px;
-        margin-top: 3px;
+    margin-top: 3px;
 }
 .picker .okButton{
-        margin: 0px 22px 0px 8px; 
+    margin: 0px 22px 0px 8px;
    /*
 margin-right:25px;
    -webkit-box-align: center;
diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html
index e11cae17..a9a88c6d 100755
--- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html
+++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
index ddccc3d5..0536f7eb 100644
--- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
+++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
@@ -202,7 +202,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
            }
        }
    },
-    
    pickerModel:{
        enumerable:false,
        writable:true,
@@ -210,25 +210,25 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
    },
    willDraw: {
-        enumerable: false,
+        enumerable: false,
-        value: function() {
+        value: function() {
-        }
+        }
    },
    draw: {
-        enumerable: false,
+        enumerable: false,
-        value: function() {
+        value: function() {
            this.filterVal.innerHTML = this.pickerModel.currentFilter;
            if(this.pickerModel.fatalError !== null){
                this.error.innerHTML = this.pickerModel.fatalError;
            }
-        }
+        }
    },
    didDraw: {
-        enumerable: false,
+        enumerable: false,
-        value: function() {
+        value: function() {
            var that = this;
            this.iconList = null;
@@ -376,7 +376,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
            //ready to show picker now
            this.element.style.visibility = "visible";
            this.element.focus();
-        }
+        }
    },
    updateAddressBar:{
@@ -388,7 +388,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
                addressBarEl.value = folderUri;
                //update left drive selection
-                
            }
        }
    },
author	hwc487	2012-07-09 16:08:02 -0700
committer	hwc487	2012-07-09 16:08:02 -0700
commit	5085d0f67df89a21715308956004164597a6ba79 (patch)
tree	2c896163143a66331205a39b0a3b1b45d51bf12a /js/io/ui/file-picker/picker-navigator.reel
parent	51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent	84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
download	ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz

diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.css b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.css index e4ecf167..7c6e5d3a 100644 --- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.css +++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.css
@@ -39,8 +39,8 @@ POSSIBILITY OF SUCH DAMAGE.
39	background-color:#494949;	39	background-color:#494949;
40	font-family: 'Droid Sans', sans-serif;	40	font-family: 'Droid Sans', sans-serif;
41	border-radius: 8px;	41	border-radius: 8px;
42	box-shadow: 0px 0px 8px rgba(0, 0, 0, .8);	42	box-shadow: 0px 0px 8px rgba(0, 0, 0, .8);
43	text-shadow: 1px 1px 1px #000;	43	text-shadow: 1px 1px 1px #000;
44	}	44	}
45		45
46	.picker .pickerHeader{	46	.picker .pickerHeader{
@@ -229,13 +229,13 @@ POSSIBILITY OF SUCH DAMAGE.
229	}	229	}
230		230
231	.picker .buttons button {	231	.picker .buttons button {
232	float: left;	232	float: left;
233	width: 100px;	233	width: 100px;
234	margin-top: 3px;	234	margin-top: 3px;
235	}	235	}
236		236
237	.picker .okButton{	237	.picker .okButton{
238	margin: 0px 22px 0px 8px;	238	margin: 0px 22px 0px 8px;
239	/*	239	/*
240	margin-right:25px;	240	margin-right:25px;
241	-webkit-box-align: center;	241	-webkit-box-align: center;


diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html index e11cae17..a9a88c6d 100755 --- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html +++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.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/io/ui/file-picker/picker-navigator.reel/picker-navigator.js b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js index ddccc3d5..0536f7eb 100644 --- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js +++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
@@ -202,7 +202,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
202	}	202	}
203	}	203	}
204	},	204	},
205		205
206	pickerModel:{	206	pickerModel:{
207	enumerable:false,	207	enumerable:false,
208	writable:true,	208	writable:true,
@@ -210,25 +210,25 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
210	},	210	},
211		211
212	willDraw: {	212	willDraw: {
213	enumerable: false,	213	enumerable: false,
214	value: function() {	214	value: function() {
215		215
216	}	216	}
217	},	217	},
218	draw: {	218	draw: {
219	enumerable: false,	219	enumerable: false,
220	value: function() {	220	value: function() {
221	this.filterVal.innerHTML = this.pickerModel.currentFilter;	221	this.filterVal.innerHTML = this.pickerModel.currentFilter;
222		222
223	if(this.pickerModel.fatalError !== null){	223	if(this.pickerModel.fatalError !== null){
224	this.error.innerHTML = this.pickerModel.fatalError;	224	this.error.innerHTML = this.pickerModel.fatalError;
225	}	225	}
226		226
227	}	227	}
228	},	228	},
229	didDraw: {	229	didDraw: {
230	enumerable: false,	230	enumerable: false,
231	value: function() {	231	value: function() {
232		232
233	var that = this;	233	var that = this;
234	this.iconList = null;	234	this.iconList = null;
@@ -376,7 +376,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
376	//ready to show picker now	376	//ready to show picker now
377	this.element.style.visibility = "visible";	377	this.element.style.visibility = "visible";
378	this.element.focus();	378	this.element.focus();
379	}	379	}
380	},	380	},
381		381
382	updateAddressBar:{	382	updateAddressBar:{
@@ -388,7 +388,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
388	addressBarEl.value = folderUri;	388	addressBarEl.value = folderUri;
389		389
390	//update left drive selection	390	//update left drive selection
391		391
392	}	392	}
393	}	393	}
394	},	394	},