Pulls out manual jQuery load and uses JHTML

Issue #53 Signed-off-by: Eric Fernance <[email protected]>
purplebeanie · Apr 18, 2014 · da9a845 · da9a845
1 parent 24ee687
commit da9a845
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 81 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+/build.xml
diff --git a/build.xml b/build.xml
diff --git a/plugin/pbevents.php b/plugin/pbevents.php
@@ -9,6 +9,9 @@
 
 jimport('joomla.mail.helper');
 
+JHtml::_('behavior.framework');
+JHtml::_('jquery.framework');
+
 
 $version = new JVersion();
 if (!defined('DS'))
@@ -68,10 +71,9 @@ public function onContentPrepare($context, &$row, &$params, $page = 0)
 					}
 
 					//inject the form, javascript and, css
-					JHtml::_('behavior.framework');
 					$doc = JFactory::getDocument();
 					include(JPATH_BASE.DS.'plugins'.DS.'content'.DS.'pbevents'.DS.'scripts'.DS.'inject_custom_fields.php');
-					echo '<script src="'.JURI::root(false).'administrator/components/com_pbevents/assets/jquery-1.9.1.original.min.js"></script>';
+					//echo '<script src="'.JURI::root(false).'administrator/components/com_pbevents/assets/jquery-1.9.1.original.min.js"></script>';
 					require_once(JPATH_BASE.DS.'plugins'.DS.'content'.DS.'pbevents'.DS.'scripts'.DS.'pbevents.php');
 					echo '<link rel="stylesheet" href="'.JURI::root(false).'plugins/content/pbevents/styles/pbevents.css" type="text/css"/>';