Fix #486

pydio · Oct 16, 2014 · 88a323d · 88a323d
1 parent c4b9bd6
commit 88a323d
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 12 deletions.
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.AjxpPane.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.AjxpPane.js
@@ -108,7 +108,7 @@ Class.create("AjxpPane", {
                 }else{
                     this.htmlElement.addClassName(cName);
                 }
-                if(cPref['externalButtonId']){
+                if(cPref['externalButtonId'] && $(cPref['externalButtonId'])){
                     $(cPref['externalButtonId']).toggleClassName(cPref['externalButtonClassName'])
                 }
             }

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
@@ -578,11 +578,11 @@ Class.create("FilesList", SelectableElements, {
 				init:function(){
                     var actBar = window.ajaxplorer.actionBar;
                     oThis.observe('switch-display-mode', function(e){
-                        if(oThis._displayMode == 'list') actBar.getActionByName("thumbs_sortby").disable();
+                        if(oThis._displayMode == 'list') actBar.getActionByName(oThis.htmlElement.id+'-thumbs_sortby').disable();
                         else actBar.getActionByName("thumbs_sortby").enable();
                     });
                     window.setTimeout(function(){
-                        if(oThis._displayMode == 'list') actBar.getActionByName("thumbs_sortby").disable();
+                        if(oThis._displayMode == 'list') actBar.getActionByName(oThis.htmlElement.id+'-thumbs_sortby').disable();
                         else actBar.getActionByName("thumbs_sortby").enable();
                     }.bind(window.listenerContext), 800);
                 }

diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css
@@ -4792,7 +4792,6 @@ textarea.editor
     font-family:monospace;
     font-size:13px;
     line-height:16px;
-    white-space:normal;
 }
 
 .diaporamaButton

diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/allz.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/allz.css
diff --git a/core/src/plugins/gui.ajax/res/themes/oxygen/css/ajaxplorer.css b/core/src/plugins/gui.ajax/res/themes/oxygen/css/ajaxplorer.css
@@ -2319,7 +2319,6 @@ textarea.editor
 	font-family:monospace;
 	font-size:13px;
 	line-height:16px;
-	white-space:normal;
 }
 
 .diaporamaButton

diff --git a/core/src/plugins/gui.ajax/res/themes/oxygen/css/allz.css b/core/src/plugins/gui.ajax/res/themes/oxygen/css/allz.css
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/css/ajaxplorer.css b/core/src/plugins/gui.ajax/res/themes/umbra/css/ajaxplorer.css
@@ -2773,7 +2773,6 @@ textarea.editor
 	font-family:monospace;
 	font-size:13px;
 	line-height:16px;
-	white-space:normal;
 }
 
 .diaporamaButton

diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/css/allz.css b/core/src/plugins/gui.ajax/res/themes/umbra/css/allz.css
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
@@ -3954,7 +3954,6 @@ textarea.editor
     font-family:monospace;
     font-size:13px;
     line-height:16px;
-    white-space:normal;
 }
 
 .diaporamaButton

diff --git a/core/src/plugins/gui.ajax/res/themes/vision/css/allz.css b/core/src/plugins/gui.ajax/res/themes/vision/css/allz.css