Merge branch 'pentool' into brushtool

Conflicts:
	imports/codemirror/mode/scheme/scheme.js
	js/tools/BrushTool.js

1 files changed, 128 insertions, 0 deletions

diff --git a/js/io/ui/file-picker/file-picker-model.js b/js/io/ui/file-picker/file-picker-model.js
new file mode 100755
index 00000000..09c3ae9c
--- /dev/null
+++ b/js/io/ui/file-picker/file-picker-model.js
@@ -0,0 +1,128 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+var filePickerControllerModule = require("js/io/ui/file-picker/file-picker-controller");
+
+//this is per file picker instance
+exports.FilePickerModel = (require("montage/core/core").Montage).create(require("montage/ui/component").Component, {
+
+    fatalError:{
+         writable:true,
+         enumerable:true,
+         value:null
+    },
+
+    _fileFilters:{
+            writable:true,
+            enumerable:false,
+            value:null
+        },
+        fileFilters:{
+            get:function(){
+                return this._fileFilters;
+            },
+            set:function(value){
+                this._fileFilters = value;
+            }
+        },
+        _currentFilter:{
+            writable:true,
+            enumerable:false,
+            value:null
+        },
+        currentFilter:{
+            get:function(){
+                return this._currentFilter;
+            },
+            set:function(value){
+                this._currentFilter = value;
+            }
+        },
+
+        /**
+         * true -> file selection mode
+         * false -> directory selection mode
+         */
+        inFileMode:{
+            writable:true,
+            enumerable:false,
+            value:null
+        },
+
+    /**
+     * pickerMode: ["read", "write"] : specifies if the file picker is opened to read a file/folder or to save a file
+     */
+        pickerMode:{
+            writable:true,
+            enumerable:false,
+            value:null
+        },
+
+        topLevelDirectories:{
+            writable:true,
+            enumerable:true,
+            value:[]
+        },
+
+        currentRoot:{
+            writable:true,
+            enumerable:true,
+            value:""
+        },
+
+        callback:{
+            writable:true,
+            enumerable:true,
+            value:null
+        },
+
+        callbackScope:{
+            writable:true,
+            enumerable:true,
+            value:null
+        },
+
+        /**
+         * stores the previously viewed directory uris in an array [FILO] per file picker instance
+         */
+        _history:{
+            writable:true,
+            enumerable:true,
+            value:[]//array of visited URIs for the back/forward arrows
+        },
+
+    /**
+     * store history of folders navigated if it was already not visited last
+     */
+        storeHistory:{
+            writable:false,
+            enumerable:true,
+            value:function(uri){
+                //remove redundant / at end
+//                uri = new String(uri);
+//                if((uri.charAt(uri.length - 1) === "/") || (uri.charAt(uri.length - 1) === "\\")){
+//                    uri = uri.substring(0, (uri.length - 1));
+//                }
+                //console.log("storeHistory: "+uri);
+                if(uri && (uri !== this._history[this._history.length -1]) && (!!filePickerControllerModule.FilePickerController._directoryContentCache[uri]) && (filePickerControllerModule.FilePickerController._directoryContentCache[uri].type === "directory")){
+                    //remove history after current pointer
+                    if(this._history.length >0){
+                        this._history.splice((this.currentHistoryPointer+1), (this._history.length - this.currentHistoryPointer - 1));
+                    }
+                    //now add the new state
+                    this._history.push(uri);
+                    this.currentHistoryPointer = this._history.length -1;
+                    //console.log("### stored: "+uri+" : pointer="+this.currentHistoryPointer);
+                }
+            }
+        },
+
+        currentHistoryPointer:{
+            writable:true,
+            enumerable:true,
+            value:-1
+        }
+});
\ No newline at end of file