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/new-file-dialog
parent: 51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent: 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
download: ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
5 files changed, 21 insertions, 21 deletions
diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
index 84f284a1..84afa954 100755
--- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
+++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.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/new-file-dialog/new-file-location.reel/new-file-location.js b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
index ef66c0a2..7630f392 100755
--- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
+++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
@@ -58,7 +58,7 @@ var NewFileLocation = exports.NewFileLocation = Montage.create(Component, {
            this.addPropertyChangeListener("newFileName.value", this.newFileNameChange, false);
            this.newFileName.element.addEventListener("keyup", this, false);
-                        this.newFileName.element.focus();
+            this.newFileName.element.focus();
            this.newFileName.element.select();
        }
    },
diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css
index 10dd277d..8a3064c1 100755
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css
@@ -38,7 +38,7 @@ POSSIBILITY OF SUCH DAMAGE.
    color:#ffffff;
    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);
 }
 .newfile .title{
@@ -47,8 +47,8 @@ POSSIBILITY OF SUCH DAMAGE.
    padding:5px;
    text-align: center;
    text-transform: uppercase;
-        font-weight: normal;
+    font-weight: normal;
-        text-shadow: 1px 1px 1px #000;
+    text-shadow: 1px 1px 1px #000;
 }
 .newfile .container{
@@ -84,7 +84,7 @@ POSSIBILITY OF SUCH DAMAGE.
 .newfile .right-bottom{
    border: 1px solid #000000;
-        border-left: none;
+    border-left: none;
    overflow: auto;
    height:42%;
    padding: 15px;
@@ -95,8 +95,8 @@ POSSIBILITY OF SUCH DAMAGE.
    padding:5px;
    text-align: center;
    text-transform: uppercase;
-        font-weight: normal;
+    font-weight: normal;
-        text-shadow: 1px 1px 1px #000;
+    text-shadow: 1px 1px 1px #000;
 }
 .newfile .buttons{
@@ -130,7 +130,7 @@ POSSIBILITY OF SUCH DAMAGE.
 }
 .newfile .atreeItem {
-        text-shadow: 1px 1px 1px #000;
+    text-shadow: 1px 1px 1px #000;
 }
 .newfile .atreeItem .name{
@@ -163,13 +163,13 @@ POSSIBILITY OF SUCH DAMAGE.
 }
 .newfile .buttons button {
-        float: left;
+    float: left;
-        width: 100px;
+    width: 100px;
-        margin-top: 3px;
+    margin-top: 3px;
 }
 .newfile .okButton{
-        margin: 0px 18px 0px 8px; 
+    margin: 0px 18px 0px 8px;
    /*
 margin-right:25px;
    -webkit-box-align: center;
diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
index 5c40eab1..a410f0e7 100755
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-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/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
index a888d304..a8fec1e4 100644
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
@@ -142,8 +142,8 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
    },
    didDraw: {
-        enumerable: false,
+        enumerable: false,
-        value: function() {
+        value: function() {
            var that = this;
            this.templateList = null;
@@ -309,7 +309,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
    handleOkButtonAction:{
        value: function(evt){
            var templateData,
-                selectedProjectTypeID = this.selectedProjectType.uri,
+                selectedProjectTypeID = this.selectedProjectType.uri,
                templateID = this.selectedTemplate.uri,
                projectName = this.newFileLocation.newFileName.value,
                projectDirectory = this.newFileLocation.fileInputField.newFileDirectory.value,
@@ -324,10 +324,10 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
                            "projectDirectory="+projectDirectory+"\n"+
                            "projectWidth="+projectWidth+"\n"+
                            "projectHeight="+projectHeight;
-                ////////////////////////////////////////////////////////////////////           
+            ////////////////////////////////////////////////////////////////////
-                //Template data must be passed during file creation (lots of confusion data here, should be cleaned up…)
+            //Template data must be passed during file creation (lots of confusion data here, should be cleaned up…)
-                templateData = {id: templateID, name: this.newFileModel.projectTypeData[selectedProjectTypeID].name, type: this.newFileModel.projectTypeData[selectedProjectTypeID].type};
+            templateData = {id: templateID, name: this.newFileModel.projectTypeData[selectedProjectTypeID].name, type: this.newFileModel.projectTypeData[selectedProjectTypeID].type};
-                ////////////////////////////////////////////////////////////////////
+            ////////////////////////////////////////////////////////////////////
            if(/[^/\\]$/g.test(projectDirectory)){
                projectDirectory = projectDirectory + "/";
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/new-file-dialog
parent	51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent	84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
download	ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz

diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html index 84f284a1..84afa954 100755 --- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html +++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.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/new-file-dialog/new-file-location.reel/new-file-location.js b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js index ef66c0a2..7630f392 100755 --- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js +++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
@@ -58,7 +58,7 @@ var NewFileLocation = exports.NewFileLocation = Montage.create(Component, {
58		58
59	this.addPropertyChangeListener("newFileName.value", this.newFileNameChange, false);	59	this.addPropertyChangeListener("newFileName.value", this.newFileNameChange, false);
60	this.newFileName.element.addEventListener("keyup", this, false);	60	this.newFileName.element.addEventListener("keyup", this, false);
61	this.newFileName.element.focus();	61	this.newFileName.element.focus();
62	this.newFileName.element.select();	62	this.newFileName.element.select();
63	}	63	}
64	},	64	},


diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css index 10dd277d..8a3064c1 100755 --- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css +++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css
@@ -38,7 +38,7 @@ POSSIBILITY OF SUCH DAMAGE.
38	color:#ffffff;	38	color:#ffffff;
39	font-family: 'Droid Sans', sans-serif;	39	font-family: 'Droid Sans', sans-serif;
40	border-radius: 8px;	40	border-radius: 8px;
41	box-shadow: 0px 0px 8px rgba(0, 0, 0, .8);	41	box-shadow: 0px 0px 8px rgba(0, 0, 0, .8);
42	}	42	}
43		43
44	.newfile .title{	44	.newfile .title{
@@ -47,8 +47,8 @@ POSSIBILITY OF SUCH DAMAGE.
47	padding:5px;	47	padding:5px;
48	text-align: center;	48	text-align: center;
49	text-transform: uppercase;	49	text-transform: uppercase;
50	font-weight: normal;	50	font-weight: normal;
51	text-shadow: 1px 1px 1px #000;	51	text-shadow: 1px 1px 1px #000;
52	}	52	}
53		53
54	.newfile .container{	54	.newfile .container{
@@ -84,7 +84,7 @@ POSSIBILITY OF SUCH DAMAGE.
84		84
85	.newfile .right-bottom{	85	.newfile .right-bottom{
86	border: 1px solid #000000;	86	border: 1px solid #000000;
87	border-left: none;	87	border-left: none;
88	overflow: auto;	88	overflow: auto;
89	height:42%;	89	height:42%;
90	padding: 15px;	90	padding: 15px;
@@ -95,8 +95,8 @@ POSSIBILITY OF SUCH DAMAGE.
95	padding:5px;	95	padding:5px;
96	text-align: center;	96	text-align: center;
97	text-transform: uppercase;	97	text-transform: uppercase;
98	font-weight: normal;	98	font-weight: normal;
99	text-shadow: 1px 1px 1px #000;	99	text-shadow: 1px 1px 1px #000;
100	}	100	}
101		101
102	.newfile .buttons{	102	.newfile .buttons{
@@ -130,7 +130,7 @@ POSSIBILITY OF SUCH DAMAGE.
130	}	130	}
131		131
132	.newfile .atreeItem {	132	.newfile .atreeItem {
133	text-shadow: 1px 1px 1px #000;	133	text-shadow: 1px 1px 1px #000;
134	}	134	}
135		135
136	.newfile .atreeItem .name{	136	.newfile .atreeItem .name{
@@ -163,13 +163,13 @@ POSSIBILITY OF SUCH DAMAGE.
163	}	163	}
164		164
165	.newfile .buttons button {	165	.newfile .buttons button {
166	float: left;	166	float: left;
167	width: 100px;	167	width: 100px;
168	margin-top: 3px;	168	margin-top: 3px;
169	}	169	}
170		170
171	.newfile .okButton{	171	.newfile .okButton{
172	margin: 0px 18px 0px 8px;	172	margin: 0px 18px 0px 8px;
173	/*	173	/*
174	margin-right:25px;	174	margin-right:25px;
175	-webkit-box-align: center;	175	-webkit-box-align: center;


diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html index 5c40eab1..a410f0e7 100755 --- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html +++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-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/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js index a888d304..a8fec1e4 100644 --- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js +++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
@@ -142,8 +142,8 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
142	},	142	},
143		143
144	didDraw: {	144	didDraw: {
145	enumerable: false,	145	enumerable: false,
146	value: function() {	146	value: function() {
147	var that = this;	147	var that = this;
148		148
149	this.templateList = null;	149	this.templateList = null;
@@ -309,7 +309,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
309	handleOkButtonAction:{	309	handleOkButtonAction:{
310	value: function(evt){	310	value: function(evt){
311	var templateData,	311	var templateData,
312	selectedProjectTypeID = this.selectedProjectType.uri,	312	selectedProjectTypeID = this.selectedProjectType.uri,
313	templateID = this.selectedTemplate.uri,	313	templateID = this.selectedTemplate.uri,
314	projectName = this.newFileLocation.newFileName.value,	314	projectName = this.newFileLocation.newFileName.value,
315	projectDirectory = this.newFileLocation.fileInputField.newFileDirectory.value,	315	projectDirectory = this.newFileLocation.fileInputField.newFileDirectory.value,
@@ -324,10 +324,10 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
324	"projectDirectory="+projectDirectory+"\n"+	324	"projectDirectory="+projectDirectory+"\n"+
325	"projectWidth="+projectWidth+"\n"+	325	"projectWidth="+projectWidth+"\n"+
326	"projectHeight="+projectHeight;	326	"projectHeight="+projectHeight;
327	////////////////////////////////////////////////////////////////////	327	////////////////////////////////////////////////////////////////////
328	//Template data must be passed during file creation (lots of confusion data here, should be cleaned up…)	328	//Template data must be passed during file creation (lots of confusion data here, should be cleaned up…)
329	templateData = {id: templateID, name: this.newFileModel.projectTypeData[selectedProjectTypeID].name, type: this.newFileModel.projectTypeData[selectedProjectTypeID].type};	329	templateData = {id: templateID, name: this.newFileModel.projectTypeData[selectedProjectTypeID].name, type: this.newFileModel.projectTypeData[selectedProjectTypeID].type};
330	////////////////////////////////////////////////////////////////////	330	////////////////////////////////////////////////////////////////////
331		331
332	if(/[^/\\]$/g.test(projectDirectory)){	332	if(/[^/\\]$/g.test(projectDirectory)){
333	projectDirectory = projectDirectory + "/";	333	projectDirectory = projectDirectory + "/";