From 3a754133dbc138390503341fd2e9beba3e43aa4b Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 27 Jan 2012 12:05:17 -0800
Subject: Merged old FileIO

---
 .../pickerNavigator.reel/pickerNavigator.css       | 30 ++++++++++
 .../pickerNavigator.reel/pickerNavigator.html      | 31 +++++++++-
 .../pickerNavigator.reel/pickerNavigator.js        | 67 +++++++++++-----------
 3 files changed, 92 insertions(+), 36 deletions(-)
 mode change 100644 => 100755 js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
 mode change 100644 => 100755 js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html
 mode change 100644 => 100755 js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js

(limited to 'js/components/ui/FilePicker/pickerNavigator.reel')

diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
old mode 100644
new mode 100755
index 2d9f1189..61328ce0
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
@@ -195,6 +195,36 @@
 
 .picker .okButton{
     margin-right:25px;
+    -webkit-box-align: center;
+    text-align: center;
+    cursor: default;
+    padding: 0px 6px 0px;
+    border:2px solid #d1d1d1;
+    background-color: #e1e1e1;
+    box-sizing: border-box;
+    border-radius:10px;
+    background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%);
+    cursor:pointer;
+}
+
+.picker .cancelButton{
+    -webkit-box-align: center;
+    text-align: center;
+    cursor: default;
+    padding: 0px 6px 0px;
+    border:2px solid #d1d1d1;
+    background-color: #e1e1e1;
+    box-sizing: border-box;
+    border-radius:10px;
+    background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%);
+    cursor:pointer;
+}
+
+.picker input[type="button"]:disabled{
+    background-color: #a1a1a1;
+    border:2px solid #a1a1a1;
+    background-image:none;
+    cursor:auto;
 }
 
 
diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html
old mode 100644
new mode 100755
index bf421247..b4aee4b2
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html
@@ -10,6 +10,35 @@
     <link rel="stylesheet" type="text/css" href="pickerNavigator.css">
     <script type="text/montage-serialization">
         {
+            "okButton": {
+                "module": "montage/ui/button.reel",
+                "name": "Button",
+                "properties": {
+                    "element": {"#": "okButton"},
+                    "identifier": "okButton"
+                },
+                "listeners": [
+                    {
+                        "type": "action",
+                        "listener": {"@": "owner"}
+                    }
+                ]
+            },
+
+            "cancelButton": {
+                "module": "montage/ui/button.reel",
+                "name": "Button",
+                "properties": {
+                    "element": {"#": "cancelButton"},
+                    "identifier": "cancelButton"
+                },
+                "listeners": [
+                    {
+                        "type": "action",
+                        "listener": {"@": "owner"}
+                    }
+                ]
+            },
 
             "owner":{
                 "module": "js/components/ui/FilePicker/pickerNavigator.reel",
@@ -71,7 +100,7 @@
         <input id="cancelButton" type="button" value="CANCEL" class="cancelButton" />
         <input id="okButton" disabled="true" type="button" value="OK" class="okButton" />
     </div>
-    <div id="filters" class="filters">
+    <div id="filters" class="filters" style="display:block;">
         <div class="dropdown hide"></div>
         <span class="dropdownArrow">&#9660</span>
         <span id="filterVal" class="filterVal">*.*</span>
diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
old mode 100644
new mode 100755
index 299d44f5..eec7c8e8
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
@@ -209,26 +209,27 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
             this.refreshButton.addEventListener("click", this, false);//refresh - gets from file system directly
             this.backArrow.addEventListener("click", this, false);
             this.forwardArrow.addEventListener("click", this, false);
-            this.okButton.addEventListener("click", this, false);
-            this.cancelButton.addEventListener("click", this, false);
-
-            //populate filters
-            var filtersDD = this.element.querySelector(".filters .dropdown");
-            if(!!this.pickerModel.fileFilters
-                && (typeof this.pickerModel.fileFilters === "object")
-                && ('splice' in this.pickerModel.fileFilters)
-                && ('join' in this.pickerModel.fileFilters)){
-                this.pickerModel.fileFilters.forEach(function(aFilter){
-                    var newDiv = document.createElement("div");
-                    newDiv.innerHTML = aFilter;
-                    filtersDD.appendChild(newDiv);
-                    newDiv.addEventListener("click", function(evt){that.handleFilterClick(evt, aFilter, filtersDD)}, false);
-                }, this);
-            }
 
-            var renderedWidth = this.getComputedWidth(filtersDD);
-            this.filters.style.width = "" + (parseInt((renderedWidth.substring(0, (renderedWidth.length - 2)))) + 20) + "px";
+            //populate filters if in file selection mode
+            if(this.pickerModel.inFileMode === true){
+                var filtersDD = this.element.querySelector(".filters .dropdown");
+                if(!!this.pickerModel.fileFilters
+                    && (typeof this.pickerModel.fileFilters === "object")
+                    && ('splice' in this.pickerModel.fileFilters)
+                    && ('join' in this.pickerModel.fileFilters)){
+                    this.pickerModel.fileFilters.forEach(function(aFilter){
+                        var newDiv = document.createElement("div");
+                        newDiv.innerHTML = aFilter;
+                        filtersDD.appendChild(newDiv);
+                        newDiv.addEventListener("click", function(evt){that.handleFilterClick(evt, aFilter, filtersDD)}, false);
+                    }, this);
+                }
 
+                var renderedWidth = this.getComputedWidth(filtersDD);
+                this.filters.style.width = "" + (parseInt((renderedWidth.substring(0, (renderedWidth.length - 2)))) + 20) + "px";
+            }else{
+                this.filters.style.display = "none";
+            }
             /**
              * attach click event listeners to the addressbar dropdown arrows
              */
@@ -263,11 +264,11 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
         }
     },
 
-    //TODO: add uri pattern validation 
-    validateUri:{
+    cleanupUri:{
         writable: false,
         enumerable:true,
         value: function(folderUri){
+            folderUri = folderUri.replace(/^\s+|\s+$/g,"");  // strip any leading or trailing spaces
             //remove unnecessary / from end - for Win and Mac .... don't trim for the root
             if(((folderUri.charAt(folderUri.length - 1) === "/") || (folderUri.charAt(folderUri.length - 1) === "\\")) && (folderUri !== "/")){
                 folderUri = folderUri.substring(0, (folderUri.length - 1));
@@ -324,7 +325,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
         writable:false,
         enumerable:true,
         value:function(uri){
-            uri = this.validateUri(uri);
+            uri = this.cleanupUri(uri);
             var arr = [];
             var temp = new String(uri);
             while(temp.indexOf("/") != -1){
@@ -532,8 +533,6 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
             this.refreshButton.identifier = "refreshButton";
             this.backArrow.identifier = "backArrow";
             this.forwardArrow.identifier = "forwardArrow";
-            this.okButton.identifier = "okButton";
-            this.cancelButton.identifier = "cancelButton";
             this.iconView.identifier = "iconView";
             this.treeView.identifier = "treeView";
             this.resultsArea.identifier = "resultsArea";
@@ -651,7 +650,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
 
                     if(this.addressBarUri.value !== ""){
                         var uri = this.addressBarUri.value;
-                        uri = this.validateUri(uri);
+                        uri = this.cleanupUri(uri);
 
                         this.currentURI = uri;
                         var status = this.pickerViews()[this.selectedPickerView].call(this, uri);//dynamically calls the update function of the current picker view
@@ -676,7 +675,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
         value: function(evt){
                     if(evt.keyCode === 13 ){
                         var uri = this.addressBarUri.value;
-                        uri = this.validateUri(uri);
+                        uri = this.cleanupUri(uri);
 
                         this.currentURI = uri;
 
@@ -699,7 +698,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
     handleRefreshButtonClick:{
         value:function(evt){
                 var uri = this.addressBarUri.value;
-                uri = this.validateUri(uri);
+                uri = this.cleanupUri(uri);
 
                 var status = this.pickerViews()[this.selectedPickerView].call(this, uri, false);//dynamically calls the update function of the current picker view
 
@@ -768,22 +767,22 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
             }
     },
 
-    handleOkButtonClick : {
+    handleOkButtonAction : {
         value: function(evt){
-                    alert("selected "+ this.selectedItems.toString());
+                    console.log("$$$ File Picker : selected "+ this.selectedItems.toString());
                     var success = true;
-                    if(!!this.pickerModel.callback && (this.selectedItems.length > 0)){//call the callback if it is available
+                    if(!!this.pickerModel.callback && !!this.pickerModel.callbackScope && (this.selectedItems.length > 0)){//call the callback if it is available
                         try{
-                            this.pickerModel.callback({"uri":this.selectedItems});
+                            this.pickerModel.callback.call(this.pickerModel.callbackScope, {"uri":this.selectedItems});
                         }catch(e){
                             success = false;
-                            console.log("[ERROR] File IO failed to open URIs:  "+ this.selectedItems.toString());
+                            console.log(e.stack);
                         }
                     }else{//else send an event with the selected files
                         var pickerSelectionEvent = document.createEvent("Events");
                         pickerSelectionEvent.initEvent("pickerSelectionsDone", false, false);
                         pickerSelectionEvent.selectedItems = this.selectedItems;
-                        document.dispatchEvent(pickerSelectionEvent);//TODO: use eventManager when it is available
+                        this.eventManager.dispatchEvent(pickerSelectionEvent);
                     }
 
                     //store last opened/saved folder, and view after IO is successful
@@ -813,7 +812,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
               }
     },
 
-    handleCancelButtonClick :{
+    handleCancelButtonAction :{
         value:function(evt){
                 //clean up memory
                 this.cleanup();
@@ -1005,8 +1004,6 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
                 this.refreshButton.removeEventListener("click", this, false);//refresh - gets from file system directly
                 this.backArrow.removeEventListener("click", this, false);
                 this.forwardArrow.removeEventListener("click", this, false);
-                this.okButton.removeEventListener("click", this, false);
-                this.cancelButton.removeEventListener("click", this, false);
                 this.iconView.removeEventListener("click", this, false);
                 this.treeView.removeEventListener("click", this, false);
                 this.element.removeEventListener("drawTree", this, false);
-- 
cgit v1.2.3


From 92161460a6cbbdebfd1b0263ec6eb790091920a9 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Mon, 30 Jan 2012 14:18:21 -0800
Subject: Moving changes from Gerrit, on 1/27, to the github branch: - added
 file existence check and validation to save as dialog - minor css fix for
 file picker, new file dialog

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 .../ui/FilePicker/pickerNavigator.reel/pickerNavigator.css    |  1 +
 .../ui/FilePicker/pickerNavigator.reel/pickerNavigator.js     | 11 +++++++++++
 2 files changed, 12 insertions(+)
 mode change 100755 => 100644 js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
 mode change 100755 => 100644 js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js

(limited to 'js/components/ui/FilePicker/pickerNavigator.reel')

diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
old mode 100755
new mode 100644
index 61328ce0..93578ec1
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
@@ -63,6 +63,7 @@
 
 .picker .driversList:hover{
     cursor:pointer;
+    background-color: #444444;
 }
 
 .picker .highlighted{
diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
old mode 100755
new mode 100644
index eec7c8e8..268ec41a
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
@@ -621,6 +621,16 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
                         this.currentSelectedNode = evt.target;
 
                     }else{
+
+
+                        //test: highlight non-selectable icons too
+                        if(!evt.target.classList.contains("selected")){
+                            evt.target.classList.add("selected");
+                        }
+                        this.currentSelectedNode = evt.target;
+                        //end- test
+
+
                         //disable OK
                         if(!this.okButton.hasAttribute("disabled")){
                             this.okButton.setAttribute("disabled", "true");
@@ -776,6 +786,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
                             this.pickerModel.callback.call(this.pickerModel.callbackScope, {"uri":this.selectedItems});
                         }catch(e){
                             success = false;
+                            console.log("[Error] Failed to open "+ this.selectedItems.toString());
                             console.log(e.stack);
                         }
                     }else{//else send an event with the selected files
-- 
cgit v1.2.3


From 8504b61aefb25fdab931f02c4568916d2bf8345c Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Thu, 2 Feb 2012 00:52:44 -0800
Subject: changes to open multiple code view tabs and switch between the code
 views, added nj-skinned css class for the buttons in file picker, new file
 dialog and save as dialog

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js/components/ui/FilePicker/pickerNavigator.reel')

diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html
index b4aee4b2..b5da0e6e 100755
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html
@@ -97,8 +97,8 @@
         <div id="right-bottom" class="right-bottom"></div>
     </div>
     <div class="buttons">
-        <input id="cancelButton" type="button" value="CANCEL" class="cancelButton" />
-        <input id="okButton" disabled="true" type="button" value="OK" class="okButton" />
+        <input id="cancelButton" type="button" value="CANCEL" class="cancelButton nj-skinned" />
+        <input id="okButton" disabled="true" type="button" value="OK" class="okButton nj-skinned" />
     </div>
     <div id="filters" class="filters" style="display:block;">
         <div class="dropdown hide"></div>
-- 
cgit v1.2.3


From 7618cabe1945acc6392c48f3b57820f67f7973b0 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Fri, 3 Feb 2012 10:22:26 -0800
Subject: removed using montage button, since it has changed in Montafe 0.6

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 .../pickerNavigator.reel/pickerNavigator.html      | 30 ----------------------
 .../pickerNavigator.reel/pickerNavigator.js        |  3 +++
 2 files changed, 3 insertions(+), 30 deletions(-)

(limited to 'js/components/ui/FilePicker/pickerNavigator.reel')

diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html
index b5da0e6e..bd427f97 100755
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html
@@ -10,36 +10,6 @@
     <link rel="stylesheet" type="text/css" href="pickerNavigator.css">
     <script type="text/montage-serialization">
         {
-            "okButton": {
-                "module": "montage/ui/button.reel",
-                "name": "Button",
-                "properties": {
-                    "element": {"#": "okButton"},
-                    "identifier": "okButton"
-                },
-                "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
-                ]
-            },
-
-            "cancelButton": {
-                "module": "montage/ui/button.reel",
-                "name": "Button",
-                "properties": {
-                    "element": {"#": "cancelButton"},
-                    "identifier": "cancelButton"
-                },
-                "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
-                ]
-            },
-
             "owner":{
                 "module": "js/components/ui/FilePicker/pickerNavigator.reel",
                 "name":"PickerNavigator",
diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
index 268ec41a..d7a19c14 100644
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
@@ -245,6 +245,9 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
             this.resultsArea.addEventListener("click", function(evt){that.handleResultsAreaClick(evt);}, false);
             this.element.addEventListener("click", function(evt){that.handlePickerNavClick(evt);}, false);
 
+            this.okButton.addEventListener("click", function(evt){that.handleOkButtonAction(evt);}, false);
+            this.cancelButton.addEventListener("click", function(evt){that.handleCancelButtonAction(evt);}, false);
+
             //ready to show picker now
             this.element.style.visibility = "visible";
     	}
-- 
cgit v1.2.3


From ad0ee69be3512325ede94738f23597086a141a3e Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Fri, 10 Feb 2012 01:55:30 -0800
Subject: file open and file new integrated again

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 .../pickerNavigator.reel/pickerNavigator.js        | 37 +++++++++++-----------
 1 file changed, 18 insertions(+), 19 deletions(-)

(limited to 'js/components/ui/FilePicker/pickerNavigator.reel')

diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
index d7a19c14..ff9c7073 100644
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
@@ -7,7 +7,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component,
     iconsListModule = require("js/components/ui/icon-list-basic/iconsList.reel"),
-    filePickerControllerModule = require("js/components/ui/FilePicker/file-picker-controller"),
     treeModule = require("js/components/ui/tree-basic/tree.reel");
 
 var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
@@ -335,7 +334,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
                 temp = temp.substring(0, temp.lastIndexOf("/"));
 
                 //populate dropdown irrespective of validity
-//                if(!!filePickerControllerModule.FilePickerController._directoryContentCache[temp]){//check if it is a valid location
+//                if(!!this.application.ninja.filePickerController._directoryContentCache[temp]){//check if it is a valid location
 //                    arr.push(temp);
 //                }else{
 //                    break;
@@ -358,7 +357,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
         value:function(element, uri){
             if(!!element){
                 var tree = treeModule.Tree.create();
-                tree.treeViewDataObject = filePickerControllerModule.FilePickerController.prepareContentList(uri, this.pickerModel);
+                tree.treeViewDataObject = this.application.ninja.filePickerController.prepareContentList(uri, this.pickerModel);
                 //console.log("renderTree() for "+ uri);
                 //console.log(tree.treeViewDataObject);
                 tree.element = element;
@@ -374,10 +373,10 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
             var status = true;
             var iconViewContainer = this.element.querySelector(".iconViewContainer");
             if((typeof fromCache === 'undefined') || (fromCache === true)){
-            this.newContent = filePickerControllerModule.FilePickerController.prepareContentList(uri, this.pickerModel);
+            this.newContent = this.application.ninja.filePickerController.prepareContentList(uri, this.pickerModel);
             }
             else{
-                this.newContent = filePickerControllerModule.FilePickerController.prepareContentList(uri, this.pickerModel, false);
+                this.newContent = this.application.ninja.filePickerController.prepareContentList(uri, this.pickerModel, false);
             }
             if(!!this.newContent && this.newContent.length > 0){
                 //clear selection
@@ -423,10 +422,10 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
             if(!!treeViewContainer){
                 var data = [];
                 if((typeof fromCache === 'undefined') || (fromCache === true)){
-                    data = filePickerControllerModule.FilePickerController.prepareContentList(uri, this.pickerModel);
+                    data = this.application.ninja.filePickerController.prepareContentList(uri, this.pickerModel);
                 }
                 else{
-                    data = filePickerControllerModule.FilePickerController.prepareContentList(uri, this.pickerModel, false);
+                    data = this.application.ninja.filePickerController.prepareContentList(uri, this.pickerModel, false);
                 }
 
                 if(data.length > 0){
@@ -475,7 +474,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
         enumerable: false,
         writable:false,
         value:function(currentUri){
-            var data = filePickerControllerModule.FilePickerController._directoryContentCache[currentUri];
+            var data = this.application.ninja.filePickerController._directoryContentCache[currentUri];
             var metadata = "";
             if(!!data){
                 if(data.name !== ""){
@@ -610,8 +609,8 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
                         this.currentSelectedNode = null;
                     }
                     //enable OK button if the selection is valid as per the picker mode
-                    if((this.pickerModel.inFileMode && (filePickerControllerModule.FilePickerController._directoryContentCache[uri].type === "file"))
-                        || (!this.pickerModel.inFileMode && (filePickerControllerModule.FilePickerController._directoryContentCache[uri].type === "directory"))){
+                    if((this.pickerModel.inFileMode && (this.application.ninja.filePickerController._directoryContentCache[uri].type === "file"))
+                        || (!this.pickerModel.inFileMode && (this.application.ninja.filePickerController._directoryContentCache[uri].type === "directory"))){
                         this.okButton.removeAttribute("disabled");
 
                         //put into selectedItems..currently single selection is supported
@@ -784,9 +783,9 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
         value: function(evt){
                     console.log("$$$ File Picker : selected "+ this.selectedItems.toString());
                     var success = true;
-                    if(!!this.pickerModel.callback && !!this.pickerModel.callbackScope && (this.selectedItems.length > 0)){//call the callback if it is available
+                    if(!!this.pickerModel.callback && (this.selectedItems.length > 0)){//call the callback if it is available
                         try{
-                            this.pickerModel.callback.call(this.pickerModel.callbackScope, {"uri":this.selectedItems});
+                            this.pickerModel.callback({"uri":this.selectedItems});
                         }catch(e){
                             success = false;
                             console.log("[Error] Failed to open "+ this.selectedItems.toString());
@@ -803,12 +802,12 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
                     var dataStore = window.sessionStorage;
                     try {
                         if(this.pickerModel.pickerMode === "write"){
-                            filePickerControllerModule.FilePickerController._lastSavedFolderURI.lastSavedFolderUri_local = this.currentURI;
                             dataStore.setItem('lastSavedFolderURI',escape(""+this.currentURI));
                         }
-                        else{
-                            filePickerControllerModule.FilePickerController._lastOpenedFolderURI.lastFolderUri_local = this.currentURI;
-                            dataStore.setItem('lastOpenedFolderURI',escape(""+this.currentURI));
+                        else if(this.pickerModel.inFileMode === true){
+                            dataStore.setItem('lastOpenedFolderURI_fileSelection',escape(""+this.currentURI));
+                        }else if(this.pickerModel.inFileMode === false){
+                            dataStore.setItem('lastOpenedFolderURI_folderSelection',escape(""+this.currentURI));
                         }
                     }
                     catch(e){
@@ -962,9 +961,9 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
 
     handlePickerNavRefreshTreeSegment:{
         value: function(evt){
-//                if(filePickerControllerModule.FilePickerController.checkIfStale(evt.uri)){
+//                if(this.application.ninja.filePickerController.checkIfStale(evt.uri)){
 //                    //update tree segment if was stale
-//                    evt.treeSegment.treeViewDataObject = filePickerControllerModule.FilePickerController.prepareContentList(evt.uri, this.pickerModel, true, false);
+//                    evt.treeSegment.treeViewDataObject = this.application.ninja.filePickerController.prepareContentList(evt.uri, this.pickerModel, true, false);
 //                }
             }
     },
@@ -1007,7 +1006,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
             value:function(){
                 //clear memory - TODO:check for more memory leaks
                 this.pickerModel = null;
-                filePickerControllerModule.FilePickerController._directoryContentCache = {};
+                this.application.ninja.filePickerController._directoryContentCache = {};
                 //remove listeners
                 this.element.removeEventListener("openFolder", this, false);//add icon double click event listener to reload iconList with new set of data
                 this.element.removeEventListener("selectedItem", this, false);//for single selection only
-- 
cgit v1.2.3


From a6948e635389768fc316f1fb86df2524b482b47c Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Mon, 13 Feb 2012 18:48:18 -0800
Subject: added logical drive selection to file picker

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 .../ui/FilePicker/pickerNavigator.reel/pickerNavigator.js   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'js/components/ui/FilePicker/pickerNavigator.reel')

diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
index ff9c7073..6b0d92f7 100644
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
@@ -149,6 +149,12 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
                     leftNav.appendChild(newDiv);
                     if(dirObj.uri === this.pickerModel.currentRoot){
                         newDiv.classList.add("highlighted");
+                        //enable ok for logical drive selections, when in directory selection mode
+                        if(this.pickerModel.inFileMode === false){
+                            this.okButton.removeAttribute("disabled");
+                            //put into selectedItems..currently single selection is supported
+                            this.selectedItems = [dirObj.uri];
+                        }
                     }
 
                     newDiv.addEventListener("click", function(evt){that.handleTopLevelDirectoryClicks(evt, dirObj);}, false);
@@ -571,6 +577,13 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
                     if(!evt.target.classList.contains("highlighted")){
                         evt.target.classList.add("highlighted");
                     }
+
+                    //enable ok for logical drive selections, when in directory selection mode
+                    if(this.pickerModel.inFileMode === false){
+                        this.okButton.removeAttribute("disabled");
+                        //put into selectedItems..currently single selection is supported
+                        this.selectedItems = [dirObj.uri];
+                    }
                 }
     },
 
-- 
cgit v1.2.3


From 5b6c62b7164cbde2845a3f7af810568e5ba53a6a Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Mon, 13 Feb 2012 22:39:28 -0800
Subject: File IO UI tweaks

Making minor tweaks to the UI for file IO, will need to make much more at a later time.
---
 .../pickerNavigator.reel/pickerNavigator.css       | 32 ++++++++++++++++++----
 .../pickerNavigator.reel/pickerNavigator.html      |  4 +--
 2 files changed, 28 insertions(+), 8 deletions(-)

(limited to 'js/components/ui/FilePicker/pickerNavigator.reel')

diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
index 93578ec1..9c85c6b5 100644
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
@@ -12,7 +12,11 @@
     padding-left:15px;
     padding-bottom:15px;
     color:#ffffff;
-    background-color:#313131;
+    background-color:#494949;
+    font-family: 'Droid Sans', sans-serif;
+    border-radius: 8px;
+	box-shadow: 0px 0px 8px rgba(0, 0, 0, .8);
+	text-shadow: 1px 1px 1px #000;
 }
 
 .picker .pickerHeader{
@@ -20,7 +24,7 @@
 }
 
 .picker .container{
-    border: 1px groove #000000;
+    border: 1px solid #000000;
     overflow: auto;
     background-color:#5f5f5f;
 }
@@ -39,21 +43,26 @@
     width:75%;
     height:88%;
     overflow: hidden;
+    border-left: none;
 }
 
 .picker .right-top{
-    border: 1px groove #000000;
+    border-right: 1px solid #000000;
     overflow: auto;
     min-height:150px;
     height:75%;
     width:auto;
+    border-right: none;
 }
 
 .picker .right-bottom{
-    border: 1px groove #000000;
+    border: 1px solid #000000;
+    border-left: none;
     overflow: auto;
     height:20%;
     padding: 10px;
+    border-bottom: none;
+    border-right: none;
 }
 
 .picker .driversList{
@@ -194,8 +203,16 @@
     pointer:auto;
 }
 
+.picker .buttons button {
+	float: left;
+	width: 100px;
+	margin-top: 3px;
+}
+
 .picker .okButton{
-    margin-right:25px;
+	margin: 0px 22px 0px 8px; 
+    /*
+margin-right:25px;
     -webkit-box-align: center;
     text-align: center;
     cursor: default;
@@ -206,10 +223,12 @@
     border-radius:10px;
     background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%);
     cursor:pointer;
+*/
 }
 
 .picker .cancelButton{
-    -webkit-box-align: center;
+    /*
+-webkit-box-align: center;
     text-align: center;
     cursor: default;
     padding: 0px 6px 0px;
@@ -219,6 +238,7 @@
     border-radius:10px;
     background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%);
     cursor:pointer;
+*/
 }
 
 .picker input[type="button"]:disabled{
diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html
index bd427f97..20cb0c68 100755
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html
@@ -67,8 +67,8 @@
         <div id="right-bottom" class="right-bottom"></div>
     </div>
     <div class="buttons">
-        <input id="cancelButton" type="button" value="CANCEL" class="cancelButton nj-skinned" />
-        <input id="okButton" disabled="true" type="button" value="OK" class="okButton nj-skinned" />
+        <button id="cancelButton" value="CANCEL" class="cancelButton nj-skinned">Cancel</button>
+        <button id="okButton" disabled="true" value="OK" class="okButton nj-skinned">Ok</button>
     </div>
     <div id="filters" class="filters" style="display:block;">
         <div class="dropdown hide"></div>
-- 
cgit v1.2.3


From 68ce64a5a2f4a71b54d33916aaf1d57161302425 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Tue, 14 Feb 2012 20:48:40 -0800
Subject: Reverting text/html document classes and setting up MVC folder
 structure

Setting up the folder structure for the proposed set up for documents in Ninja. Reverted to have a temp HTML/Text document class. Tweak some UI for file pickers.
---
 js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'js/components/ui/FilePicker/pickerNavigator.reel')

diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
index 9c85c6b5..796c283f 100644
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
@@ -6,7 +6,7 @@
 
 .picker{
     font-size:12px;
-    width:510px;
+    width:523px;
     height:500px;
     padding-top:15px;
     padding-left:15px;
@@ -53,6 +53,7 @@
     height:75%;
     width:auto;
     border-right: none;
+    margin: 8px 0px 0px 8px;
 }
 
 .picker .right-bottom{
-- 
cgit v1.2.3


From 729e32ee70b0dd30a3b498ed7d1636b1b5b56a43 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Thu, 16 Feb 2012 11:18:21 -0800
Subject: Squashed commit of the following:

commit 302ae3c1812086d976eb67c9cf693c43205f3904
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Thu Feb 16 11:13:05 2012 -0800

    hide the rulers when no document is open

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

commit 2e766c9eaa98fa20f311b3eb2f892a1a240e90cf
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Thu Feb 16 06:43:33 2012 -0800

    file picker:
    Enable ok if user double clicks folder and enter it.
    Validate path if user enter it manually in addressbar.

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

commit 4937b39fb0cf542f57cdadc7d1e2ed9798f7ef87
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Wed Feb 15 16:09:14 2012 -0800

    fixes to document tabbing

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

commit 56d2a8d11a73cd04c7f1bc20d1ded52b9c1242f2
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Wed Feb 15 10:54:38 2012 -0800

    Revert "Revert "Creating NinjaTemplate to HTML function""

    This reverts commit 2e308be9bec5e06d81b2905b65005a232f0a190d.

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

commit e2b97c951a9a5a0c4ff831d44fdd82177cbd82ad
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Wed Feb 15 10:54:14 2012 -0800

    Revert "Revert "Reverting text/html document classes and setting up MVC folder structure""

    This reverts commit 9048cd50bf5e0a418d1d95498bb593961f72db36.

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

commit aead95ce4b2571356701229567bfde73d54bed93
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Wed Feb 15 10:53:55 2012 -0800

    Revert "Revert "Cleaning up""

    This reverts commit a90e3be8850b64e8e370aa8ff8cadaa448dd0c82.

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

commit a8d1a2e1f4f4ab7b9298bfbd1b49731785c79c3a
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Wed Feb 15 10:52:56 2012 -0800

    Revert "Revert "Merging TextDocument into BaseDocument""

    This reverts commit b8782f2e3dd106accbb0160a98e6b498f26752ea.

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

commit e864dc319805e259b7ae39a9d4d96fac552a1f87
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Wed Feb 15 10:52:38 2012 -0800

    Revert "merging from github.com/joseeight/ninja-internal/tree/FileIO is breaking opening html files… to trying to fix local build"

    This reverts commit 3cf1d19c5cdc9534d9c87cbc7d1fcf48e68daa42.

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

commit 3cf1d19c5cdc9534d9c87cbc7d1fcf48e68daa42
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Wed Feb 15 10:06:42 2012 -0800

    merging from github.com/joseeight/ninja-internal/tree/FileIO is breaking opening html files… to trying to fix local build

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

commit b8782f2e3dd106accbb0160a98e6b498f26752ea
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Wed Feb 15 10:01:59 2012 -0800

    Revert "Merging TextDocument into BaseDocument"

    This reverts commit 93c8f327d662a7693d1d6ca050a0efd15ebc18ed.

    Conflicts:

    	js/controllers/document-controller.js

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

commit a90e3be8850b64e8e370aa8ff8cadaa448dd0c82
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Wed Feb 15 09:58:37 2012 -0800

    Revert "Cleaning up"

    This reverts commit a7952c5a16e2cae3fd1a459b03b9f16bba1004da.

    Conflicts:

    	js/controllers/document-controller.js
    	js/io/document/text-document.js

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

commit 9048cd50bf5e0a418d1d95498bb593961f72db36
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Wed Feb 15 09:51:12 2012 -0800

    Revert "Reverting text/html document classes and setting up MVC folder structure"

    This reverts commit 68ce64a5a2f4a71b54d33916aaf1d57161302425.

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

commit 2e308be9bec5e06d81b2905b65005a232f0a190d
Author: Ananya Sen <Ananya.Sen@motorola.com>
Date:   Wed Feb 15 09:50:20 2012 -0800

    Revert "Creating NinjaTemplate to HTML function"

    This reverts commit e327eccb93e2bc513fcbb7ab302783d6bce83884.

    Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 .../pickerNavigator.reel/pickerNavigator.js        | 32 +++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

(limited to 'js/components/ui/FilePicker/pickerNavigator.reel')

diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
index 6b0d92f7..411386f9 100644
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
@@ -203,6 +203,13 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
                 this.pickerModel.storeHistory(this.pickerModel.currentRoot);//populate history
 
                 this.updateMetadata(this.currentURI);
+
+                //for directory selection, selected url is the folder entered
+                if(!this.pickerModel.inFileMode ){
+                    this.okButton.removeAttribute("disabled");
+                    //put into selectedItems..currently single selection is supported
+                    this.selectedItems = [this.pickerModel.currentRoot];
+                }
             }
 
             this.element.addEventListener("openFolder", function(evt){that.handlePickerNavOpenFolder(evt);}, false);//add icon double click event listener to reload iconList with new set of data
@@ -211,6 +218,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
             this.element.addEventListener("updateMetadata", function(evt){that.handlePickerNavUpdateMetadata(evt);}, false);//show metadata on click of icon
             //this.addressGo.addEventListener("click", this, false);
             this.addressBarUri.addEventListener("keydown", this, false);
+            this.addressBarUri.addEventListener("keyup", this, false);
             this.refreshButton.addEventListener("click", this, false);//refresh - gets from file system directly
             this.backArrow.addEventListener("click", this, false);
             this.forwardArrow.addEventListener("click", this, false);
@@ -608,6 +616,13 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
                         this.backArrow.classList.remove("disable");
                     }
 
+                    //for directory selection, selected url is the folder entered
+                    if(!this.pickerModel.inFileMode ){
+                        this.okButton.removeAttribute("disabled");
+                        //put into selectedItems..currently single selection is supported
+                        this.selectedItems = [evt.folderUri];
+                    }
+
                 }
     },
 
@@ -720,6 +735,21 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
               }
     },
 
+    handleAddressBarUriKeyup:{
+        value: function(evt){
+            //disable ok if user enters an invalid uri
+            if(!this.application.ninja.coreIoApi.isValidUri(this.addressBarUri.value)){
+                //disable OK
+                if(!this.okButton.hasAttribute("disabled")){
+                    this.okButton.setAttribute("disabled", "true");
+                }
+            }else{
+                this.okButton.removeAttribute("disabled");
+                this.selectedItems = [this.addressBarUri.value];
+            }
+        }
+    },
+
     handleRefreshButtonClick:{
         value:function(evt){
                 var uri = this.addressBarUri.value;
@@ -794,7 +824,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
 
     handleOkButtonAction : {
         value: function(evt){
-                    console.log("$$$ File Picker : selected "+ this.selectedItems.toString());
+                    //console.log("$$$ File Picker : selected "+ this.selectedItems.toString());
                     var success = true;
                     if(!!this.pickerModel.callback && (this.selectedItems.length > 0)){//call the callback if it is available
                         try{
-- 
cgit v1.2.3