From da9a84554aff892a9791f0fd18e944d90f0fa20a Mon Sep 17 00:00:00 2001
From: Eric Fernance <beanie@purplebeanie.com>
Date: Fri, 18 Apr 2014 14:46:34 +1000
Subject: [PATCH] Pulls out manual jQuery load and uses JHTML

Issue #53

Signed-off-by: Eric Fernance <beanie@purplebeanie.com>
---
 .gitignore          |  1 +
 build.xml           | 79 ---------------------------------------------
 plugin/pbevents.php |  6 ++--
 3 files changed, 5 insertions(+), 81 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 build.xml

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..12a34dd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/build.xml
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 43ed6b7..0000000
--- a/build.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="com_pbeasyshop" basedir=".">
-	
-	<xmlproperty file="pbevents.xml" keepRoot="false"/>
-	<property name="component" value="com_pbevents"/>
-	<property name="joom_install_25" value="/Applications/mamp/htdocs/j320devfree/"/>
-
-
-	<fileset id="fs_front" dir="front/."/>
-	<fileset id="fs_admin" dir="admin/."/>
-	<fileset id="fs_admin_lang" dir="languages/admin/."/>
-	<fileset id="fs_front_lang" dir="languages/front/."/>
-
-
-
-	<target name="joomla25">
-	
-		<!-- clean the old stuff up first -->
-		<delete dir="${joom_install_25}administrator/components/${component}" />
-		<delete dir="${joom_install_25}components/${component}" />
-	
-		<copy todir="${joom_install_25}administrator/components/${component}/" overwrite="true">
-			<fileset dir="admin">
-			</fileset>
-		</copy>
-		
-		<!--<copy todir="${joom_install_25}components/${component}/" overwrite="true">
-			<fileset refid="fs_front">
-			</fileset>
-		</copy>-->
-		
-		<copy todir="${joom_install_25}administrator/language/en-GB/" overwrite="true">
-			<fileset refid="fs_admin_lang"/>
-		</copy>
-		<copy todir="${joom_install_25}language/en-GB/" overwrite="true">
-			<fileset refid="fs_front_lang"/>
-		</copy>
-
-		<copy todir="${joom_install_25}plugins/content/pbevents/" overwrite="true">
-			<fileset dir="plugin/."/>
-		</copy>
-		<copy todir="${joom_install_25}administrator/language/en-GB/" overwrite="true">
-			<fileset dir="plugin/language/."/>
-		</copy>
-		
-		<copy file="pbevents.xml" todir="${joom_install_25}administrator/components/${component}/" overwrite="true"/>
-		
-		
-
-		<delete dir="/Users/eric/Documents/Development/staging/latest/sources/${component}"/>
-
-		<copy todir="/Users/eric/Documents/Development/staging/latest/sources/${component}/" overwrite="true">
-			<fileset dir=".">
-				<exclude name=".externalToolBuilders/*"/>
-				<exclude name=".settings/*"/>
-				<exclude name=".buildpath"/>
-				<exclude name=".git/*"/>
-				<exclude name="build.xml"/>
-				<exclude name=".project"/>
-			</fileset>
-		</copy>
-
-		<delete file="/Users/eric/Documents/Development/staging/latest/${component}.${version}j3.zip"/>
-
-		<zip destfile="/Users/eric/Documents/Development/staging/latest/${component}.${version}j3.zip" update="false"
-			basedir="/Users/eric/Documents/Development/staging/latest/sources/${component}"/>
-
-
-		
-	</target>
-
-	
-		
-	
-
-
-
-</project>
-
diff --git a/plugin/pbevents.php b/plugin/pbevents.php
index 735167f..c83ef84 100644
--- 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"/>';