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

Commit

Permalink
Fix #356
Browse files Browse the repository at this point in the history
  • Loading branch information
@cdujeu
cdujeu committed Dec 12, 2013
1 parent 05f1d71 commit 0ea5b3a
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 10 deletions.
6 changes: 3 additions & 3 deletions core/src/plugins/gui.ajax/manifest.xml
View file
Expand Up @@ -106,7 +106,7 @@
</div>
<div id="searchbar_splitter" style="overflow:hidden;" ajxpClass="Splitter" ajxpOptions='{"direction":"horizontal","initA":0, "minSize":0, "startFolded": true, "foldingButton": "A"}'>
<div id="search_container" ajxpClass="SearchEngine" ajxpPaneHeader="87" ajxpPaneIcon="xmag.png" data-globalOptions='{"headerClose":{"icon":"panel_vertical_hide.png","splitter":"searchbar_splitter","title":86}}' style="height: 0px; overflow:hidden;"></div>
<div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"displayMode":"list","replaceScroller":true}' style="border: 1px solid #bbb;"></div>
<div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"displayMode":"list","replaceScroller":true, "messageBoxReference":true}' style="border: 1px solid #bbb;"></div>
</div>
</div>
</div>
Expand Down Expand Up @@ -143,7 +143,7 @@
<div id="display_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["default"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
<div id="breadcrumb" ajxpClass="Breadcrumb" style="width:50%;" ajxpOptions='{"flexTo":"cpane_tabs"}'></div>
</div>
<div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"displayMode":"detail","replaceScroller":true, "fit":"height", "fitParent":"files_lit_pane", "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px"}' style="border-left: 1px solid #bbb;"></div>
<div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"displayMode":"detail","replaceScroller":true, "messageBoxReference":true, "fit":"height", "fitParent":"files_lit_pane", "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px"}' style="border-left: 1px solid #bbb;"></div>
</div>
</div>
</div>
Expand Down Expand Up @@ -192,7 +192,7 @@
<div id="display_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["default"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
<div id="breadcrumb" ajxpClass="Breadcrumb" style="width:50%;" ajxpOptions='{"flexTo":"cpane_header"}'></div>
</div>
<div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"displayMode":"detail", "detailThumbSize": 50 ,"replaceScroller":true, "fit":"height", "fitParent":"cpane_container", "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px", "invisibleSelection":false}' style="border: 1px solid #bbb; border-width:0 1px;"></div>
<div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"displayMode":"detail", "detailThumbSize": 50 ,"replaceScroller":true, "messageBoxReference":true, "fit":"height", "fitParent":"cpane_container", "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px", "invisibleSelection":false}' style="border: 1px solid #bbb; border-width:0 1px;"></div>
</div>
</div>
]]></template>
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/gui.ajax/res/js/ajaxplorer.js
View file

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions core/src/plugins/gui.ajax/res/js/ajaxplorer/class.Ajaxplorer.js
View file
Expand Up @@ -866,6 +866,16 @@ Class.create("Ajaxplorer", {
this._editorOpener = null;
}
},
_messageBoxReference:null,
registerAsMessageBoxReference: function(element){
this._messageBoxReference = element;
},
clearMessageBoxReference:function(){
this._messageBoxReference = null;
},
getMessageBoxReference: function(){
return $(this._messageBoxReference);
},

openCurrentSelectionInEditor:function(editorData, forceNode){
var selectedNode = forceNode ? forceNode : this.getContextHolder().getUniqueNode();
Expand Down
3 changes: 3 additions & 0 deletions core/src/plugins/gui.ajax/res/js/ajaxplorer/class.AjxpPane.js
View file
Expand Up @@ -58,6 +58,9 @@ Class.create("AjxpPane", {

}
}
if(this.options.messageBoxReference && ajaxplorer){
ajaxplorer.registerAsMessageBoxReference(this.htmlElement);
}

},

Expand Down
13 changes: 8 additions & 5 deletions core/src/plugins/gui.ajax/res/js/ajaxplorer/class.Modal.js
View file
Expand Up @@ -641,18 +641,21 @@ Class.create("Modal", {
if(messageType == "ERROR"){ this.messageBox.removeClassName('logMessage'); this.messageBox.addClassName('errorMessage');}
else { this.messageBox.removeClassName('errorMessage'); this.messageBox.addClassName('logMessage');}
this.messageContent.update(message);
var container = $('content_pane');
if(!container){

var container;
if(ajaxplorer.getMessageBoxReference()){
container = ajaxplorer.getMessageBoxReference();
}else if($('content_pane')) {
container = $('content_pane');
}else {
container = $(ajxpBootstrap.parameters.get("MAIN_ELEMENT"));
}
var containerOffset = Position.cumulativeOffset(container);
var containerDimensions = container.getDimensions();
var boxHeight = $(this.messageBox).getHeight();
var topPosition = containerOffset[1] + containerDimensions.height - boxHeight - 20;
var boxWidth = parseInt(containerDimensions.width * 90/100);
var leftPosition = containerOffset[0] + parseInt(containerDimensions.width*5/100);
this.messageBox.setStyle({
top:topPosition+'px',
bottom:'20px',
left:leftPosition+'px',
width:boxWidth+'px'
});
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/gui.ajax/res/js/lib/prototype/cssfx.js
View file
Expand Up @@ -57,7 +57,7 @@ Effect.CSS_ANIMATE = function(effectName, element, options){
["webkitAnimationEnd", "mozAnimationEnd", "oAnimationEnd", "animationEnd"].map(
function(event){
element.observe(event, function(){
element.removeClassName(className);
element.removeClassName('animated ' + className);
});
if(endStyle) element.setStyle(endStyle);
if(options && options.afterFinish) element.observe(event, options.afterFinish);
Expand Down

0 comments on commit 0ea5b3a

Please sign in to comment.