16 files changed, 301 insertions, 156 deletions

diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.js b/js/components/ui/icon-list-basic/icon.reel/icon.js
index b0279207..72adbfa1 100755
--- a/js/components/ui/icon-list-basic/icon.reel/icon.js
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.js
@@ -131,6 +131,11 @@ var Icon = exports.Icon = Montage.create(Component, {
                     openFolderEvent.initEvent("openFolder", false, false);
                     openFolderEvent.folderUri = this.icondata.uri;
                     this.element.dispatchEvent(openFolderEvent);
+                }else{
+                    var openFolderEvent = document.createEvent("Events");
+                    openFolderEvent.initEvent("selectFile", false, false);
+                    openFolderEvent.fileUri = this.icondata.uri;
+                    this.element.dispatchEvent(openFolderEvent);
                 }
                 if(evt.bubbles){
                         evt.stopPropagation();
diff --git a/js/components/ui/tree-basic/treeItem.reel/treeItem.js b/js/components/ui/tree-basic/treeItem.reel/treeItem.js
index 755eab8c..4c71cb6b 100755
--- a/js/components/ui/tree-basic/treeItem.reel/treeItem.js
+++ b/js/components/ui/tree-basic/treeItem.reel/treeItem.js
@@ -225,6 +225,11 @@ exports.TreeItem = Montage.create(Component, {
                         openFolderEvent.initEvent("openFolder", false, false);
                         openFolderEvent.folderUri = this.treeItemData.uri;
                         this.element.dispatchEvent(openFolderEvent);
+                    }else{
+                        var openFolderEvent = document.createEvent("Events");
+                        openFolderEvent.initEvent("selectFile", false, false);
+                        openFolderEvent.fileUri = this.treeItemData.uri;
+                        this.element.dispatchEvent(openFolderEvent);
                     }
                     if(evt.bubbles){
                             evt.stopPropagation();
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index fa611de4..77ae67a1 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -58,6 +58,8 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             this.eventManager.addEventListener("executeFileOpen", this, false);
             this.eventManager.addEventListener("executeNewFile", this, false);
             this.eventManager.addEventListener("executeSave", this, false);
+            this.eventManager.addEventListener("executeSaveAs", this, false);
+            this.eventManager.addEventListener("executeSaveAll", this, false);
 
             this.eventManager.addEventListener("recordStyleChanged", this, false);
             
@@ -102,33 +104,57 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     handleExecuteFileOpen: {
         value: function(event) {
             var pickerSettings = event._event.settings || {};
-            pickerSettings.callback = this.openFileWithURI.bind(this);
-            pickerSettings.pickerMode = "read";
-            pickerSettings.inFileMode = true;
-            this.application.ninja.filePickerController.showFilePicker(pickerSettings);
+            if (this.application.ninja.coreIoApi.cloudAvailable()) {
+                pickerSettings.callback = this.openFileWithURI.bind(this);
+                pickerSettings.pickerMode = "read";
+                pickerSettings.inFileMode = true;
+                this.application.ninja.filePickerController.showFilePicker(pickerSettings);
+            }
         }
     },
 
     handleExecuteNewFile: {
             value: function(event) {
                 var newFileSettings = event._event.settings || {};
-                newFileSettings.callback = this.createNewFile.bind(this);
-                this.application.ninja.newFileController.showNewFileDialog(newFileSettings);
+                if (this.application.ninja.coreIoApi.cloudAvailable()) {
+                    newFileSettings.callback = this.createNewFile.bind(this);
+                    this.application.ninja.newFileController.showNewFileDialog(newFileSettings);
+                }
             }
     },
-        
-        
         ////////////////////////////////////////////////////////////////////
         //TODO: Check for appropiate structures
     handleExecuteSave: {
         value: function(event) {
-            if(!!this.activeDocument){
-                //Text and HTML document classes should return the same save object for fileSave
-                this.application.ninja.ioMediator.fileSave(this.activeDocument.save(), this.fileSaveResult.bind(this));
+            if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
+                //Text and HTML document classes should return the same save object for fileSave
+                this.application.ninja.ioMediator.fileSave(this.activeDocument.save(), this.fileSaveResult.bind(this));
+            }
                 }
+    },
+    ////////////////////////////////////////////////////////////////////
+        //TODO: Check for appropiate structures
+    handleExecuteSaveAll: {
+        value: function(event) {
+            if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
+                //Text and HTML document classes should return the same save object for fileSave
+                this.application.ninja.ioMediator.fileSave(this.activeDocument.saveAll(), this.fileSaveResult.bind(this));
+            }
                 }
     },
     ////////////////////////////////////////////////////////////////////
+    handleExecuteSaveAs: {
+        value: function(event) {
+            var saveAsSettings = event._event.settings || {};
+            if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
+                saveAsSettings.fileName = this.activeDocument.name;
+                saveAsSettings.folderUri = this.activeDocument.uri.substring(0, this.activeDocument.uri.lastIndexOf("/"));
+                //add callback
+                this.application.ninja.newFileController.showSaveAsDialog(saveAsSettings);
+            }
+        }
+    },
+
     //
     fileSaveResult: {
         value: function (result) {
@@ -287,7 +313,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             if(this.activeDocument.uuid === id && this._documents.length > 0) {//closing the active document tab
                 var nextDocumentIndex = -1 ;
                 if((this._documents.length > 0) && (closeDocumentIndex === 0)){
-                    nextDocumentIndex = 1;
+                    nextDocumentIndex = 0;
                 }else if((this._documents.length > 0) && (closeDocumentIndex > 0)){
                     nextDocumentIndex = closeDocumentIndex - 1;
                 }
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 885d710f..662816f5 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -317,7 +317,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
                     isInlineStyle : true,
                     style         : element.style
                 };
-                
+
                 ///// Now splice it into the matched rules
                 ///// By inserting the inline style at the beginning,
                 ///// we keep the correct order of specificity
@@ -572,37 +572,36 @@ var stylesController = exports.StylesController = Montage.create(Component, {
                 win = element.ownerDocument.defaultView,
                 self = this;
 
-            if(!win) {
-                return null;
-            }
-                
             if(!omitPseudos) {
                 pseudos.concat(['link', 'visited', 'active', 'hover', 'focus', 'first-letter', 
                                 'first-line', 'first-child', 'before', 'after', 'lang', 'target']);
             }
 
-            pseudos.forEach(function(pseudo) {
-                rules = rules.concat(nj.toArray(win.getMatchedCSSRules(element, pseudo)).filter(function(rule) {
-                    //// useStageStyleSheet flag indicates whether to only return rules from the stylesheet,
-                    //// or only use rules for other stylesheets
-
-                    var sheetId = (rule.parentStyleSheet) ? rule.parentStyleSheet.ownerNode.id : null,
-                        isStageStyleSheet = sheetId === this.CONST.STAGE_SHEET_ID;
+            try {
+                pseudos.forEach(function(pseudo) {
+                    rules = rules.concat(nj.toArray(win.getMatchedCSSRules(element, pseudo)).filter(function(rule) {
+                        //// useStageStyleSheet flag indicates whether to only return rules from the stylesheet,
+                        //// or only use rules for other stylesheets
 
-                    ///// filter out (return false) depending on flag
-                    if(useStageStyleSheet && !isStageStyleSheet) { return false; }
-                    if(!useStageStyleSheet && isStageStyleSheet) { return false; }
+                        var sheetId = (rule.parentStyleSheet) ? rule.parentStyleSheet.ownerNode.id : null,
+                            isStageStyleSheet = sheetId === this.CONST.STAGE_SHEET_ID;
 
-                    ///// Non-filter code - just assigning specificity to the rule
+                        ///// filter out (return false) depending on flag