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

Commit

Permalink
Fix CSSFX / Fix create user panel
Browse files Browse the repository at this point in the history
  • Loading branch information
cdujeu committed Dec 18, 2013
1 parent e736b12 commit 30078c0
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 9 deletions.
Expand Up @@ -154,6 +154,7 @@ Class.create("AjxpUsersCompleter", Ajax.Autocompleter, {
}else if(selectedLi.getAttribute("data-temporary") && createActionPanel){

element.readOnly = true;
createActionPanel.update('');
var params = $A(ajaxplorer.getPluginConfigs('conf').get('NEWUSERS_EDIT_PARAMETERS').split(','));
for(var i=0;i<params.length;i++){
params[i] = "user/preferences/pref[@exposed]|//param[@name='"+params[i]+"']";
Expand Down Expand Up @@ -186,14 +187,15 @@ Class.create("AjxpUsersCompleter", Ajax.Autocompleter, {
name: "send_email",
scope: "user",
type: "boolean",
default: false,
default: "",
mandatory: true
}));
var definitions = f.parseParameters(ajaxplorer.getXmlRegistry(), params.join('|'));
definitions.each(function(el){ def1.push(el); });
var defaultValues = $H();
defaultValues.set('lang', ajaxplorer.currentLanguage);
defaultValues.set('new_user_id', label);
defaultValues.set('new_password', '');
f.createParametersInputs(createActionPanel, def1, true, defaultValues, false, true);

var parent = listElement.up('div.dialogContent') || listElement.up('div');
Expand Down
10 changes: 6 additions & 4 deletions core/src/plugins/gui.ajax/res/js/ajaxplorer/class.Modal.js
Expand Up @@ -112,10 +112,12 @@ Class.create("Modal", {
{
var formDiv = $(sFormId);
//var formDiv = $('all_forms').select('[id="'+sFormId+'"]')[0];
newForm = document.createElement('form');
newForm.id = 'modal_action_form';
newForm.setAttribute('name','modal_action_form');
newForm.appendChild(formDiv.cloneNode(true));
newForm = new Element('form', {
name:'modal_action_form',
id:'modal_action_form',
autocomplete:'off'
});
newForm.insert(formDiv.cloneNode(true));
var reloadIFrame = null;
if($(newForm).getElementsByTagName("iframe")[0])
{
Expand Down
19 changes: 15 additions & 4 deletions core/src/plugins/gui.ajax/res/js/lib/prototype/cssfx.js
Expand Up @@ -26,6 +26,7 @@ Effect.CSS_ANIMATE = function(effectName, element, options){
var className;
var originalMethod;
var endStyle = {};
if(!options) options = {};
switch (effectName){
case "RowFade":
className = 'quick bounceOutLeft';
Expand All @@ -39,11 +40,18 @@ Effect.CSS_ANIMATE = function(effectName, element, options){
className = 'long fadeInUpBig';
endStyle = {opacity: 1};
originalMethod ='Appear';
element.setOpacity(0);
element.show();
break;
case "MessageFade":
className = 'long fadeOutDownBig';
endStyle = {opacity: 0};
originalMethod ='Appear';
if(!options.afterFinish){
options.afterFinish = function(){
element.hide();
};
}
break;
case "MenuAppear":
className = 'super-quick fadeIn';
Expand All @@ -56,11 +64,14 @@ Effect.CSS_ANIMATE = function(effectName, element, options){

["webkitAnimationEnd", "mozAnimationEnd", "oAnimationEnd", "animationEnd"].map(
function(event){
element.observe(event, function(){
element.removeClassName('animated ' + className);
element.observeOnce(event, function(){
('animated ' + className).split(" ").map(function(cName){
element.removeClassName(cName);
});
if(endStyle) element.setStyle(endStyle);
if(options && options.afterFinish) options.afterFinish();
});
if(endStyle) element.setStyle(endStyle);
if(options && options.afterFinish) element.observe(event, options.afterFinish);

}
);
element.addClassName('animated ' + className);
Expand Down

0 comments on commit 30078c0

Please sign in to comment.