Index: sharethis.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/sharethis/Attic/sharethis.admin.inc,v retrieving revision 1.1.4.3 diff -u -p -r1.1.4.3 sharethis.admin.inc --- sharethis.admin.inc 14 Aug 2009 07:32:03 -0000 1.1.4.3 +++ sharethis.admin.inc 4 Feb 2010 04:11:24 -0000 @@ -24,8 +24,8 @@ function sharethis_admin_settings() { '#default_value' => variable_get('sharethis_icon', 'sharethis.png'), '#description' => t('The icon to associate with the ShareThis link.'), '#options' => array( - 'sharethis.png' => t('!image Static', array('!image' => theme('image', drupal_get_path('module', 'sharethis') .'/images/sharethis.png'))), - 'sharethis-rotating.gif' => t('!image Rotating', array('!image' => theme('image', drupal_get_path('module', 'sharethis') .'/images/sharethis-rotating.gif'))), + 'sharethis.png' => t('!image Static', array('!image' => theme('image', array('path' => drupal_get_path('module', 'sharethis') . '/images/sharethis.png')))), + 'sharethis-rotating.gif' => t('!image Rotating', array('!image' => theme('image', array('path' => drupal_get_path('module', 'sharethis') . '/images/sharethis-rotating.gif')))), ), ); return system_settings_form($form); Index: sharethis.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/sharethis/Attic/sharethis.info,v retrieving revision 1.1.2.2.2.3 diff -u -p -r1.1.2.2.2.3 sharethis.info --- sharethis.info 17 Aug 2009 19:12:32 -0000 1.1.2.2.2.3 +++ sharethis.info 4 Feb 2010 04:05:55 -0000 @@ -1,6 +1,9 @@ ; $Id: sharethis.info,v 1.1.2.2.2.3 2009/08/17 19:12:32 robloach Exp $ name = ShareThis description = "Provides the ShareThis web service for Service Links." -core = 6.x +core = 7.x dependencies[] = service_links +files[] = sharethis.module +files[] = sharethis.admin.inc package = Service Links +configure = admin/config/services/service_links/sharethis Index: sharethis.js =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/sharethis/Attic/sharethis.js,v retrieving revision 1.1.2.1.2.5 diff -u -p -r1.1.2.1.2.5 sharethis.js --- sharethis.js 20 Jan 2010 22:51:24 -0000 1.1.2.1.2.5 +++ sharethis.js 4 Feb 2010 04:14:48 -0000 @@ -1,4 +1,5 @@ // $Id: sharethis.js,v 1.1.2.1.2.5 2010/01/20 22:51:24 robloach Exp $ +(function ($) { /** * The Drupal behaviors for the ShareThis web service. @@ -26,3 +27,5 @@ Drupal.behaviors.sharethis = function(co }); } }; + +})(jQuery); Index: sharethis.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/sharethis/Attic/sharethis.module,v retrieving revision 1.1.2.7.2.3 diff -u -p -r1.1.2.7.2.3 sharethis.module --- sharethis.module 14 Aug 2009 07:32:03 -0000 1.1.2.7.2.3 +++ sharethis.module 4 Feb 2010 04:04:28 -0000 @@ -2,20 +2,20 @@ // $Id: sharethis.module,v 1.1.2.7.2.3 2009/08/14 07:32:03 robloach Exp $ /** - * Implementation of hook_help(). + * Implements hook_help(). */ function sharethis_help($path, $arg) { switch ($path) { - case 'admin/settings/service_links/sharethis': - return '

'. t('The following are configuration options for the ShareThis web service. You can add the ShareThis button to nodes and links in the services tab.', array('@sharethis' => 'http://sharethis.com', '@services' => url('admin/settings/service_links/services'))) .'

'; + case 'admin/config/services/service_links/sharethis': + return '

' . t('The following are configuration options for the ShareThis web service. You can add the ShareThis button to nodes and links in the services tab.', array('@sharethis' => 'http://sharethis.com', '@services' => url('admin/config/services/service_links/services'))) . '

'; } } /** - * Implementation of hook_menu(). + * Implements hook_menu(). */ function sharethis_menu() { - $items['admin/settings/service_links/sharethis'] = array( + $items['admin/config/services/service_links/sharethis'] = array( 'title' => 'ShareThis', 'description' => 'Configuration options for the ShareThis web service.', 'page callback' => 'drupal_get_form', @@ -29,7 +29,7 @@ function sharethis_menu() { } /** - * Implementation of hook_service_links(). + * Implements hook_service_links(). * * See the Service Links module. */ @@ -39,8 +39,8 @@ function sharethis_service_links() { 'name' => 'ShareThis', 'description' => t('ShareThis makes sharing easy!'), 'link' => 'http://sharethis.com/post?url=&title=', - 'icon' => drupal_get_path('module', 'sharethis') .'/images/' . variable_get('sharethis_icon', 'sharethis.png'), - 'javascript' => drupal_get_path('module', 'sharethis') .'/sharethis.js', + 'icon' => drupal_get_path('module', 'sharethis') . '/images/' . variable_get('sharethis_icon', 'sharethis.png'), + 'javascript' => drupal_get_path('module', 'sharethis') . '/sharethis.js', 'callback' => 'sharethis_service_links_callback', ); // Construct the individual chicklets. @@ -55,15 +55,15 @@ function sharethis_service_links() { ), ); foreach ($chicklets as $name => $chicklet) { - $links['sharethis-'. $name] = array( + $links["sharethis-$name"] = array( 'name' => $chicklet['name'], 'description' => $chicklet['description'], 'link' => 'http://sharethis.com/post?url=&title=', - 'icon' => drupal_get_path('module', 'sharethis') ."/images/$name.gif", + 'icon' => drupal_get_path('module', 'sharethis') . "/images/$name.gif", 'attributes' => array( 'class' => $name, ), - 'javascript' => drupal_get_path('module', 'sharethis') .'/sharethis.js', + 'javascript' => drupal_get_path('module', 'sharethis') . '/sharethis.js', 'callback' => 'sharethis_service_links_callback', ); } @@ -74,7 +74,7 @@ function sharethis_service_links() { * Callback function from Service Links. */ function sharethis_service_links_callback($service, $context) { - static $added = FALSE; + $added = &drupal_static(__FUNCTION__, FALSE); if ($added == FALSE) { $added = TRUE; $code = variable_get('sharethis_code', ''); @@ -84,7 +84,7 @@ function sharethis_service_links_callbac else { $code = str_replace(array(''), array('', ''), $code); } - drupal_set_html_head(''); + drupal_add_js($code, array('type' => 'external')); } $settings = array( $service['attributes']['id'] => array(