Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit f0a3963

Browse files
committed
Fix global_toolbar for safari
Fix empty_recycle: call parseXmlMessage
1 parent 7766fb4 commit f0a3963

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

core/src/plugins/access.fs/fsActions.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,9 @@
205205
<serverCallback methodName="switchAction" restParams="/"/>
206206
<clientCallback prepareModal="false"><![CDATA[
207207
modal.showDialogForm('EmptyRecycle', 'empty_recycle_form', null, function(){
208-
PydioApi.getClient().request({get_action:'empty_recycle'});
208+
PydioApi.getClient().request({get_action:'empty_recycle'}, function(transport){
209+
PydioApi.getClient().parseXmlMessage(transport.responseXML);
210+
});
209211
hideLightBox(true);
210212
return false;
211213
});

core/src/plugins/gui.ajax/res/themes/orbit/css/pydio.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6353,6 +6353,7 @@ div.dialogButtons.inlineEdition input {
63536353
}
63546354
#ajxp_desktop[class^="ajxp_ws-"] #global_toolbar,
63556355
#ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar {
6356+
position: relative;
63566357
height: 47px;
63576358
padding: 0 15px 0 5px;
63586359
background: #009688 no-repeat 7px 7px;

core/src/plugins/gui.ajax/res/themes/orbit/css/theme/toolbars.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868

6969
#ajxp_desktop[class^="ajxp_ws-"] #global_toolbar,
7070
#ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar {
71+
position: relative;
7172
height: @globalToolbarHeight;
7273
padding: 0 15px 0 5px;
7374
background: @topBarBackgroundColor no-repeat 7px 7px;

0 commit comments

Comments
 (0)