Fix simple tabs, fix #373 date modified sorts wrong

pydio · Mar 17, 2014 · 79c547e · 79c547e
1 parent a334697
commit 79c547e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/core/src/plugins/editor.ajxp_plugin/class.PluginEditor.js b/core/src/plugins/editor.ajxp_plugin/class.PluginEditor.js
@@ -37,6 +37,9 @@ Class.create("PluginEditor", AbstractEditor, {
         var infoPane = this.element.down("#pane-infos");
         var docPane = this.element.down("#pane-docs");
         var oElement = this.element;
+        if(editorOptions.context.__className == 'Modal') {
+            oElement = null;
+        }
         infoPane.setStyle({position:"relative"});
         infoPane.resizeOnShow = function(tab){
             fitHeightToBottom(infoPane, oElement, Prototype.Browser.IE ? 40 : 0);

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer.js
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.AjxpSimpleTabs.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.AjxpSimpleTabs.js
@@ -81,6 +81,7 @@ Class.create("AjxpSimpleTabs", AjxpPane, {
         this.panes.insert(pane);
         if(this.fitHeight) fitHeightToBottom(pane, this.panes);
         pane.setStyle({overflowY:"auto"});
+        attachMobileScroll(pane, "vertical");
         tab.setSelected = function(){
             this.panes.childElements("div.tabPane").invoke("hide");
             tab.tabPANE.show();

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.FilesList.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.FilesList.js
@@ -718,7 +718,7 @@ Class.create("FilesList", SelectableElements, {
                         oThis.fill(oThis.crtContext);
                     });
                     this.getCurrentContextNode().reload();
-				}.bind(this), this.columnsDef, this.paginationData.get('currentOrderCol')||-1, this.paginationData.get('currentOrderDir') );
+				}.bind(this), this.getVisibleColumns(), this.paginationData.get('currentOrderCol')||-1, this.paginationData.get('currentOrderDir') );
 			}
 			this.disableTextSelection(this.htmlElement.down('div.sort-table'), true);
 			this.disableTextSelection(contentContainer, true);