Merge branch 'pentool' into brushtool

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

37 files changed, 175 insertions, 1967 deletions

diff --git a/js/components/ui/FilePicker/file-picker-controller.js b/js/components/ui/FilePicker/file-picker-controller.js
deleted file mode 100644
index 526578d1..00000000
--- a/js/components/ui/FilePicker/file-picker-controller.js
+++ /dev/null
@@ -1,497 +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 Montage = require("montage/core/core").Montage,
-    pickerNavigatorReel = require("js/components/ui/FilePicker/pickerNavigator.reel").PickerNavigator,
-    filePickerModelModule = require("js/components/ui/FilePicker/file-picker-model"),
-    fileSystem = require("js/io/system/filesystem").FileSystem,
-    Popup = require("montage/ui/popup/popup.reel").Popup;
-
-//singleton with functions to create a new file picker instance and utilities to format or filter the model data
-var FilePickerController = exports.FilePickerController = Montage.create(require("montage/ui/component").Component, {
-    /**
-     * Register a listener for file open event
-     */
-    deserializedFromTemplate:{
-        writable:false,
-        enumerable:true,
-        value:function(){
-            var that = this;
-            this.eventManager.addEventListener("executeFileOpen", function(evt){
-
-                var callback, pickerMode, currentFilter, allFileFilters,inFileMode, allowNewFileCreation, allowMultipleSelections;
-
-                if(!!evt.callback){
-                    callback = evt.callback;
-                }
-                if(!!evt.pickerMode){
-                    pickerMode = evt.pickerMode;
-                }
-                if(!!evt.currentFilter){
-                    currentFilter = evt.currentFilter;
-                }
-                if(!!evt.inFileMode){
-                    inFileMode = evt.inFileMode;
-                }
-                if(!!evt.allFileFilters){
-                    allFileFilters = evt.allFileFilters;
-                }
-                if(!!evt.allowNewFileCreation){
-                    allowNewFileCreation = evt.allowNewFileCreation;
-                }
-                if(!!evt.allowMultipleSelections){
-                    allowMultipleSelections = evt.allowMultipleSelections;
-                }
-
-                that.showFilePicker(callback, pickerMode, currentFilter, allFileFilters,inFileMode, allowNewFileCreation, allowMultipleSelections);
-
-            }, false);
-        }
-    },
-
-    /**
-     * this will be stored in the local storage and in the cloud may be, for the cloud one.
-     */
-    _lastOpenedFolderURI:{
-        writable:true,
-        enumerable:true,
-        value:{
-            lastFolderUri_local:null,
-            lastFolderUri_cloud:null
-        }
-    },
-
-    /**
-     * this will be stored in the local storage and in the cloud may be, for the cloud one.
-     */
-    _lastSavedFolderURI:{
-        writable:true,
-        enumerable:true,
-        value:{
-            lastSavedFolderUri_local:null,
-            lastSavedFolderUri_cloud:null
-        }
-    },
-
-    /**
-     *this function is used to create an instance of a file picker
-     *
-     * parameters:
-     * callback: the call back function which will be used to send the selected URIs back
-     * pickerMode: ["read", "write"] : specifies if the file picker is opened to read a file/folder or to save a file
-     * currentFilter: if a current filter needs to be applied [ex: .psd]
-     * allFileFilters: list of filters that user can use to filter the view
-     * inFileMode: true => allow file selection , false => allow directory selection
-     * allowNewFileCreation:  flag to specify whether or not it should return URI(s) to item(s) that do not exist. i.e. a user can type a filename to a new file that doesn't yet exist in the file system.
-     * allowMultipleSelections: allowMultipleSelections
-     *rootDirectories: invoker of this function can mention a subset of the allowed root directories to show in the file picker
-     *
-     * return: none
-     */
-
-    showFilePicker:{
-        writable:false,
-        enumerable:true,
-        value:function(callback, pickerMode, currentFilter, allFileFilters,inFileMode, allowNewFileCreation, allowMultipleSelections){
-
-            var aModel = filePickerModelModule.FilePickerModel.create();
-
-            var topLevelDirectories = null;
-            var driveData = fileSystem.shellApiHandler.getDirectoryContents({uri:"", recursive:false, returnType:"all"});
-            if(driveData.success){
-                topLevelDirectories = (JSON.parse(driveData.content)).children;
-            }else{
-                var errorCause = "";
-                if(driveData.status === null){
-                    errorCause = "Service Unavailable"
-                }else{
-                    errorCause = driveData.status;
-                }
-                aModel.fatalError = " ** Unable to get files [Error: "+ errorCause +"]";
-            }
-
-            aModel.currentFilter = currentFilter;
-            aModel.inFileMode = inFileMode;
-            aModel.topLevelDirectories = topLevelDirectories;
-
-            if(!!topLevelDirectories && !!topLevelDirectories[0]){
-                aModel.currentRoot = topLevelDirectories[0].uri;
-            }
-
-            //populate the last opened folder first, if none then populate default root
-            var sessionStorage = window.sessionStorage;
-            var storedUri = null;
-
-            if(pickerMode === "write"){
-                storedUri = sessionStorage.getItem("lastSavedFolderURI");
-            }else{
-                storedUri = sessionStorage.getItem("lastOpenedFolderURI");
-            }
-
-            if(!!storedUri){
-                aModel.currentRoot = unescape(storedUri);
-            }
-
-            aModel.fileFilters = allFileFilters;
-            aModel.callback = callback;
-            aModel.pickerMode = pickerMode;
-