From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 10 Jan 2014 06:13:57 +0000 (-0800)
Subject: CRM-14065 - Activity Form - Consolodate misplaced/duplicate js code
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8707432aa9412e365e41b027cbe0d945e66ea3af;p=civicrm-core.git

CRM-14065 - Activity Form - Consolodate misplaced/duplicate js code
---

diff --git a/js/Common.js b/js/Common.js
index e5d14fef7f..d0108f6ac1 100644
--- a/js/Common.js
+++ b/js/Common.js
@@ -447,58 +447,6 @@ function showHideRow(index) {
   return false;
 }
 
-/**
- * Function to check activity status in relavent to activity date
- *
- * @param element message JSON object.
- */
-function activityStatus(message) {
-  var d = new Date(), time = [], i;
-  var currentDateTime = d.getTime()
-  var activityTime = cj("input#activity_date_time_time").val().replace(":", "");
-
-  //chunk the time in bunch of 2 (hours,minutes,ampm)
-  for (i = 0; i < activityTime.length; i += 2) {
-    time.push(activityTime.slice(i, i + 2));
-  }
-  var activityDate = new Date(cj("input#activity_date_time_hidden").val());
-
-  d.setFullYear(activityDate.getFullYear());
-  d.setMonth(activityDate.getMonth());
-  d.setDate(activityDate.getDate());
-  var hours = time['0'];
-  var ampm = time['2'];
-
-  if (ampm == "PM" && hours != 0 && hours != 12) {
-    // force arithmetic instead of string concatenation
-    hours = hours * 1 + 12;
-  }
-  else {
-    if (ampm == "AM" && hours == 12) {
-      hours = 0;
-    }
-  }
-  d.setHours(hours);
-  d.setMinutes(time['1']);
-
-  var activity_date_time = d.getTime();
-
-  var activityStatusId = cj('#status_id').val();
-
-  if (activityStatusId == 2 && currentDateTime < activity_date_time) {
-    if (!confirm(message.completed)) {
-      return false;
-    }
-  }
-  else {
-    if (activity_date_time && activityStatusId == 1 && currentDateTime >= activity_date_time) {
-      if (!confirm(message.scheduled)) {
-        return false;
-      }
-    }
-  }
-}
-
 CRM.strings = CRM.strings || {};
 CRM.validate = CRM.validate || {
   params: {},
diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl
index 74963be3b5..73a9f945ba 100644
--- a/templates/CRM/Activity/Form/Activity.tpl
+++ b/templates/CRM/Activity/Form/Activity.tpl
@@ -39,50 +39,7 @@
     <div class="crm-block crm-form-block crm-activity-form-block">
   {/if}
   {* added onload javascript for source contact*}
-  {literal}
-  <script type="text/javascript">
-  var assignee_contact = '';
-
-  {/literal}
-  {if $assignee_contact}
-    var assignee_contact = {$assignee_contact};
-  {/if}
-  {literal}
-
-  //loop to set the value of cc and bcc if form rule.
-  var assignee_contact_id = null;
-  var toDataUrl = "{/literal}{crmURL p='civicrm/ajax/checkemail' q='id=1&noemail=1' h=0 }{literal}"; {/literal}
-  {foreach from=","|explode:"assignee" key=key item=element}
-    {assign var=currentElement value=`$element`_contact_id}
-    {if $form.$currentElement.value }
-      {literal} var {/literal}{$currentElement}{literal} = cj.ajax({ url: toDataUrl + "&cid={/literal}{$form.$currentElement.value}{literal}", async: false }).responseText;{/literal}
-    {/if}
-  {/foreach}
-  {literal}
-
-  if ( assignee_contact_id ) {
-    eval( 'assignee_contact = ' + assignee_contact_id );
-  }
-
-  cj(function( ) {
-    {/literal}
-    {if $source_contact and $admin and $action neq 4}
-      {literal} cj( '#source_contact_id' ).val( "{/literal}{$source_contact}{literal}");{/literal}
-    {/if}
-    {literal}
-
-    var sourceDataUrl = "{/literal}{$dataUrl}{literal}";
-    var tokenDataUrl_assignee  = "{/literal}{$tokenUrl}&context=activity_assignee{literal}";
-    var hintText = "{/literal}{ts escape='js'}Type in a partial or complete name of an existing contact.{/ts}{literal}";
-    cj( "#assignee_contact_id").tokenInput( tokenDataUrl_assignee, { prePopulate: assignee_contact, theme: 'facebook', hintText: hintText });
-    cj( 'ul.token-input-list-facebook, div.token-input-dropdown-facebook' ).css( 'width', '450px' );
-    cj('#source_contact_id').autocomplete( sourceDataUrl, { width : 180, selectFirst : false, hintText: hintText, matchContains: true, minChars: 1, max: {/literal}{crmSetting name="search_autocomplete_count" group="Search Preferences"}{literal}
-    }).result( function(event, data, formatted) { cj( "#source_contact_qid" ).val( data[1] );
-      }).bind( 'click', function( ) { if (!cj("#source_contact_id").val()) { cj( "#source_contact_qid" ).val(''); } });
-  });
-  </script>
-
-  {/literal}
+  {include file="CRM/Activity/Form/ActivityJs.tpl" tokenContext="activity"}
   {if !$action or ( $action eq 1 ) or ( $action eq 2 ) }
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
   {/if}
diff --git a/templates/CRM/Activity/Form/ActivityJs.tpl b/templates/CRM/Activity/Form/ActivityJs.tpl
new file mode 100644
index 0000000000..d47b6cc4b2
--- /dev/null
+++ b/templates/CRM/Activity/Form/ActivityJs.tpl
@@ -0,0 +1,123 @@
+{*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.4                                                |
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC (c) 2004-2013                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*}
+{* added onload javascript for source contact*}
+{literal}
+<script type="text/javascript">
+  var assignee_contact = '';
+
+  {/literal}
+  {if $assignee_contact}
+  var assignee_contact = {$assignee_contact};
+  {/if}
+
+  {literal}
+  var assignee_contact_id = null;
+  //loop to set the value of cc and bcc if form rule.
+  var toDataUrl = "{/literal}{crmURL p='civicrm/ajax/checkemail' q='id=1&noemail=1' h=0 }{literal}"; {/literal}
+  {foreach from=","|explode:"assignee" key=key item=element}
+  {assign var=currentElement value=`$element`_contact_id}
+  {if $form.$currentElement.value}
+    {literal} var {/literal}{$currentElement}{literal} = cj.ajax({ url: toDataUrl + "&cid={/literal}{$form.$currentElement.value}{literal}", async: false }).responseText;{/literal}
+      {/if}
+    {/foreach}
+    {literal}
+
+  if ( assignee_contact_id ) {
+    eval( 'assignee_contact = ' + assignee_contact_id );
+  }
+
+  cj(function( ) {
+    {/literal}
+    {if $source_contact and $admin and $action neq 4}
+      {literal} cj( '#source_contact_id' ).val( "{/literal}{$source_contact}{literal}");{/literal}
+      {/if}
+      {literal}
+
+    var sourceDataUrl = "{/literal}{$dataUrl}{literal}";
+    var tokenDataUrl_assignee  = "{/literal}{$tokenUrl}&context={$tokenContext}_assignee{literal}";
+
+    var hintText = "{/literal}{ts escape='js'}Start typing a name or email address.{/ts}{literal}";
+    cj( "#assignee_contact_id").tokenInput( tokenDataUrl_assignee, { prePopulate: assignee_contact, theme: 'facebook', hintText: hintText });
+    cj( 'ul.token-input-list-facebook, div.token-input-dropdown-facebook' ).css( 'width', '450px' );
+    cj('#source_contact_id').autocomplete( sourceDataUrl, { width : 180, selectFirst : false, hintText: hintText, matchContains: true, minChars: 1, max: {/literal}{crmSetting name="search_autocomplete_count" group="Search Preferences"}{literal}
+    }).result( function(event, data, formatted) { cj( "#source_contact_qid" ).val( data[1] );
+      }).bind( 'click', function( ) { if (!cj("#source_contact_id").val()) { cj( "#source_contact_qid" ).val(''); } });
+  });
+
+  /**
+   * Function to check activity status in relavent to activity date
+   *
+   * @param element message JSON object.
+   */
+  function activityStatus(message) {
+    var d = new Date(), time = [], i;
+    var currentDateTime = d.getTime()
+    var activityTime = cj("input#activity_date_time_time").val().replace(":", "");
+
+    //chunk the time in bunch of 2 (hours,minutes,ampm)
+    for (i = 0; i < activityTime.length; i += 2) {
+      time.push(activityTime.slice(i, i + 2));
+    }
+    var activityDate = new Date(cj("input#activity_date_time_hidden").val());
+
+    d.setFullYear(activityDate.getFullYear());
+    d.setMonth(activityDate.getMonth());
+    d.setDate(activityDate.getDate());
+    var hours = time['0'];
+    var ampm = time['2'];
+
+    if (ampm == "PM" && hours != 0 && hours != 12) {
+      // force arithmetic instead of string concatenation
+      hours = hours * 1 + 12;
+    }
+    else {
+      if (ampm == "AM" && hours == 12) {
+        hours = 0;
+      }
+    }
+    d.setHours(hours);
+    d.setMinutes(time['1']);
+
+    var activity_date_time = d.getTime();
+
+    var activityStatusId = cj('#status_id').val();
+
+    if (activityStatusId == 2 && currentDateTime < activity_date_time) {
+      if (!confirm(message.completed)) {
+        return false;
+      }
+    }
+    else {
+      if (activity_date_time && activityStatusId == 1 && currentDateTime >= activity_date_time) {
+        if (!confirm(message.scheduled)) {
+          return false;
+        }
+      }
+    }
+  }
+
+</script>
+{/literal}
diff --git a/templates/CRM/Case/Form/Activity.tpl b/templates/CRM/Case/Form/Activity.tpl
index e7077cec99..3a0220d228 100644
--- a/templates/CRM/Case/Form/Activity.tpl
+++ b/templates/CRM/Case/Form/Activity.tpl
@@ -41,50 +41,7 @@
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
 
     {* added onload javascript for source contact*}
-    {literal}
-    <script type="text/javascript">
-    var assignee_contact = '';
-
-    {/literal}
-    {if $assignee_contact}
-    var assignee_contact = {$assignee_contact};
-    {/if}
-
-    {literal}
-    var assignee_contact_id = null;
-    //loop to set the value of cc and bcc if form rule.
-    var toDataUrl = "{/literal}{crmURL p='civicrm/ajax/checkemail' q='id=1&noemail=1' h=0 }{literal}"; {/literal}
-    {foreach from=","|explode:"assignee" key=key item=element}
-      {assign var=currentElement value=`$element`_contact_id}
-      {if $form.$currentElement.value}
-        {literal} var {/literal}{$currentElement}{literal} = cj.ajax({ url: toDataUrl + "&cid={/literal}{$form.$currentElement.value}{literal}", async: false }).responseText;{/literal}
-      {/if}
-    {/foreach}
-    {literal}
-
-    if ( assignee_contact_id ) {
-      eval( 'assignee_contact = ' + assignee_contact_id );
-    }
-
-    cj(function( ) {
-      {/literal}
-      {if $source_contact and $admin and $action neq 4}
-        {literal} cj( '#source_contact_id' ).val( "{/literal}{$source_contact}{literal}");{/literal}
-      {/if}
-      {literal}
-
-      var sourceDataUrl = "{/literal}{$dataUrl}{literal}";
-      var tokenDataUrl_assignee  = "{/literal}{$tokenUrl}&context=case_activity_assignee{literal}";
-
-      var hintText = "{/literal}{ts escape='js'}Type in a partial or complete name or email address of an existing contact.{/ts}{literal}";
-      cj( "#assignee_contact_id").tokenInput( tokenDataUrl_assignee, { prePopulate: assignee_contact, theme: 'facebook', hintText: hintText });
-      cj( 'ul.token-input-list-facebook, div.token-input-dropdown-facebook' ).css( 'width', '450px' );
-      cj( "#source_contact_id").autocomplete( sourceDataUrl, { width : 180, selectFirst : false, matchContains:true
-      }).result( function(event, data, formatted) { cj( "#source_contact_qid" ).val( data[1] );
-        }).bind( 'click', function( ) { cj( "#source_contact_qid" ).val(''); });
-    });
-  </script>
-  {/literal}
+    {include file="CRM/Activity/Form/ActivityJs.tpl" tokenContext="case_activity"}
 
   {/if}