Permalink
Browse files

Fix infoPanel action bars initialization when in editor mode. Fix #1145

(cherry picked from commit dd09a05)
  • Loading branch information...
1 parent 1d2301a commit 13827aeaaf1c472d7992e4848637d4bc0d1f8006 @cdujeu cdujeu committed Jul 7, 2016
Showing with 5 additions and 2 deletions.
  1. +5 −2 core/src/plugins/gui.ajax/res/js/ui/prototype/class.InfoPanel.js
@@ -89,12 +89,15 @@ Class.create("InfoPanel", AjxpPane, {
document.stopObserving("ajaxplorer:user_logged", this.userLogHandler );
this.htmlElement.up('div.dialogBox').setStyle({width:Math.min(450, document.viewport.getWidth())+'px'});
this.htmlElement.up('div.dialogContent').setStyle({padding:0});
- this.htmlElement.down('#ip_content_info_panel').setStyle({position:"relative", top:0, left:0, width:'100%', height: Math.min(450, document.viewport.getHeight()-28)+'px', overflow:'auto'});
+ this.contentContainer = this.htmlElement.down('#ip_content_info_panel');
+ this.contentContainer.setStyle({position:"relative", top:0, left:0, width:'100%', height: Math.min(450, document.viewport.getHeight()-28)+'px', overflow:'auto'});
try{
this.htmlElement.down('#ip_content_modal_action_form').remove();
this.htmlElement.down('#ip_scroller_modal_action_form').remove();
}catch (e){}
modal.refreshDialogPosition();
+ this.options.skipActions = true;
+ this.addActions("unique");
},
/**
@@ -148,7 +151,7 @@ Class.create("InfoPanel", AjxpPane, {
update : function(objectOrEvent){
if(!this.htmlElement) return;
var passedNode;
- if(objectOrEvent.__className && objectOrEvent.__className == "AjxpNode"){
+ if(objectOrEvent instanceof AjxpNode){
passedNode = objectOrEvent;
}
this.insertedTemplates = $A();

0 comments on commit 13827ae

Please sign in to comment.