Merge branch 'pentool' into brushtool

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

1 files changed, 0 insertions, 122 deletions

diff --git a/js/components/ui/FilePicker/file-picker-model.js b/js/components/ui/FilePicker/file-picker-model.js
deleted file mode 100644
index b1df3b4e..00000000
--- a/js/components/ui/FilePicker/file-picker-model.js
+++ /dev/null
@@ -1,122 +0,0 @@
-/* <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/components/ui/FilePicker/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
-        },
-
-        /**
-         * 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