aboutsummaryrefslogtreecommitdiff
path: root/js/io/ui/new-file-dialog
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 14:35:44 -0700
committerValerio Virgillito2012-07-09 14:35:44 -0700
commit84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/io/ui/new-file-dialog
parentc0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
downloadninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/io/ui/new-file-dialog')
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html2
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js2
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css22
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html2
-rw-r--r--js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js14
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 @@
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/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 /*
174margin-right:25px; 174margin-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>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All 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 + "/";