R34465 - in /trunk: phpgwapi/inc/class.html.inc.php tracker/inc/class.tracker_ui.inc.php

Old eGW-svn
1

Author: ralfbecker
New Revision: 34465

URL: http://www.egroupware.org/viewvc/egroupware?rev=34465&view=rev
Log:
get new ajax canned responses working with multiline responses

Modified:
trunk/phpgwapi/inc/class.html.inc.php
trunk/tracker/inc/class.tracker_ui.inc.php

Modified: trunk/phpgwapi/inc/class.html.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/phpgwapi/inc/class.html.inc.php?rev=34465&r1=34464&r2=34465&view=diff

— trunk/phpgwapi/inc/class.html.inc.php (original)
+++ trunk/phpgwapi/inc/class.html.inc.php Wed Mar 30 13:40:14 2011
@@ -583,7 +583,7 @@
{
if (!self::htmlarea_availible() || $_mode == ‘ascii’)
{

  •   	return self::textarea($_name,$_content,'style="width: '.$_width.'; height: '.$_height.';"');

  •   	return self::textarea($_name,$_content,'style="width: '.$_width.'; height: '.$_height.';" id="'.htmlspecialchars($_name).'"');
  }

  //include the ckeditor js file

@@ -601,8 +601,7 @@
$pxheight = (strpos(‘px’, $_height) === false) ?
(empty($_height) ? 400 : $_height) : str_replace(‘px’, ‘’, $_height);

  •   return '

-’.htmlspecialchars($_content).’

  •   return self::textarea($_name,$_content,'id="'.htmlspecialchars($_name).'"').'
window.CKEDITOR_BASEPATH="'.$GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/js/ckeditor3/"; CKEDITOR.replace("'.$_name.'", '.egw_ckeditor_config::get_ckeditor_config($_mode, Modified: trunk/tracker/inc/class.tracker_ui.inc.php URL: http://www.egroupware.org/viewvc/egroupware/trunk/tracker/inc/class.tracker_ui.inc.php?rev=34465&r1=34464&r2=34465&view=diff ============================================================================== --- trunk/tracker/inc/class.tracker_ui.inc.php (original) +++ trunk/tracker/inc/class.tracker_ui.inc.php Wed Mar 30 13:40:14 2011 @@ -1236,17 +1236,11 @@ * * @param id Canned comment ID */ - public function ajax_canned_comment($id) { - $canned = $this->get_canned_response($id); - - /* Doesn't work - $response = egw_json_response::get(); - //$response->assign('exec[reply_message]', 'value', $canned[$id]); - $response->jquery("textbox[name*='reply_message']", 'val', Array($canned[$id])); - */ - + public function ajax_canned_comment($id) + { $response = new xajaxResponse(); - $response->addScript('$("textarea[name*=\"reply_message\"]").val("' . $canned . '")'); + $response->assign('exec[reply_message]', 'value', $this->get_canned_response($id)); + return $response->getXML(); } } ------------------------------------------------------------------------------ Enable your software for Intel(R) Active Management Technology to meet the growing manageability and security demands of your customers. Businesses are taking advantage of Intel(R) vPro (TM) technology - will your software be a part of the solution? Download the Intel(R) Manageability Checker today! http://p.sf.net/sfu/intel-dev2devmar _______________________________________________ eGroupWare-cvs mailing list eGroupWare-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/egroupware-cvs