ENYO-1020: DirectorySelectorPopup is now FileChooser

- `DirectorySelectorPopup` is now `Ares.FileChooser` defined by `utilities/source/FileChooser` - Move manual `style:` into `Ares.css` as `.ares-filechooser*` Enyo-DCO-1.1-Signed-off-by: Francois-Xavier KOWALSKI <francois-xavier.kowalski@hp.com>
enyojs · Mar 20, 2013 · 339007f · 339007f
1 parent 70c27b5
commit 339007f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 8 deletions.
diff --git a/ares/Ares.css b/ares/Ares.css
@@ -28,6 +28,19 @@ body {
 }
 
 /**/
+
+.ares-filechooser {
+	height: 400px;
+	width: 600px;
+}
+
+.ares-filechooser-header {
+	padding: 0 4px;
+	vertical-align: middle;
+}
+
+/**/
+
 .ares-groupbox-item-key {
 	padding: 0.5em;
 }

diff --git a/project-view/source/ProjectWizard.js b/project-view/source/ProjectWizard.js
@@ -21,7 +21,7 @@ enyo.kind({
 
 	components: [
 		{kind: "ProjectProperties", name: "propertiesWidget"},
-		{kind: "SelectDirectoryPopup", canGenerate: false, name: "selectDirectoryPopup"},
+		{kind: "Ares.FileChooser", canGenerate: false, name: "selectDirectoryPopup"},
 		{kind: "Ares.ErrorPopup", name: "errorPopup", msg: "unknown error"}
 	],
 	debug: false,
@@ -345,7 +345,7 @@ enyo.kind({
  */
 enyo.kind({
 	name: "ProjectWizardScan",
-	kind: "SelectDirectoryPopup",
+	kind: "Ares.FileChooser",
 	modal: true,
 	centered: true,
 	floating: true,

diff --git a/project-view/source/package.js b/project-view/source/package.js
@@ -1,6 +1,5 @@
 enyo.depends(
 	"ProjectList.js",
-	"DirectorySelector.js",
 	"ProjectWizard.js",
 	"ProjectView.js",
 	"ProjectConfig.js",

diff --git a/test/testrunner/tests/ProjectViewTest.js b/test/testrunner/tests/ProjectViewTest.js
@@ -67,7 +67,7 @@ enyo.kind({
 			if (this.debug) enyo.log("testHandleSelectProvider: handleSelectProvider called") ;
 			dirPopup.handleSelectProvider(this, {service: myService, callBack: userSelectDir});
 		} else {
-			this.finish("SelectDirectoryPopup: "+this.aresObj.$.projectView.$.projectWizardCreate.$.SelectDirectoryPopup+ " is not available!");
+			this.finish("Ares.FileChooser: "+this.aresObj.$.projectView.$.projectWizardCreate.$.selectDirectoryPopup+ " is not available!");
 		}
 	},
 	statics: {

diff --git a/project-view/source/DirectorySelector.js → utilities/source/FileChooser.js b/project-view/source/DirectorySelector.js → utilities/source/FileChooser.js
@@ -1,5 +1,5 @@
 enyo.kind({
-	name: "SelectDirectoryPopup",
+	name: "Ares.FileChooser",
 	kind: "onyx.Popup",
 	modal: true,
 	centered: true,
@@ -13,8 +13,8 @@ enyo.kind({
 		this.$.header.setContent(this.headerText);
 	},
 	components: [
-		{kind: "FittableRows", style: "height: 400px; width: 600px", components: [
-			{kind: "Control", tag: "span", style: "padding: 0 4px; vertical-align: middle;", content: "Select a directory", name: "header"},
+		{kind: "FittableRows", classes: "ares-filechooser", components: [
+			{kind: "Control", tag: "span", classes: "ares-filechooser-header", content: "Select a directory", name: "header"},
 			{kind: "FittableColumns", content: "fittableColumns", fit: true, components: [
 				{kind: "ProviderList", type: "filesystem", name: "providerList", header: "Sources", onSelectProvider: "handleSelectProvider"},
 				{kind: "HermesFileTree", fit: true, name: "hermesFileTree", onFileClick: "selectFile", onFolderClick: "selectFolder", onNewFolderConfirm: "createFolder"}

diff --git a/utilities/source/package.js b/utilities/source/package.js
@@ -5,5 +5,6 @@ enyo.depends(
 	"ErrorPopup.js",
 	"AsyncError.js",
 	"IFrame.js",
-	"LocalStorage.js"
+	"LocalStorage.js",
+	"FileChooser.js" 
 );