FF do not support innerText, was breaking tabs title update

Make sure removeElements call on proto.menu deregister only current file list Load additional action on RepositorySelect widget on beforeShow event, making sure we don't call loadActionsFromRegistry twice (performances gain) -moz-user-select value "all" instead of "auto"
pydio · Aug 29, 2014 · 863a1fd · 863a1fd
1 parent 913d7f2
commit 863a1fd
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 27 deletions.
diff --git a/core/src/plugins/gui.ajax/manifest.xml b/core/src/plugins/gui.ajax/manifest.xml
@@ -561,7 +561,7 @@
 				<div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
                     <div class="widget_logo"></div>
                     <div id="display_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["inline", "minisite-share-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
-                    <div id="widget_title" ajxpClass="RepositorySimpleLabel" ajxpOptions='{"displayLabelLegend":false,"displayWorkspaceDescription":true}'></div>
+                    <div id="widget_title" style="padding: 28px 0 22px 20px;" ajxpClass="RepositorySimpleLabel" ajxpOptions='{"displayLabelLegend":false,"displayWorkspaceDescription":true}'></div>
                     <div id="cpane_container" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"browser"}'>
                         <div id="cpane_tabs" ajxpClass="AjxpTabulator" ajxpOptions='{"fit":"height", "fitParent":"cpane_container","registerAsEditorOpener":true, "saveState":false, "defaultTabId": "","tabInfos" : [], "uniqueTab":true}'></div>
                     </div>

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.AjxpTabulator.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.AjxpTabulator.js
@@ -156,7 +156,7 @@ Class.create("AjxpTabulator", AjxpPane, {
     shortenLabel: function(label){
         if(label && label.innerHTML){
             if(label.down('.filenameSpan')){
-                var cont = label.down('.filenameSpan').innerText;
+                var cont = label.down('.filenameSpan').innerHTML;
                 if(cont.length > 25){
                     cont = cont.substr(0,7)+"[...]"+cont.substr(-13);
                     label.down('.filenameSpan').update(cont);

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
@@ -1206,8 +1206,13 @@ Class.create("FilesList", SelectableElements, {
     empty : function(skipFireChange){
         this._previewFactory.clear();
         if(this.protoMenu){
-            this.protoMenu.removeElements('.ajxp_draggable');
-            this.protoMenu.removeElements('.selectable_div');
+            if(this._displayMode == "thumb" || this._displayMode == "detail"){
+                this.protoMenu.removeElements('#selectable_div-'+this.__currentInstanceIndex + ' > .ajxpNodeProvider');
+                this.protoMenu.removeElements('#selectable_div-'+this.__currentInstanceIndex);
+            }else{
+                this.protoMenu.removeElements('#table_rows_container-'+this.__currentInstanceIndex);
+                this.protoMenu.removeElements('#table_rows_container-'+this.__currentInstanceIndex+ ' > .ajxpNodeProvider');
+            }
         }
         for(var i = 0; i< AllAjxpDroppables.length;i++){
             var el = AllAjxpDroppables[i];

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.RepositorySelect.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.RepositorySelect.js
@@ -204,26 +204,26 @@ Class.create("RepositorySelect", {
             return;
         }
 
-        var menuItems = $A();
-        if(!this.loadedOnce) {
-            ajaxplorer.actionBar.loadActionsFromRegistry(ajaxplorer.getXmlRegistry());
-            this.loadedOnce = true;
-        }
-        var otherActions = ajaxplorer.actionBar.getActionsForAjxpWidget("RepositorySelect", this.element.id).each(function(otherAction){
-            menuItems.push({
-                name:otherAction.getKeyedText(),
-                alt:otherAction.options.title,
-                action_id:otherAction.options.name,
-                icon_class:otherAction.options.icon_class,
-                className:"edit",
-                image:resolveImageSource(otherAction.options.src, '/images/actions/ICON_SIZE', 16),
-                callback:function(e){this.apply();}.bind(otherAction)
+        var menuActionsLoader = function(){
+            var menuItems = $A();
+            ajaxplorer.actionBar.getActionsForAjxpWidget("RepositorySelect", this.element.id).each(function(otherAction){
+                menuItems.push({
+                    name:otherAction.getKeyedText(),
+                    alt:otherAction.options.title,
+                    action_id:otherAction.options.name,
+                    icon_class:otherAction.options.icon_class,
+                    className:"edit",
+                    image:resolveImageSource(otherAction.options.src, '/images/actions/ICON_SIZE', 16),
+                    callback:function(e){this.apply();}.bind(otherAction)
+                });
             });
-        });
-        if(menuItems.length){
-            actions.push({separator:true});
-            actions = actions.concat(menuItems);
-        }
+            if(menuItems.length){
+                actions.push({separator:true});
+                actions = actions.concat(menuItems);
+            }
+            this.repoMenu.options.menuItems = actions;
+            this.repoMenu.refreshList();
+        }.bind(this);
 
 		if(this.repoMenu){
 			this.repoMenu.options.menuItems = actions;
@@ -245,6 +245,7 @@ Class.create("RepositorySelect", {
                 menuMaxHeight:this.options.menuMaxHeight,
                 menuFitHeight:this.options.menuFitHeight,
 				fade:true,
+                beforeShow:menuActionsLoader,
 				zIndex:1500
 			});
 			this.notify("createMenu");

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.RepositorySimpleLabel.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.RepositorySimpleLabel.js
@@ -75,6 +75,8 @@ Class.create("RepositorySimpleLabel", AjxpPane, {
                     }
                 }
             }
+            var upDiv = this.htmlElement.up('[ajxpClass="AjxpPane"]');
+            if(upDiv) upDiv.ajxpPaneObject.resize();
         }.bind(this);
         document.observe("ajaxplorer:repository_list_refreshed", this.observer);
     },

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
@@ -4038,7 +4038,7 @@ div.selectable_div, .table_rows_container, #tree_container, #bottomSplitPane, .a
 }
 
 input, textarea, .selectable{
-    -moz-user-select: auto;
+    -moz-user-select: all;
     -khtml-user-select: auto;
     -webkit-user-select: auto;
     user-select: auto;
@@ -5537,7 +5537,7 @@ input#webdav_password{
 }
 
 #video_container{
-    margin: 5px 20px 5px 10px !important;
+    /*margin: 5px 20px 5px 10px !important;*/
 }
 
 td.ip_geo_cell{
@@ -5782,7 +5782,7 @@ div.flat_tabulator > div:not(.tabulatorContainer){
 }
 
 div#userdashboard_main_tab.horizontal_tabulator div.tabulatorContainer{
-    padding-top: 77px;
+    padding-top: 95px;
 }
 
 div#userdashboard_myparams_title{