Ellipsis is handled by CSS, it degraded performances for Details view.

pydio · Oct 11, 2013 · 2039669 · 2039669
1 parent c6c0292
commit 2039669
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
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
@@ -690,7 +690,13 @@ Class.create("FilesList", SelectableElements, {
 			}.bind(this);
 			if(this.paginationData && this.paginationData.get('remote_order') && parseInt(this.paginationData.get('total')) > 1){
 				this._sortableTable.setPaginationBehaviour(function(params){
-					this.reload(params);
+                    this.getCurrentContextNode().getMetadata().set("remote_order", params);
+                    var oThis = this;
+                    this.crtContext.observeOnce("loaded", function(){
+                        oThis.crtContext = this ;
+                        oThis.fill(oThis.crtContext);
+                    });
+                    this.getCurrentContextNode().reload();
 				}.bind(this), this.columnsDef, this.paginationData.get('currentOrderCol')||-1, this.paginationData.get('currentOrderDir') );
 			}
 			this.disableTextSelection(this.htmlElement.down('div.sort-table'), true);
@@ -1970,6 +1976,7 @@ Class.create("FilesList", SelectableElements, {
 		var elList;
 		if(one_element) elList = [one_element]; 
 		else elList = this._htmlElement.select('div.thumbnail_selectable_cell');
+        var ellipsisDetected;
 		elList.each(function(element){
             if(element.up('div.thumbnail_selectable_cell.detailed')) return;
 			var node = element.ajxpNode;
@@ -1986,7 +1993,10 @@ Class.create("FilesList", SelectableElements, {
             if(image_element){
                 this._previewFactory.resizeThumbnail(image_element);
             }
-            if(label_element){
+            if(ellipsisDetected == undefined){
+                ellipsisDetected = label_element.getStyle('textOverflow') == "ellipsis";
+            }
+            if(label_element && !ellipsisDetected){
                 // RESIZE LABEL
                 var el_width = (!elementsAreSiblings ? (element.getWidth() - tSize - 10)  : (tSize + 25) ) ;
                 var charRatio = 6;

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.FormManager.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.FormManager.js
@@ -481,7 +481,9 @@ Class.create("FormManager", {
                     }else{
                         fElements = $A([fElement]);
                     }
-                    fElements.invoke((state?"disable":"enable"));
+                    fElements.each(function(el){
+                        if(el && el[(state?"disable":"enable")]) el[(state?"disable":"enable")]();
+                    });
                     if(state) cbox.previous("div.SF_label").addClassName("SF_disabled");
                     else cbox.previous("div.SF_label").removeClassName("SF_disabled");
                 });

diff --git a/core/src/plugins/gui.ajax/res/themes/vision/css/ajaxplorer.css b/core/src/plugins/gui.ajax/res/themes/vision/css/ajaxplorer.css
@@ -221,6 +221,9 @@ div.thumbnail_cell_metadata span.metadata_chunk{
 .thumbLabel
 {
     /*overflow: hidden;*/
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
 }
 
 .img_cont