Index: branches/RC/core/admin_templates/js/script.js =================================================================== diff -u -N -r11865 -r11924 --- branches/RC/core/admin_templates/js/script.js (.../script.js) (revision 11865) +++ branches/RC/core/admin_templates/js/script.js (.../script.js) (revision 11924) @@ -166,7 +166,7 @@ $form.target = ''; set_hidden_field('t', t); - window.setTimeout(function() {submitted = false}, 500); +// window.setTimeout(function() {submitted = false}, 500); } function set_event(prefix_special, event) @@ -243,74 +243,11 @@ function OpenEditor(extra_env,TargetForm,TargetField) { -// var $url = getScriptURL('admin/editor/editor_new.php'); var $url = getScriptURL('admin/index.php', 'popups/editor'); $url = $url+'&TargetForm='+TargetForm+'&TargetField='+TargetField+'&destform=popup'; if(extra_env.length>0) $url += extra_env; openwin($url,'html_edit',800,575); } - -function OpenUserSelector(extra_env,TargetForm,TargetField) -{ - var $url = getScriptURL('admin/users/user_select.php'); - $url += '&destform='+TargetForm+'&Selector=radio&destfield='+TargetField+'&IdField=Login'; - if(extra_env.length>0) $url += extra_env; - openwin($url,'user_select',800,575); - return false; -} - -function OpenCatSelector(extra_env) -{ - var $url = getScriptURL('admin/cat_select.php'); - if(extra_env.length>0) $url += extra_env; - openwin($url,'catselect',750,400); -} - -function OpenItemSelector(extra_env,$TargetForm) -{ - var $url = getScriptURL('admin/relation_select.php') + '&destform='+$TargetForm; - if(extra_env.length>0) $url += extra_env; - openwin($url,'groupselect',750,400); -} - -function OpenUserEdit($user_id, $extra_env) -{ - var $url = getScriptURL('admin/users/adduser.php') + '&direct_id=' + $user_id; - if( isset($extra_env) ) $url += $extra_env; - window.location.href = $url; -} - -function OpenLinkEdit($link_id, $extra_env) -{ - var $url = getScriptURL('in-link/admin/addlink.php') + '&item=' + $link_id; - if( isset($extra_env) ) $url += $extra_env; - window.location.href = $url; -} - -function OpenHelp($help_link) -{ - -// $help_link.match('http://(.*).lv/in-commerce/admin(.*)'); - openwin($help_link,'HelpPopup',750,400); -} - -function openEmailSend($url, $type, $prefix_special) -{ - var $kf = document.getElementById($form_name); - var $prev_action = $kf.action; - var $prev_opener = get_hidden_field('m_opener'); - - $kf.action = $url; - set_hidden_field('m_opener', 'p'); - $kf.target = 'sendmail'; - set_hidden_field('idtype', 'group'); - set_hidden_field('idlist', Grids[$prefix_special].GetSelected().join(',') ); - openwin('','sendmail',750,400); - submit_kernel_form(); - - $kf.action = $prev_action; - set_hidden_field('m_opener', $prev_opener); -} // in-portal compatibility functions: end function InitTranslator(prefix, field, t, multi_line, $before_callback) @@ -360,6 +297,7 @@ $opener.submit_event(split_prefix[0], 'OnPreSaveAndOpenTranslator'); $opener.set_hidden_field('m_opener', $prev_opener); + $opener.submitted = false; } function PreSaveAndOpenTranslator(prefix, field, t, multi_line) @@ -389,6 +327,7 @@ var $t = $regex.exec(url)[3]; $kf.target = wnd; submit_event(prefix,'',$t,url); + submitted = false; } function openwin($url, $name, $width, $height, $options) @@ -535,6 +474,7 @@ // AJAX popup size respoce is received after std_edit_item/std_precreate_item function exit $opener.set_hidden_field($prefix_special + '_mode', null); + $opener.submitted = false; $opener.Application.processHooks($prefix_special + ':OnAfterOpenPopup'); }