Fixes #39 to ensure components are build even if created and modified dates are not set. Improved #37 #issuecomment-278372267 to avoid one line error in windows.

README.md

@@ -1,4 +1,4 @@
-# Component Builder (2.3.0)
+# Component Builder (2.3.1)
 
 This is a [Joomla 3.x](http://www.joomla.org/) component.
 
@@ -8,7 +8,7 @@ The Component Builder for [Joomla](http://www.joomla.org/) that is highly advanc
 
 Whether you're a seasoned [Joomla](http://www.joomla.org/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.3.0) with **ALL** its features and **ALL** concepts totally open-source and free!
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.3.1) with **ALL** its features and **ALL** concepts totally open-source and free!
 
 Once installed upgrades are quick and easy via the default Joomla upgrade area.
 
@@ -104,12 +104,12 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](http://vdm.bz/component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 4th February, 2017
++ *Last Build*: 9th February, 2017
-+ *Version*: 2.3.0
++ *Version*: 2.3.1
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **91058**
++ *Line count*: **91404**
-+ *File count*: **589**
++ *File count*: **591**
 + *Folder count*: **105**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).

admin/README.txt

@@ -1,4 +1,4 @@
-# Component Builder (2.3.0)
+# Component Builder (2.3.1)
 
 This is a [Joomla 3.x](http://www.joomla.org/) component.
 
@@ -8,7 +8,7 @@ The Component Builder for [Joomla](http://www.joomla.org/) that is highly advanc
 
 Whether you're a seasoned [Joomla](http://www.joomla.org/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.3.0) with **ALL** its features and **ALL** concepts totally open-source and free!
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.3.1) with **ALL** its features and **ALL** concepts totally open-source and free!
 
 Once installed upgrades are quick and easy via the default Joomla upgrade area.
 
@@ -104,12 +104,12 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](http://vdm.bz/component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 4th February, 2017
++ *Last Build*: 9th February, 2017
-+ *Version*: 2.3.0
++ *Version*: 2.3.1
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **91058**
++ *Line count*: **91404**
-+ *File count*: **589**
++ *File count*: **591**
 + *Folder count*: **105**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).

admin/assets/css/admin.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin.css

admin/assets/css/custom_code.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 14 of this MVC
+	@version		@update number 28 of this MVC
-	@build			31st January, 2017
+	@build			9th February, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_code.css

admin/assets/css/custom_codes.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 14 of this MVC
+	@version		@update number 28 of this MVC
-	@build			31st January, 2017
+	@build			9th February, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_codes.css

admin/assets/css/dashboard.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dashboard.css

admin/compiler/joomla_3/JModelAdmin_site.php

@@ -67,7 +67,7 @@ class ###Component###Model###View### extends JModelAdmin
 	public function getTable($type = '###view###', $prefix = '###Component###Table', $config = array())
 	{
 		return JTable::getInstance($type, $prefix, $config);
-	}
+	}###ADMIN_CUSTOM_BUTTONS_METHOD###
     
 	/**
 	 * Method to get a single record.
@@ -249,6 +249,45 @@ class ###Component###Model###View### extends JModelAdmin
 		return $data;
 	}###VALIDATIONFIX### ###UNIQUEFIELDS###
 	
+	/**
+	 * Method to delete one or more records.
+	 *
+	 * @param   array  &$pks  An array of record primary keys.
+	 *
+	 * @return  boolean  True if successful, false if an error occurs.
+	 *
+	 * @since   12.2
+	 */
+	public function delete(&$pks)
+	{###JMODELADMIN_BEFORE_DELETE###
+		if (!parent::delete($pks))
+		{
+			return false;
+		}###JMODELADMIN_AFTER_DELETE###
+		
+		return true;
+	}
+
+	/**
+	 * Method to change the published state of one or more records.
+	 *
+	 * @param   array    &$pks   A list of the primary keys to change.
+	 * @param   integer  $value  The value of the published state.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   12.2
+	 */
+	public function publish(&$pks, $value = 1)
+	{###JMODELADMIN_BEFORE_PUBLISH###
+		if (!parent::publish($pks, $value))
+		{
+			return false;
+		}###JMODELADMIN_AFTER_PUBLISH###
+		
+		return true;
+        }
+    
 	/**
 	 * Method to perform batch operations on an item or a set of items.
 	 *

admin/compiler/joomla_3/router.php

@@ -139,11 +139,11 @@ class ###Component###Router extends JComponentRouterBase
 		return $vars;
 	} 
 
-	protected function getVar($table, $where = null, $whereString = 'user', $what = 'id', $category = false, $operator = '=', $main = '###component###')
+	protected function getVar($table, $where = null, $whereString = null, $what = null, $category = false, $operator = '=', $main = '###component###')
 	{
-		if(!$where)
+		if(!$where || !$what || !$whereString)
 		{
-			$where = JFactory::getUser()->id;
+			return false;
 		}
 		// Get a db connection.
 		$db = JFactory::getDbo();
@@ -153,17 +153,35 @@ class ###Component###Router extends JComponentRouterBase
 		$query->select($db->quoteName(array($what)));
 		if ('categories' == $table || 'category' == $table || $category)
 		{
-			$query->from($db->quoteName('#__categories'));
+			$getTable = '#__categories';
+			$query->from($db->quoteName($getTable));
 		}
 		else
 		{
-			$query->from($db->quoteName('#__'.$main.'_'.$table));
+			// we must check if the table exist (TODO not ideal)
+			$tables = $db->getTableList();
+			$app = JFactory::getApplication();
+			$prefix = $app->get('dbprefix');
+			$check = $prefix.$main.'_'.$table;
+			if (in_array($check, $tables))
+			{
+				$getTable = '#__'.$main.'_'.$table;
+				$query->from($db->quoteName($getTable));
+			}
+			else
+			{
+				return false;
+			}
 		}
 		if (is_numeric($where))
 		{
-			$query->where($db->quoteName($whereString) . ' '.$operator.' '.(int) $where);
+			return false;
 		}
-		elseif (is_string($where))
+		elseif ($this->checkString($where))
+		{
+			// we must first check if this table has the column
+			$columns = $db->getTableColumns($getTable);
+			if (isset($columns[$whereString]))
 			{
 				$query->where($db->quoteName($whereString) . ' '.$operator.' '. $db->quote((string)$where));
 			}
@@ -171,6 +189,11 @@ class ###Component###Router extends JComponentRouterBase
 			{
 				return false;
 			}
+		}
+		else
+		{
+			return false;
+		}
 		$db->setQuery($query);
 		$db->execute();
 		if ($db->getNumRows())
@@ -179,6 +202,15 @@ class ###Component###Router extends JComponentRouterBase
 		}
 		return false;
 	}
+	
+	protected function checkString($string)
+	{
+		if (isset($string) && is_string($string) && strlen($string) > 0)
+		{
+			return true;
+		}
+		return false;
+	}
 }
 
 function ###Component###BuildRoute(&$query)

admin/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/controller.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		controller.php

admin/controllers/ajax.json.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.json.php

admin/controllers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/controllers/custom_code.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 14 of this MVC
+	@version		@update number 28 of this MVC
-	@build			31st January, 2017
+	@build			9th February, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_code.php

admin/controllers/custom_codes.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 14 of this MVC
+	@version		@update number 28 of this MVC
-	@build			31st January, 2017
+	@build			9th February, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_codes.php

admin/controllers/field.php

@@ -60,33 +60,14 @@ class ComponentbuilderControllerField extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// get the user object
-		$user = JFactory::getUser();
-
 		// Access check.
-		$access = $user->authorise('field.access', 'com_componentbuilder');
+		$access = JFactory::getUser()->authorise('field.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
-		$categoryId = JArrayHelper::getValue($data, 'catid', $this->input->getInt('filter_category_id'), 'int');
-		$allow = null;
-
-		if ($categoryId)
-		{
-			// If the category has been passed in the URL check it.
-			$allow = $user->authorise('core.create', $this->option . '.fields.category.' . $categoryId);
-		}
-
-		if ($allow === null)
-		{
 		// In the absense of better information, revert to the component permissions.
-			return $user->authorise('field.create', $this->option);
+		return JFactory::getUser()->authorise('field.create', $this->option);
-		}
-		else
-		{
-			return $allow;
-		}
 	}
 
 	/**
@@ -146,18 +127,6 @@ class ComponentbuilderControllerField extends JControllerForm
 				}
 				return false;
 			}
-
-			$categoryId = (int) isset($data['catid']) ? $data['catid']: $this->getModel()->getItem($recordId)->catid;
-
-			if ($categoryId)
-			{
-				// The category has been set. Check the category permissions.
-				$catpermission = $user->authorise('core.edit', $this->option . '.fields.category.' . $categoryId);
-				if (!$catpermission && !is_null($catpermission))
-				{
-					return false;
-				}
-			}
 		}
 		// Since there is no permission, revert to the component permissions.
 		return $user->authorise('field.edit', $this->option);

admin/controllers/fieldtype.php

@@ -60,33 +60,14 @@ class ComponentbuilderControllerFieldtype extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// get the user object
-		$user = JFactory::getUser();
-
 		// Access check.
-		$access = $user->authorise('fieldtype.access', 'com_componentbuilder');
+		$access = JFactory::getUser()->authorise('fieldtype.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
-		$categoryId = JArrayHelper::getValue($data, 'catid', $this->input->getInt('filter_category_id'), 'int');
-		$allow = null;
-
-		if ($categoryId)
-		{
-			// If the category has been passed in the URL check it.
-			$allow = $user->authorise('core.create', $this->option . '.fieldtypes.category.' . $categoryId);
-		}
-
-		if ($allow === null)
-		{
 		// In the absense of better information, revert to the component permissions.
-			return $user->authorise('fieldtype.create', $this->option);
+		return JFactory::getUser()->authorise('fieldtype.create', $this->option);
-		}
-		else
-		{
-			return $allow;
-		}
 	}
 
 	/**
@@ -146,18 +127,6 @@ class ComponentbuilderControllerFieldtype extends JControllerForm
 				}
 				return false;
 			}
-
-			$categoryId = (int) isset($data['catid']) ? $data['catid']: $this->getModel()->getItem($recordId)->catid;
-
-			if ($categoryId)
-			{
-				// The category has been set. Check the category permissions.
-				$catpermission = $user->authorise('core.edit', $this->option . '.fieldtypes.category.' . $categoryId);
-				if (!$catpermission && !is_null($catpermission))
-				{
-					return false;
-				}
-			}
 		}
 		// Since there is no permission, revert to the component permissions.
 		return $user->authorise('fieldtype.edit', $this->option);

admin/controllers/help.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help.php

admin/controllers/import.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import.php

admin/custom/footable3/css/footable.core.bootstrap.css

@@ -1,6 +1,6 @@
 /*
 * FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
-* @version 3.0.6
+* @version 3.1.4
 * @link http://fooplugins.com
 * @copyright Steven Usher & Brad Vincent 2015
 * @license Released under the GPLv3 license.
@@ -15,6 +15,9 @@ table.footable-details {
 table.footable-details {
 	margin-bottom: 0;
 }
+table.footable-hide-fouc {
+	display: none;
+}
 table > tbody > tr > td > span.footable-toggle {
 	margin-right: 8px;
 	opacity: 0.3;
@@ -167,3 +170,6 @@ table.footable > tbody > tr.footable-detail-row > th {
 .fooicon-cog:before {
 	content: "\e019";
 }
+.fooicon-stats:before {
+	content: "\e185";
+}

admin/custom/footable3/css/footable.core.bootstrap.min.css

@@ -0,0 +1 @@
+table.footable,table.footable-details{position:relative;width:100%;border-spacing:0;border-collapse:collapse}table.footable-details{margin-bottom:0}table.footable-hide-fouc{display:none}table>tbody>tr>td>span.footable-toggle{margin-right:8px;opacity:.3}table>tbody>tr>td>span.footable-toggle.last-column{margin-left:8px;float:right}table.table-condensed>tbody>tr>td>span.footable-toggle{margin-right:5px}table.footable-details>tbody>tr>th:nth-child(1){min-width:40px;width:120px}table.footable-details>tbody>tr>td:nth-child(2){word-break:break-all}table.footable-details>tbody>tr:first-child>td,table.footable-details>tbody>tr:first-child>th,table.footable-details>tfoot>tr:first-child>td,table.footable-details>tfoot>tr:first-child>th,table.footable-details>thead>tr:first-child>td,table.footable-details>thead>tr:first-child>th{border-top-width:0}table.footable-details.table-bordered>tbody>tr:first-child>td,table.footable-details.table-bordered>tbody>tr:first-child>th,table.footable-details.table-bordered>tfoot>tr:first-child>td,table.footable-details.table-bordered>tfoot>tr:first-child>th,table.footable-details.table-bordered>thead>tr:first-child>td,table.footable-details.table-bordered>thead>tr:first-child>th{border-top-width:1px}div.footable-loader{vertical-align:middle;text-align:center;height:300px;position:relative}div.footable-loader>span.fooicon{display:inline-block;opacity:.3;font-size:30px;line-height:32px;width:32px;height:32px;margin-top:-16px;margin-left:-16px;position:absolute;top:50%;left:50%;-webkit-animation:fooicon-spin-r 2s infinite linear;animation:fooicon-spin-r 2s infinite linear}table.footable>tbody>tr.footable-empty>td{vertical-align:middle;text-align:center;font-size:30px}table.footable>tbody>tr>td,table.footable>tbody>tr>th{display:none}table.footable>tbody>tr.footable-detail-row>td,table.footable>tbody>tr.footable-detail-row>th,table.footable>tbody>tr.footable-empty>td,table.footable>tbody>tr.footable-empty>th{display:table-cell}@-webkit-keyframes fooicon-spin-r{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fooicon-spin-r{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fooicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings'!important;font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fooicon:after,.fooicon:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.fooicon-loader:before{content:"\e030"}.fooicon-plus:before{content:"\2b"}.fooicon-minus:before{content:"\2212"}.fooicon-search:before{content:"\e003"}.fooicon-remove:before{content:"\e014"}.fooicon-sort:before{content:"\e150"}.fooicon-sort-asc:before{content:"\e155"}.fooicon-sort-desc:before{content:"\e156"}.fooicon-pencil:before{content:"\270f"}.fooicon-trash:before{content:"\e020"}.fooicon-eye-close:before{content:"\e106"}.fooicon-flash:before{content:"\e162"}.fooicon-cog:before{content:"\e019"}.fooicon-stats:before{content:"\e185"}

admin/custom/footable3/css/footable.core.standalone.css

@@ -1,6 +1,6 @@
 /*
 * FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
-* @version 3.0.6
+* @version 3.1.4
 * @link http://fooplugins.com
 * @copyright Steven Usher & Brad Vincent 2015
 * @license Released under the GPLv3 license.
@@ -168,6 +168,45 @@
 	background-color: #286090;
 	border-color: #204d74;
 }
+/* button groups */
+.footable .btn-group, .footable .btn-group-vertical {
+	position: relative;
+	display: inline-block;
+	vertical-align: middle;
+}
+.footable .btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) {
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0;
+}
+.footable .btn-group > .btn:first-child {
+	margin-left: 0;
+}
+.footable .btn-group-vertical > .btn,
+.footable .btn-group > .btn {
+	position: relative;
+	float: left;
+}
+.footable .btn-group-xs > .btn,
+.footable .btn-xs {
+	padding: 1px 5px;
+	font-size: 12px;
+	line-height: 1.5;
+	border-radius: 3px;
+}
+.footable .btn-group-sm > .btn,
+.footable .btn-sm {
+	padding: 5px 10px;
+	font-size: 12px;
+	line-height: 1.5;
+	border-radius: 3px;
+}
+.footable .btn-group-lg > .btn,
+.footable .btn-lg {
+	padding: 10px 16px;
+	font-size: 18px;
+	line-height: 1.3333333;
+	border-radius: 6px;
+}
 /* caret */
 .footable .caret {
 	display: inline-block;
@@ -475,6 +514,9 @@ table.footable-details {
 table.footable-details {
 	margin-bottom: 0;
 }
+table.footable-hide-fouc {
+	display: none;
+}
 table > tbody > tr > td > span.footable-toggle {
 	margin-right: 8px;
 	opacity: 0.3;
@@ -628,3 +670,6 @@ table.footable > tbody > tr.footable-detail-row > th {
 .fooicon-cog:before {
 	content: "\f013";
 }
+.fooicon-stats:before {
+	content: "\f080";
+}

admin/custom/footable3/css/footable.editing.css

@@ -0,0 +1,50 @@
+/*
+* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
+* @version 3.1.4
+* @link http://fooplugins.com
+* @copyright Steven Usher & Brad Vincent 2015
+* @license Released under the GPLv3 license.
+*/
+td.footable-editing {
+	width: 90px;
+	max-width: 90px;
+}
+table.footable-editing-no-edit td.footable-editing,
+table.footable-editing-no-delete td.footable-editing,
+table.footable-editing-no-view td.footable-editing {
+	width: 70px;
+	max-width: 70px;
+}
+table.footable-editing-no-edit.footable-editing-no-delete td.footable-editing,
+table.footable-editing-no-edit.footable-editing-no-view td.footable-editing,
+table.footable-editing-no-delete.footable-editing-no-view td.footable-editing {
+	width: 50px;
+	max-width: 50px;
+}
+table.footable-editing-no-edit.footable-editing-no-delete.footable-editing-no-view td.footable-editing,
+table.footable-editing-no-edit.footable-editing-no-delete.footable-editing-no-view th.footable-editing {
+	width: 0;
+	max-width: 0;
+	display: none !important;
+}
+table.footable-editing-right td.footable-editing,
+table.footable-editing-right tr.footable-editing {
+	text-align: right;
+}
+table.footable-editing-left td.footable-editing,
+table.footable-editing-left tr.footable-editing {
+	text-align: left;
+}
+table.footable-editing button.footable-add,
+table.footable-editing button.footable-hide,
+table.footable-editing-show button.footable-show,
+table.footable-editing.footable-editing-always-show button.footable-show,
+table.footable-editing.footable-editing-always-show button.footable-hide,
+table.footable-editing.footable-editing-always-show.footable-editing-no-add tr.footable-editing {
+	display: none;
+}
+table.footable-editing.footable-editing-show button.footable-add,
+table.footable-editing.footable-editing-show button.footable-hide,
+table.footable-editing.footable-editing-always-show button.footable-add {
+	display: inline-block;
+}

admin/custom/footable3/css/footable.editing.min.css

@@ -0,0 +1 @@
+td.footable-editing{width:90px;max-width:90px}table.footable-editing-no-delete td.footable-editing,table.footable-editing-no-edit td.footable-editing,table.footable-editing-no-view td.footable-editing{width:70px;max-width:70px}table.footable-editing-no-delete.footable-editing-no-view td.footable-editing,table.footable-editing-no-edit.footable-editing-no-delete td.footable-editing,table.footable-editing-no-edit.footable-editing-no-view td.footable-editing{width:50px;max-width:50px}table.footable-editing-no-edit.footable-editing-no-delete.footable-editing-no-view td.footable-editing,table.footable-editing-no-edit.footable-editing-no-delete.footable-editing-no-view th.footable-editing{width:0;max-width:0;display:none!important}table.footable-editing-right td.footable-editing,table.footable-editing-right tr.footable-editing{text-align:right}table.footable-editing-left td.footable-editing,table.footable-editing-left tr.footable-editing{text-align:left}table.footable-editing button.footable-add,table.footable-editing button.footable-hide,table.footable-editing-show button.footable-show,table.footable-editing.footable-editing-always-show button.footable-hide,table.footable-editing.footable-editing-always-show button.footable-show,table.footable-editing.footable-editing-always-show.footable-editing-no-add tr.footable-editing{display:none}table.footable-editing.footable-editing-always-show button.footable-add,table.footable-editing.footable-editing-show button.footable-add,table.footable-editing.footable-editing-show button.footable-hide{display:inline-block}

admin/custom/footable3/css/footable.filtering.css

@@ -1,6 +1,6 @@
 /*
 * FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
-* @version 3.0.6
+* @version 3.1.4
 * @link http://fooplugins.com
 * @copyright Steven Usher & Brad Vincent 2015
 * @license Released under the GPLv3 license.

admin/custom/footable3/css/footable.paging.css

@@ -1,6 +1,6 @@
 /*
 * FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
-* @version 3.0.6
+* @version 3.1.4
 * @link http://fooplugins.com
 * @copyright Steven Usher & Brad Vincent 2015
 * @license Released under the GPLv3 license.

admin/custom/footable3/css/footable.sorting.css

@@ -1,12 +1,16 @@
 /*
 * FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
-* @version 3.0.6
+* @version 3.1.4
 * @link http://fooplugins.com
 * @copyright Steven Usher & Brad Vincent 2015
 * @license Released under the GPLv3 license.
 */
-td.footable-sortable,
+table.footable > thead > tr > td.footable-sortable,
-th.footable-sortable {
+table.footable > thead > tr > th.footable-sortable,
+table.footable > tbody > tr > td.footable-sortable,
+table.footable > tbody > tr > th.footable-sortable,
+table.footable > tfoot > tr > td.footable-sortable,
+table.footable > tfoot > tr > th.footable-sortable {
 	position: relative;
 	padding-right: 30px;
 	cursor: pointer;
@@ -30,3 +34,13 @@ td.footable-sortable.footable-desc > span.fooicon,
 th.footable-sortable.footable-desc > span.fooicon {
 	opacity: 1;
 }
+/* hides the sort icons when sorting is not allowed */
+table.footable-sorting-disabled td.footable-sortable.footable-asc > span.fooicon,
+table.footable-sorting-disabled td.footable-sortable.footable-desc > span.fooicon,
+table.footable-sorting-disabled td.footable-sortable:hover > span.fooicon,
+table.footable-sorting-disabled th.footable-sortable.footable-asc > span.fooicon,
+table.footable-sorting-disabled th.footable-sortable.footable-desc > span.fooicon,
+table.footable-sorting-disabled th.footable-sortable:hover > span.fooicon {
+	opacity: 0;
+	visibility: hidden;
+}

admin/custom/footable3/css/footable.sorting.min.css

@@ -1 +1 @@
-td.footable-sortable,th.footable-sortable{position:relative;padding-right:30px;cursor:pointer}td.footable-sortable>span.fooicon,th.footable-sortable>span.fooicon{position:absolute;right:6px;top:50%;margin-top:-7px;opacity:0;transition:opacity .3s ease-in}td.footable-sortable.footable-asc>span.fooicon,td.footable-sortable.footable-desc>span.fooicon,td.footable-sortable:hover>span.fooicon,th.footable-sortable.footable-asc>span.fooicon,th.footable-sortable.footable-desc>span.fooicon,th.footable-sortable:hover>span.fooicon{opacity:1}
+table.footable>tbody>tr>td.footable-sortable,table.footable>tbody>tr>th.footable-sortable,table.footable>tfoot>tr>td.footable-sortable,table.footable>tfoot>tr>th.footable-sortable,table.footable>thead>tr>td.footable-sortable,table.footable>thead>tr>th.footable-sortable{position:relative;padding-right:30px;cursor:pointer}td.footable-sortable>span.fooicon,th.footable-sortable>span.fooicon{position:absolute;right:6px;top:50%;margin-top:-7px;opacity:0;transition:opacity .3s ease-in}td.footable-sortable.footable-asc>span.fooicon,td.footable-sortable.footable-desc>span.fooicon,td.footable-sortable:hover>span.fooicon,th.footable-sortable.footable-asc>span.fooicon,th.footable-sortable.footable-desc>span.fooicon,th.footable-sortable:hover>span.fooicon{opacity:1}table.footable-sorting-disabled td.footable-sortable.footable-asc>span.fooicon,table.footable-sorting-disabled td.footable-sortable.footable-desc>span.fooicon,table.footable-sorting-disabled td.footable-sortable:hover>span.fooicon,table.footable-sorting-disabled th.footable-sortable.footable-asc>span.fooicon,table.footable-sorting-disabled th.footable-sortable.footable-desc>span.fooicon,table.footable-sorting-disabled th.footable-sortable:hover>span.fooicon{opacity:0;visibility:hidden}

admin/custom/footable3/js/footable.editing.js

@@ -0,0 +1,802 @@
+/*
+* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
+* @version 3.1.4
+* @link http://fooplugins.com
+* @copyright Steven Usher & Brad Vincent 2015
+* @license Released under the GPLv3 license.
+*/
+(function($, F){
+
+	F.Editing = F.Component.extend(/** @lends FooTable.Editing */{
+		/**
+		 * The editing component adds a column with edit and delete buttons to each row as well as a single add row button in the footer.
+		 * @constructs
+		 * @extends FooTable.Component
+		 * @param {FooTable.Table} table - The parent {@link FooTable.Table} object for the component.
+		 * @returns {FooTable.Editing}
+		 */
+		construct: function(table){
+			// call the base constructor
+			this._super(table, table.o.editing.enabled);
+
+			/**
+			 * Whether or not to automatically page to a new row when it is added to the table.
+			 * @type {boolean}
+			 */
+			this.pageToNew = table.o.editing.pageToNew;
+
+			/**
+			 * Whether or not the editing column and add row button are always visible.
+			 * @type {boolean}
+			 */
+			this.alwaysShow = table.o.editing.alwaysShow;
+
+			/**
+			 * The options for the editing column. @see {@link FooTable.EditingColumn} for more info.
+			 * @type {object}
+			 * @prop {string} classes="footable-editing" - A space separated string of class names to apply to all cells in the column.
+			 * @prop {string} name="editing" - The name of the column.
+			 * @prop {string} title="" - The title displayed in the header row of the table for the column.
+			 * @prop {boolean} filterable=false - Whether or not the column should be filterable when using the filtering component.
+			 * @prop {boolean} sortable=false - Whether or not the column should be sortable when using the sorting component.
+			 */
+			this.column = $.extend(true, {}, table.o.editing.column, {visible: this.alwaysShow});
+
+			/**
+			 * The position of the editing column in the table as well as the alignment of the buttons.
+			 * @type {string}
+			 */
+			this.position = table.o.editing.position;
+
+
+			/**
+			 * The text that appears in the show button. This can contain HTML.
+			 * @type {string}
+			 */
+			this.showText = table.o.editing.showText;
+
+			/**
+			 * The text that appears in the hide button. This can contain HTML.
+			 * @type {string}
+			 */
+			this.hideText = table.o.editing.hideText;
+
+			/**
+			 * The text that appears in the add button. This can contain HTML.
+			 * @type {string}
+			 */
+			this.addText = table.o.editing.addText;
+
+			/**
+			 * The text that appears in the edit button. This can contain HTML.
+			 * @type {string}
+			 */
+			this.editText = table.o.editing.editText;
+
+			/**
+			 * The text that appears in the delete button. This can contain HTML.
+			 * @type {string}
+			 */
+			this.deleteText = table.o.editing.deleteText;
+			
+			/**
+			 * The text that appears in the view button. This can contain HTML.
+			 * @type {string}
+			 */
+			this.viewText = table.o.editing.viewText;
+
+			/**
+			 * Whether or not to show the Add Row button.
+			 * @type {boolean}
+			 */
+			this.allowAdd = table.o.editing.allowAdd;
+
+			/**
+			 * Whether or not to show the Edit Row button.
+			 * @type {boolean}
+			 */
+			this.allowEdit = table.o.editing.allowEdit;
+
+			/**
+			 * Whether or not to show the Delete Row button.
+			 * @type {boolean}
+			 */
+			this.allowDelete = table.o.editing.allowDelete;
+
+			/**
+			 * Whether or not to show the View Row button.
+			 * @type {boolean}
+			 */
+			this.allowView = table.o.editing.allowView;
+
+			/**
+			 * Caches the row button elements to help with performance.
+			 * @type {(null|jQuery)}
+			 * @private
+			 */
+			this._$buttons = null;
+
+			/**
+			 * This object is used to contain the callbacks for the add, edit and delete row buttons.
+			 * @type {object}
+			 * @prop {function} addRow
+			 * @prop {function} editRow
+			 * @prop {function} deleteRow
+			 * @prop {function} viewRow
+			 */
+			this.callbacks = {
+				addRow: F.checkFnValue(this, table.o.editing.addRow),
+				editRow: F.checkFnValue(this, table.o.editing.editRow),
+				deleteRow: F.checkFnValue(this, table.o.editing.deleteRow),
+				viewRow: F.checkFnValue(this, table.o.editing.viewRow)
+			};
+		},
+		/* PROTECTED */
+		/**
+		 * Checks the supplied data and options for the editing component.
+		 * @instance
+		 * @protected
+		 * @param {object} data - The jQuery data object from the parent table.
+		 * @fires FooTable.Editing#"preinit.ft.editing"
+		 */
+		preinit: function(data){
+			var self = this;
+			/**
+			 * The preinit.ft.editing event is raised before the UI is created and provides the tables jQuery data object for additional options parsing.
+			 * Calling preventDefault on this event will disable the component.
+			 * @event FooTable.Editing#"preinit.ft.editing"
+			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+			 * @param {object} data - The jQuery data object of the table raising the event.
+			 */
+			this.ft.raise('preinit.ft.editing', [data]).then(function(){
+				if (self.ft.$el.hasClass('footable-editing'))
+					self.enabled = true;
+
+				self.enabled = F.is.boolean(data.editing)
+					? data.editing
+					: self.enabled;
+
+				if (!self.enabled) return;
+
+				self.pageToNew = F.is.boolean(data.editingPageToNew) ? data.editingPageToNew : self.pageToNew;
+
+				self.alwaysShow = F.is.boolean(data.editingAlwaysShow) ? data.editingAlwaysShow : self.alwaysShow;
+
+				self.position = F.is.string(data.editingPosition) ? data.editingPosition : self.position;
+
+				self.showText = F.is.string(data.editingShowText) ? data.editingShowText : self.showText;
+
+				self.hideText = F.is.string(data.editingHideText) ? data.editingHideText : self.hideText;
+
+				self.addText = F.is.string(data.editingAddText) ? data.editingAddText : self.addText;
+
+				self.editText = F.is.string(data.editingEditText) ? data.editingEditText : self.editText;
+
+				self.deleteText = F.is.string(data.editingDeleteText) ? data.editingDeleteText : self.deleteText;
+
+				self.viewText = F.is.string(data.editingViewText) ? data.editingViewText : self.viewText;
+
+				self.allowAdd = F.is.boolean(data.editingAllowAdd) ? data.editingAllowAdd : self.allowAdd;
+
+				self.allowEdit = F.is.boolean(data.editingAllowEdit) ? data.editingAllowEdit : self.allowEdit;
+
+				self.allowDelete = F.is.boolean(data.editingAllowDelete) ? data.editingAllowDelete : self.allowDelete;
+
+				self.allowView = F.is.boolean(data.editingAllowView) ? data.editingAllowView : self.allowView;
+
+				self.column = new F.EditingColumn(self.ft, self, $.extend(true, {}, self.column, data.editingColumn, {visible: self.alwaysShow}));
+
+				if (self.ft.$el.hasClass('footable-editing-left'))
+					self.position = 'left';
+
+				if (self.ft.$el.hasClass('footable-editing-right'))
+					self.position = 'right';
+
+				if (self.position === 'right'){
+					self.column.index = self.ft.columns.array.length;
+				} else {
+					self.column.index = 0;
+					for (var i = 0, len = self.ft.columns.array.length; i < len; i++){
+						self.ft.columns.array[i].index += 1;
+					}
+				}
+				self.ft.columns.array.push(self.column);
+				self.ft.columns.array.sort(function(a, b){ return a.index - b.index; });
+
+				self.callbacks.addRow = F.checkFnValue(self, data.editingAddRow, self.callbacks.addRow);
+				self.callbacks.editRow = F.checkFnValue(self, data.editingEditRow, self.callbacks.editRow);
+				self.callbacks.deleteRow = F.checkFnValue(self, data.editingDeleteRow, self.callbacks.deleteRow);
+				self.callbacks.viewRow = F.checkFnValue(self, data.editingViewRow, self.callbacks.viewRow);
+			}, function(){
+				self.enabled = false;
+			});
+		},
+		/**
+		 * Initializes the editing component for the plugin using the supplied table and options.
+		 * @instance
+		 * @protected
+		 * @fires FooTable.Editing#"init.ft.editing"
+		 */
+		init: function(){
+			/**
+			 * The init.ft.editing event is raised before its UI is generated.
+			 * Calling preventDefault on this event will disable the component.
+			 * @event FooTable.Editing#"init.ft.editing"
+			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+			 */
+			var self = this;
+			this.ft.raise('init.ft.editing').then(function(){
+				self.$create();
+			}, function(){
+				self.enabled = false;
+			});
+		},
+		/**
+		 * Destroys the editing component removing any UI generated from the table.
+		 * @instance
+		 * @protected
+		 * @fires FooTable.Editing#"destroy.ft.editing"
+		 */
+		destroy: function () {
+			/**
+			 * The destroy.ft.editing event is raised before its UI is removed.
+			 * Calling preventDefault on this event will prevent the component from being destroyed.
+			 * @event FooTable.Editing#"destroy.ft.editing"
+			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+			 */
+			var self = this;
+			this.ft.raise('destroy.ft.editing').then(function(){
+				self.ft.$el.removeClass('footable-editing footable-editing-always-show footable-editing-no-add footable-editing-no-edit footable-editing-no-delete footable-editing-no-view')
+					.off('click.ft.editing').find('tfoot > tr.footable-editing').remove();
+			});
+		},
+		/**
+		 * Creates the editing UI from the current options setting the various jQuery properties of this component.
+		 * @instance
+		 * @protected
+		 */
+		$create: function(){
+			var self = this, position = self.position === 'right' ? 'footable-editing-right' : 'footable-editing-left';
+			self.ft.$el.addClass('footable-editing').addClass(position)
+				.on('click.ft.editing', '.footable-show', {self: self}, self._onShowClick)
+				.on('click.ft.editing', '.footable-hide', {self: self}, self._onHideClick)
+				.on('click.ft.editing', '.footable-edit', {self: self}, self._onEditClick)
+				.on('click.ft.editing', '.footable-delete', {self: self}, self._onDeleteClick)
+				.on('click.ft.editing', '.footable-view', {self: self}, self._onViewClick)
+				.on('click.ft.editing', '.footable-add', {self: self}, self._onAddClick);
+
+			self.$cell = $('<td/>').attr('colspan', self.ft.columns.visibleColspan).append(self.$buttonShow());
+			if (self.allowAdd){
+				self.$cell.append(self.$buttonAdd());
+			}
+			self.$cell.append(self.$buttonHide());
+
+			if (self.alwaysShow){
+				self.ft.$el.addClass('footable-editing-always-show');
+			}
+
+			if (!self.allowAdd) self.ft.$el.addClass('footable-editing-no-add');
+			if (!self.allowEdit) self.ft.$el.addClass('footable-editing-no-edit');
+			if (!self.allowDelete) self.ft.$el.addClass('footable-editing-no-delete');
+			if (!self.allowView) self.ft.$el.addClass('footable-editing-no-view');
+
+			var $tfoot = self.ft.$el.children('tfoot');
+			if ($tfoot.length == 0){
+				$tfoot = $('<tfoot/>');
+				self.ft.$el.append($tfoot);
+			}
+			self.$row = $('<tr/>', { 'class': 'footable-editing' }).append(self.$cell).appendTo($tfoot);
+		},
+		/**
+		 * Creates the show button for the editing component.
+		 * @instance
+		 * @protected
+		 * @returns {(string|HTMLElement|jQuery)}
+		 */
+		$buttonShow: function(){
+			return '<button type="button" class="btn btn-primary footable-show">' + this.showText + '</button>';
+		},
+		/**
+		 * Creates the hide button for the editing component.
+		 * @instance
+		 * @protected
+		 * @returns {(string|HTMLElement|jQuery)}
+		 */
+		$buttonHide: function(){
+			return '<button type="button" class="btn btn-default footable-hide">' + this.hideText + '</button>';
+		},
+		/**
+		 * Creates the add button for the editing component.
+		 * @instance
+		 * @protected
+		 * @returns {(string|HTMLElement|jQuery)}
+		 */
+		$buttonAdd: function(){
+			return '<button type="button" class="btn btn-primary footable-add">' + this.addText + '</button> ';
+		},
+		/**
+		 * Creates the edit button for the editing component.
+		 * @instance
+		 * @protected
+		 * @returns {(string|HTMLElement|jQuery)}
+		 */
+		$buttonEdit: function(){
+			return '<button type="button" class="btn btn-default footable-edit">' + this.editText + '</button> ';
+		},
+		/**
+		 * Creates the delete button for the editing component.
+		 * @instance
+		 * @protected
+		 * @returns {(string|HTMLElement|jQuery)}
+		 */
+		$buttonDelete: function(){
+			return '<button type="button" class="btn btn-default footable-delete">' + this.deleteText + '</button>';
+		},
+		/**
+		 * Creates the view button for the editing component.
+		 * @instance
+		 * @protected
+		 * @returns {(string|HTMLElement|jQuery)}
+		 */
+		$buttonView: function(){
+			return '<button type="button" class="btn btn-default footable-view">' + this.viewText + '</button> ';
+		},
+		/**
+		 * Creates the button group for the row buttons.
+		 * @instance
+		 * @protected
+		 * @returns {(string|HTMLElement|jQuery)}
+		 */
+		$rowButtons: function(){
+			if (F.is.jq(this._$buttons)) return this._$buttons.clone();
+			this._$buttons = $('<div class="btn-group btn-group-xs" role="group"></div>');
+			if (this.allowView) this._$buttons.append(this.$buttonView());
+			if (this.allowEdit) this._$buttons.append(this.$buttonEdit());
+			if (this.allowDelete) this._$buttons.append(this.$buttonDelete());
+			return this._$buttons;
+		},
+		/**
+		 * Performs the drawing of the component.
+		 */
+		draw: function(){
+			this.$cell.attr('colspan', this.ft.columns.visibleColspan);
+		},
+		/**
+		 * Handles the edit button click event.
+		 * @instance
+		 * @private
+		 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+		 * @fires FooTable.Editing#"edit.ft.editing"
+		 */
+		_onEditClick: function(e){
+			e.preventDefault();
+			var self = e.data.self, row = $(this).closest('tr').data('__FooTableRow__');
+			if (row instanceof F.Row){
+				/**
+				 * The edit.ft.editing event is raised before its callback is executed.
+				 * Calling preventDefault on this event will prevent the callback from being executed.
+				 * @event FooTable.Editing#"edit.ft.editing"
+				 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+				 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+				 * @param {FooTable.Row} row - The row to be edited.
+				 */
+				self.ft.raise('edit.ft.editing', [row]).then(function(){
+					self.callbacks.editRow.call(self.ft, row);
+				});
+			}
+		},
+		/**
+		 * Handles the delete button click event.
+		 * @instance
+		 * @private
+		 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+		 * @fires FooTable.Editing#"delete.ft.editing"
+		 */
+		_onDeleteClick: function(e){
+			e.preventDefault();
+			var self = e.data.self, row = $(this).closest('tr').data('__FooTableRow__');
+			if (row instanceof F.Row){
+				/**
+				 * The delete.ft.editing event is raised before its callback is executed.
+				 * Calling preventDefault on this event will prevent the callback from being executed.
+				 * @event FooTable.Editing#"delete.ft.editing"
+				 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+				 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+				 * @param {FooTable.Row} row - The row to be deleted.
+				 */
+				self.ft.raise('delete.ft.editing', [row]).then(function(){
+					self.callbacks.deleteRow.call(self.ft, row);
+				});
+			}
+		},
+		/**
+		 * Handles the view button click event.
+		 * @instance
+		 * @private
+		 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+		 * @fires FooTable.Editing#"view.ft.editing"
+		 */
+		_onViewClick: function(e){
+			e.preventDefault();
+			var self = e.data.self, row = $(this).closest('tr').data('__FooTableRow__');
+			if (row instanceof F.Row){
+				/**
+				 * The view.ft.editing event is raised before its callback is executed.
+				 * Calling preventDefault on this event will prevent the callback from being executed.
+				 * @event FooTable.Editing#"view.ft.editing"
+				 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+				 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+				 * @param {FooTable.Row} row - The row to be viewed.
+				 */
+				self.ft.raise('view.ft.editing', [row]).then(function(){
+					self.callbacks.viewRow.call(self.ft, row);
+				});
+			}
+		},
+		/**
+		 * Handles the add button click event.
+		 * @instance
+		 * @private
+		 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+		 * @fires FooTable.Editing#"add.ft.editing"
+		 */
+		_onAddClick: function(e){
+			e.preventDefault();
+			var self = e.data.self;
+			/**
+			 * The add.ft.editing event is raised before its callback is executed.
+			 * Calling preventDefault on this event will prevent the callback from being executed.
+			 * @event FooTable.Editing#"add.ft.editing"
+			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+			 */
+			self.ft.raise('add.ft.editing').then(function(){
+				self.callbacks.addRow.call(self.ft);
+			});
+		},
+		/**
+		 * Handles the show button click event.
+		 * @instance
+		 * @private
+		 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+		 * @fires FooTable.Editing#"show.ft.editing"
+		 */
+		_onShowClick: function(e){
+			e.preventDefault();
+			var self = e.data.self;
+			/**
+			 * The show.ft.editing event is raised before its callback is executed.
+			 * Calling preventDefault on this event will prevent the callback from being executed.
+			 * @event FooTable.Editing#"show.ft.editing"
+			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+			 */
+			self.ft.raise('show.ft.editing').then(function(){
+				self.ft.$el.addClass('footable-editing-show');
+				self.column.visible = true;
+				self.ft.draw();
+			});
+		},
+		/**
+		 * Handles the hide button click event.
+		 * @instance
+		 * @private
+		 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+		 * @fires FooTable.Editing#"show.ft.editing"
+		 */
+		_onHideClick: function(e){
+			e.preventDefault();
+			var self = e.data.self;
+			/**
+			 * The hide.ft.editing event is raised before its callback is executed.
+			 * Calling preventDefault on this event will prevent the callback from being executed.
+			 * @event FooTable.Editing#"hide.ft.editing"
+			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+			 */
+			self.ft.raise('hide.ft.editing').then(function(){
+				self.ft.$el.removeClass('footable-editing-show');
+				self.column.visible = false;
+				self.ft.draw();
+			});
+		}
+	});
+
+	F.components.register('editing', F.Editing, 850);
+
+})(jQuery, FooTable);
+
+(function($, F){
+
+	F.EditingColumn = F.Column.extend(/** @lends FooTable.EditingColumn */{
+		/**
+		 * The Editing column class is used to create the column containing the editing buttons.
+		 * @constructs
+		 * @extends FooTable.Column
+		 * @param {FooTable.Table} instance -  The parent {@link FooTable.Table} this column belongs to.
+		 * @param {FooTable.Editing} editing - The parent {@link FooTable.Editing} component this column is used with.
+		 * @param {object} definition - An object containing all the properties to set for the column.
+		 * @returns {FooTable.EditingColumn}
+		 */
+		construct: function(instance, editing, definition){
+			this._super(instance, definition, 'editing');
+			this.editing = editing;
+		},
+		/**
+		 * After the column has been defined this ensures that the $el property is a jQuery object by either creating or updating the current value.
+		 * @instance
+		 * @protected
+		 * @this FooTable.Column
+		 */
+		$create: function(){
+			(this.$el = !this.virtual && F.is.jq(this.$el) ? this.$el : $('<th/>', {'class': 'footable-editing'})).html(this.title);
+		},
+		/**
+		 * This is supplied either the cell value or jQuery object to parse. Any value can be returned from this method and
+		 * will be provided to the {@link FooTable.EditingColumn#format} function
+		 * to generate the cell contents.
+		 * @instance
+		 * @protected
+		 * @param {(*|jQuery)} valueOrElement - The value or jQuery cell object.
+		 * @returns {(jQuery)}
+		 */
+		parser: function(valueOrElement){
+			if (F.is.string(valueOrElement)) valueOrElement = $($.trim(valueOrElement));
+			if (F.is.element(valueOrElement)) valueOrElement = $(valueOrElement);
+			if (F.is.jq(valueOrElement)){
+				var tagName = valueOrElement.prop('tagName').toLowerCase();
+				if (tagName == 'td' || tagName == 'th') return valueOrElement.data('value') || valueOrElement.contents();
+				return valueOrElement;
+			}
+			return null;
+		},
+		/**
+		 * Creates a cell to be used in the supplied row for this column.
+		 * @param {FooTable.Row} row - The row to create the cell for.
+		 * @returns {FooTable.Cell}
+		 */
+		createCell: function(row){
+			var $buttons = this.editing.$rowButtons(), $cell = $('<td/>').append($buttons);
+			if (F.is.jq(row.$el)){
+				if (this.index === 0){
+					$cell.prependTo(row.$el);
+				} else {
+					$cell.insertAfter(row.$el.children().eq(this.index-1));
+				}
+			}
+			return new F.Cell(this.ft, row, this, $cell || $cell.html());
+		}
+	});
+
+	F.columns.register('editing', F.EditingColumn);
+
+})(jQuery, FooTable);
+(function($, F) {
+
+	/**
+	 * An object containing the editing options for the plugin. Added by the {@link FooTable.Editing} component.
+	 * @type {object}
+	 * @prop {boolean} enabled=false - Whether or not to allow editing on the table.
+	 * @prop {boolean} pageToNew=true - Whether or not to automatically page to a new row when it is added to the table.
+	 * @prop {string} position="right" - The position of the editing column in the table as well as the alignment of the buttons.
+	 * @prop {boolean} alwaysShow=false - Whether or not the editing column and add row button are always visible.
+	 * @prop {function} addRow - The callback function to execute when the add row button is clicked.
+	 * @prop {function} editRow - The callback function to execute when the edit row button is clicked.
+	 * @prop {function} deleteRow - The callback function to execute when the delete row button is clicked.
+	 * @prop {function} viewRow - The callback function to execute when the view row button is clicked.
+	 * @prop {string} showText - The text that appears in the show button. This can contain HTML.
+	 * @prop {string} hideText - The text that appears in the hide button. This can contain HTML.
+	 * @prop {string} addText - The text that appears in the add button. This can contain HTML.
+	 * @prop {string} editText - The text that appears in the edit button. This can contain HTML.
+	 * @prop {string} deleteText - The text that appears in the delete button. This can contain HTML.
+	 * @prop {string} viewText - The text that appears in the view button. This can contain HTML.
+	 * @prop {boolean} allowAdd - Whether or not to show the Add Row button.
+	 * @prop {boolean} allowEdit - Whether or not to show the Edit Row button.
+	 * @prop {boolean} allowDelete - Whether or not to show the Delete Row button.
+	 * @prop {boolean} allowView - Whether or not to show the View Row button.
+	 * @prop {object} column - The options for the editing column. @see {@link FooTable.EditingColumn} for more info.
+	 * @prop {string} column.classes="footable-editing" - A space separated string of class names to apply to all cells in the column.
+	 * @prop {string} column.name="editing" - The name of the column.
+	 * @prop {string} column.title="" - The title displayed in the header row of the table for the column.
+	 * @prop {boolean} column.filterable=false - Whether or not the column should be filterable when using the filtering component.
+	 * @prop {boolean} column.sortable=false - Whether or not the column should be sortable when using the sorting component.
+	 */
+	F.Defaults.prototype.editing = {
+		enabled: false,
+		pageToNew: true,
+		position: 'right',
+		alwaysShow: false,
+		addRow: function(){},
+		editRow: function(row){},
+		deleteRow: function(row){},
+		viewRow: function(row){},
+		showText: '<span class="fooicon fooicon-pencil" aria-hidden="true"></span> Edit rows',
+		hideText: 'Cancel',
+		addText: 'New row',
+		editText: '<span class="fooicon fooicon-pencil" aria-hidden="true"></span>',
+		deleteText: '<span class="fooicon fooicon-trash" aria-hidden="true"></span>',
+		viewText: '<span class="fooicon fooicon-stats" aria-hidden="true"></span>',
+		allowAdd: true,
+		allowEdit: true,
+		allowDelete: true,
+		allowView: false,
+		column: {
+			classes: 'footable-editing',
+			name: 'editing',
+			title: '',
+			filterable: false,
+			sortable: false
+		}
+	};
+
+})(jQuery, FooTable);
+
+(function($, F){
+
+	if (F.is.defined(F.Paging)){
+		/**
+		 * Holds a shallow clone of the un-paged {@link FooTable.Rows#array} value before paging occurs and superfluous rows are removed. Added by the {@link FooTable.Editing} component.
+		 * @instance
+		 * @public
+		 * @type {Array<FooTable.Row>}
+		 */
+		F.Paging.prototype.unpaged = [];
+
+		// override the default predraw method with one that sets the unpaged property.
+		F.Paging.extend('predraw', function(){
+			this.unpaged = this.ft.rows.array.slice(0); // create a shallow clone for later use
+			this._super(); // call the original method
+		});
+	}
+
+})(jQuery, FooTable);
+(function($, F){
+
+	/**
+	 * Adds the row to the table.
+	 * @param {boolean} [redraw=true] - Whether or not to redraw the table, defaults to true but for bulk operations this
+	 * can be set to false and then followed by a call to the {@link FooTable.Table#draw} method.
+	 * @returns {jQuery.Deferred}
+	 */
+	F.Row.prototype.add = function(redraw){
+		redraw = F.is.boolean(redraw) ? redraw : true;
+		var self = this;
+		return $.Deferred(function(d){
+			var index = self.ft.rows.all.push(self) - 1;
+			if (redraw){
+				return self.ft.draw().then(function(){
+					d.resolve(index);
+				});
+			} else {
+				d.resolve(index);
+			}
+		});
+	};
+
+	/**
+	 * Removes the row from the table.
+	 * @param {boolean} [redraw=true] - Whether or not to redraw the table, defaults to true but for bulk operations this
+	 * can be set to false and then followed by a call to the {@link FooTable.Table#draw} method.
+	 * @returns {jQuery.Deferred}
+	 */
+	F.Row.prototype.delete = function(redraw){
+		redraw = F.is.boolean(redraw) ? redraw : true;
+		var self = this;
+		return $.Deferred(function(d){
+			var index = self.ft.rows.all.indexOf(self);
+			if (F.is.number(index) && index >= 0 && index < self.ft.rows.all.length){
+				self.ft.rows.all.splice(index, 1);
+				if (redraw){
+					return self.ft.draw().then(function(){
+						d.resolve(self);
+					});
+				}
+			}
+			d.resolve(self);
+		});
+	};
+
+	if (F.is.defined(F.Paging)){
+		// override the default add method with one that supports paging
+		F.Row.extend('add', function(redraw){
+			redraw = F.is.boolean(redraw) ? redraw : true;
+			var self = this,
+				added = this._super(redraw),
+				editing = self.ft.use(F.Editing),
+				paging;
+			if (editing && editing.pageToNew && (paging = self.ft.use(F.Paging)) && redraw){
+				return added.then(function(){
+					var index = paging.unpaged.indexOf(self); // find this row in the unpaged array (this array will be sorted and filtered)
+					var page = Math.ceil((index + 1) / paging.size); // calculate the page the new row is on
+					if (paging.current !== page){ // goto the page if we need to
+						return paging.goto(page);
+					}
+				});
+			}
+			return added;
+		});
+	}
+
+	if (F.is.defined(F.Sorting)){
+		// override the default val method with one that supports sorting and paging
+		F.Row.extend('val', function(data, redraw){
+			redraw = F.is.boolean(redraw) ? redraw : true;
+			var result = this._super(data);
+			if (!F.is.hash(data)){
+				return result;
+			}
+			var self = this;
+			if (redraw){
+				self.ft.draw().then(function(){
+					var editing = self.ft.use(F.Editing), paging;
+					if (F.is.defined(F.Paging) && editing && editing.pageToNew && (paging = self.ft.use(F.Paging))){
+						var index = paging.unpaged.indexOf(self); // find this row in the unpaged array (this array will be sorted and filtered)
+						var page = Math.ceil((index + 1) / paging.size); // calculate the page the new row is on
+						if (paging.current !== page){ // goto the page if we need to
+							return paging.goto(page);
+						}
+					}
+				});
+			}
+			return result;
+		});
+	}
+
+})(jQuery, FooTable);
+(function(F){
+
+	/**
+	 * Adds a row to the underlying {@link FooTable.Rows#all} array.
+	 * @param {(object|FooTable.Row)} dataOrRow - A hash containing the row values or an actual {@link FooTable.Row} object.
+	 * @param {boolean} [redraw=true] - Whether or not to redraw the table, defaults to true but for bulk operations this
+	 * can be set to false and then followed by a call to the {@link FooTable.Table#draw} method.
+	 */
+	F.Rows.prototype.add = function(dataOrRow, redraw){
+		var row = dataOrRow;
+		if (F.is.hash(dataOrRow)){
+			row = new FooTable.Row(this.ft, this.ft.columns.array, dataOrRow);
+		}
+		if (row instanceof FooTable.Row){
+			row.add(redraw);
+		}
+	};
+
+	/**
+	 * Updates a row in the underlying {@link FooTable.Rows#all} array.
+	 * @param {(number|FooTable.Row)} indexOrRow - The index to update or the actual {@link FooTable.Row} object.
+	 * @param {object} data - A hash containing the new row values.
+	 * @param {boolean} [redraw=true] - Whether or not to redraw the table, defaults to true but for bulk operations this
+	 * can be set to false and then followed by a call to the {@link FooTable.Table#draw} method.
+	 */
+	F.Rows.prototype.update = function(indexOrRow, data, redraw){
+		var len = this.ft.rows.all.length, 
+			row = indexOrRow;
+		if (F.is.number(indexOrRow) && indexOrRow >= 0 && indexOrRow < len){
+			row = this.ft.rows.all[indexOrRow];
+		}
+		if (row instanceof FooTable.Row && F.is.hash(data)){
+			row.val(data, redraw);
+		}
+	};
+
+	/**
+	 * Deletes a row from the underlying {@link FooTable.Rows#all} array.
+	 * @param {(number|FooTable.Row)} indexOrRow - The index to delete or the actual {@link FooTable.Row} object.
+	 * @param {boolean} [redraw=true] - Whether or not to redraw the table, defaults to true but for bulk operations this
+	 * can be set to false and then followed by a call to the {@link FooTable.Table#draw} method.
+	 */
+	F.Rows.prototype.delete = function(indexOrRow, redraw){
+		var len = this.ft.rows.all.length, 
+			row = indexOrRow;
+		if (F.is.number(indexOrRow) && indexOrRow >= 0 && indexOrRow < len){
+			row = this.ft.rows.all[indexOrRow];
+		}
+		if (row instanceof FooTable.Row){
+			row.delete(redraw);
+		}
+	};
+
+})(FooTable);

admin/custom/footable3/js/footable.filtering.js

@@ -1,6 +1,6 @@
 /*
 * FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
-* @version 3.0.6
+* @version 3.1.4
 * @link http://fooplugins.com
 * @copyright Steven Usher & Brad Vincent 2015
 * @license Released under the GPLv3 license.
@@ -12,13 +12,15 @@
 		 * @constructs
 		 * @extends FooTable.Class
 		 * @param {string} name - The name for the filter.
-		 * @param {string} query - The query for the filter.
+		 * @param {(string|FooTable.Query)} query - The query for the filter.
 		 * @param {Array.<FooTable.Column>} columns - The columns to apply the query to.
 		 * @param {string} [space="AND"] - How the query treats space chars.
 		 * @param {boolean} [connectors=true] - Whether or not to replace phrase connectors (+.-_) with spaces.
+		 * @param {boolean} [ignoreCase=true] - Whether or not ignore case when matching.
+		 * @param {boolean} [hidden=true] - Whether or not this is a hidden filter.
 		 * @returns {FooTable.Filter}
 		 */
-		construct: function(name, query, columns, space, connectors){
+		construct: function(name, query, columns, space, connectors, ignoreCase, hidden){
 			/**
 			 * The name of the filter.
 			 * @instance
@@ -37,12 +39,24 @@
 			 * @type {boolean}
 			 */
 			this.connectors = F.is.boolean(connectors) ? connectors : true;
+			/**
+			 * Whether or not ignore case when matching.
+			 * @instance
+			 * @type {boolean}
+			 */
+			this.ignoreCase = F.is.boolean(ignoreCase) ? ignoreCase : true;
+			/**
+			 * Whether or not this is a hidden filter.
+			 * @instance
+			 * @type {boolean}
+			 */
+			this.hidden = F.is.boolean(hidden) ? hidden : false;
 			/**
 			 * The query for the filter.
 			 * @instance
 			 * @type {(string|FooTable.Query)}
 			 */
-			this.query = new F.Query(query, this.space, this.connectors);
+			this.query = query instanceof F.Query ? query : new F.Query(query, this.space, this.connectors, this.ignoreCase);
 			/**
 			 * The columns to apply the query to.
 			 * @instance
@@ -60,7 +74,7 @@
 		match: function(str){
 			if (!F.is.string(str)) return false;
 			if (F.is.string(this.query)){
-				this.query = new F.Query(this.query, this.space, this.connectors);
+				this.query = new F.Query(this.query, this.space, this.connectors, this.ignoreCase);
 			}
 			return this.query instanceof F.Query ? this.query.match(str) : false;
 		},
@@ -123,12 +137,29 @@
 			 * @type {boolean}
 			 */
 			this.connectors = table.o.filtering.connectors;
+			/**
+			 * Whether or not ignore case when matching.
+			 * @instance
+			 * @type {boolean}
+			 */
+			this.ignoreCase = table.o.filtering.ignoreCase;
+			/**
+			 * Whether or not search queries are treated as phrases when matching.
+			 * @instance
+			 * @type {boolean}
+			 */
+			this.exactMatch = table.o.filtering.exactMatch;
 			/**
 			 * The placeholder text to display within the search $input.
 			 * @instance
 			 * @type {string}
 			 */
 			this.placeholder = table.o.filtering.placeholder;
+			/**
+			 * The title to display at the top of the search input column select.
+			 * @type {string}
+			 */
+			this.dropdownTitle = table.o.filtering.dropdownTitle;
 			/**
 			 * The position of the $search input within the filtering rows cell.
 			 * @type {string}
@@ -173,6 +204,13 @@
 			 * @type {?number}
 			 */
 			this._filterTimeout = null;
+			/**
+			 * The regular expression used to check for encapsulating quotations.
+			 * @instance
+			 * @private
+			 * @type {RegExp}
+			 */
+			this._exactRegExp = /^"(.*?)"$/;
 		},
 
 		/* PROTECTED */
@@ -193,7 +231,7 @@
 			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
 			 * @param {object} data - The jQuery data object of the table raising the event.
 			 */
-			this.ft.raise('preinit.ft.filtering').then(function(){
+			return self.ft.raise('preinit.ft.filtering').then(function(){
 				// first check if filtering is enabled via the class being applied
 				if (self.ft.$el.hasClass('footable-filtering'))
 					self.enabled = true;
@@ -213,18 +251,30 @@
 					? data.filterMin
 					: self.min;
 
-				self.connectors = F.is.number(data.filterConnectors)
+				self.connectors = F.is.boolean(data.filterConnectors)
 					? data.filterConnectors
 					: self.connectors;
 
+				self.ignoreCase = F.is.boolean(data.filterIgnoreCase)
+					? data.filterIgnoreCase
+					: self.ignoreCase;
+
+				self.exactMatch = F.is.boolean(data.filterExactMatch)
+					? data.filterExactMatch
+					: self.exactMatch;
+
 				self.delay = F.is.number(data.filterDelay)
 					? data.filterDelay
 					: self.delay;
 
-				self.placeholder = F.is.number(data.filterPlaceholder)
+				self.placeholder = F.is.string(data.filterPlaceholder)
 					? data.filterPlaceholder
 					: self.placeholder;
 
+				self.dropdownTitle = F.is.string(data.filterDropdownTitle)
+					? data.filterDropdownTitle
+					: self.dropdownTitle;
+
 				self.filters = F.is.array(data.filterFilters)
 					? self.ensure(data.filterFilters)
 					: self.ensure(self.filters);
@@ -258,7 +308,7 @@
 			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
 			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
 			 */
-			this.ft.raise('init.ft.filtering').then(function(){
+			return self.ft.raise('init.ft.filtering').then(function(){
 				self.$create();
 			}, function(){
 				self.enabled = false;
@@ -279,7 +329,7 @@
 			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
 			 */
 			var self = this;
-			this.ft.raise('destroy.ft.filtering').then(function(){
+			return self.ft.raise('destroy.ft.filtering').then(function(){
 				self.ft.$el.removeClass('footable-filtering')
 					.find('thead > tr.footable-filtering').remove();
 			});
@@ -293,7 +343,7 @@
 		$create: function () {
 			var self = this;
 			// generate the cell that actually contains all the UI.
-			var $form_grp = $('<div/>', {'class': 'form-group'})
+			var $form_grp = $('<div/>', {'class': 'form-group footable-filtering-search'})
 					.append($('<label/>', {'class': 'sr-only', text: 'Search'})),
 				$input_grp = $('<div/>', {'class': 'input-group'}).appendTo($form_grp),
 				$input_grp_btn = $('<div/>', {'class': 'input-group-btn'}),
@@ -320,9 +370,13 @@
 				.on('click', { self: self }, self._onSearchButtonClicked)
 				.append($('<span/>', {'class': 'fooicon fooicon-search'}));
 
-			self.$dropdown = $('<ul/>', {'class': 'dropdown-menu dropdown-menu-right'}).append(
+			self.$dropdown = $('<ul/>', {'class': 'dropdown-menu dropdown-menu-right'});
+			if (!F.is.emptyString(self.dropdownTitle)){
+				self.$dropdown.append($('<li/>', {'class': 'dropdown-header','text': self.dropdownTitle}));
+			}
+			self.$dropdown.append(
 				F.arr.map(self.ft.columns.array, function (col) {
-					return col.filterable && col.visible ? $('<li/>').append(
+					return col.filterable ? $('<li/>').append(
 						$('<a/>', {'class': 'checkbox'}).append(
 							$('<label/>', {text: col.title}).prepend(
 								$('<input/>', {type: 'checkbox', checked: true}).data('__FooTableColumn__', col)
@@ -333,7 +387,7 @@
 			);
 
 			if (self.delay > 0){
-				self.$input.on('keypress keyup', { self: self }, self._onSearchInputChanged);
+				self.$input.on('keypress keyup paste', { self: self }, self._onSearchInputChanged);
 				self.$dropdown.on('click', 'input[type="checkbox"]', {self: self}, self._onSearchColumnClicked);
 			}
 
@@ -361,55 +415,77 @@
 		 */
 		draw: function(){
 			this.$cell.attr('colspan', this.ft.columns.visibleColspan);
+			var search = this.find('search');
+			if (search instanceof F.Filter){
+				var query = search.query.val();
+				if (this.exactMatch && this._exactRegExp.test(query)){
+					query = query.replace(this._exactRegExp, '$1');
+				}
+				this.$input.val(query);
+			} else {
+				this.$input.val(null);
+			}
+			this.setButton(!F.arr.any(this.filters, function(f){ return !f.hidden; }));
 		},
 
 		/* PUBLIC */
 		/**
 		 * Adds or updates the filter using the supplied name, query and columns.
-		 * @param {string} name - The name for the filter.
+		 * @instance
-		 * @param {(string|FooTable.Query)} query - The query for the filter.
+		 * @param {(string|FooTable.Filter|object)} nameOrFilter - The name for the filter or the actual filter object itself.
-		 * @param {(Array.<number>|Array.<string>|Array.<FooTable.Column>)} columns - The columns to apply the filter to.
+		 * @param {(string|FooTable.Query)} [query] - The query for the filter. This is only optional when the first parameter is a filter object.
+		 * @param {(Array.<number>|Array.<string>|Array.<FooTable.Column>)} [columns] - The columns to apply the filter to.
+		 * 	If not supplied the filter will be applied to all selected columns in the search input dropdown.
+		 * @param {boolean} [ignoreCase=true] - Whether or not ignore case when matching.
+		 * @param {boolean} [connectors=true] - Whether or not to replace phrase connectors (+.-_) with spaces.
+		 * @param {string} [space="AND"] - How the query treats space chars.
+		 * @param {boolean} [hidden=true] - Whether or not this is a hidden filter.
 		 */
-		addFilter: function(name, query, columns){
+		addFilter: function(nameOrFilter, query, columns, ignoreCase, connectors, space, hidden){
-			var f = F.arr.first(this.filters, function(f){ return f.name == name; });
+			var f = this.createFilter(nameOrFilter, query, columns, ignoreCase, connectors, space, hidden);
 			if (f instanceof F.Filter){
-				f.name = name;
+				this.removeFilter(f.name);
-				f.query = query;
+				this.filters.push(f);
-				f.columns = columns;
-			} else {
-				this.filters.push({name: name, query: query, columns: columns});
 			}
 		},
 		/**
 		 * Removes the filter using the supplied name if it exists.
+		 * @instance
 		 * @param {string} name - The name of the filter to remove.
 		 */
 		removeFilter: function(name){
 			F.arr.remove(this.filters, function(f){ return f.name == name; });
 		},
 		/**
-		 * Creates a new search filter from the supplied parameters and applies it to the rows. If no parameters are supplied the current search input value
+		 * Performs the required steps to handle filtering including the raising of the {@link FooTable.Filtering#"before.ft.filtering"} and {@link FooTable.Filtering#"after.ft.filtering"} events.
-		 * and selected columns are used to create or update the search filter. If there is no search input value then the search filter is removed.
 		 * @instance
-		 * @param {string} [query] - The query to filter the rows by.
-		 * @param {(Array.<string>|Array.<number>|Array.<FooTable.Column>)} [columns] - The columns to apply the filter to in each row.
 		 * @returns {jQuery.Promise}
 		 * @fires FooTable.Filtering#"before.ft.filtering"
 		 * @fires FooTable.Filtering#"after.ft.filtering"
 		 */
-		filter: function(query, columns){
+		filter: function(){
-			if (F.is.undef(query)){
+			var self = this;
-				query = $.trim(this.$input.val() || '');
+			self.filters = self.ensure(self.filters);
-			} else {
+			/**
-				this.$input.val(query);
+			 * The before.ft.filtering event is raised before a filter is applied and allows listeners to modify the filter or cancel it completely by calling preventDefault on the jQuery.Event object.
-			}
+			 * @event FooTable.Filtering#"before.ft.filtering"
-			if (!F.is.emptyString(query)) {
+			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
-				this.addFilter('search', query, columns);
+			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
-			} else {
+			 * @param {Array.<FooTable.Filter>} filters - The filters that are about to be applied.
-				this.removeFilter('search');
+			 */
-			}
+			return self.ft.raise('before.ft.filtering', [self.filters]).then(function(){
-			this.$button.children('.fooicon').removeClass('fooicon-search').addClass('fooicon-remove');
+				self.filters = self.ensure(self.filters);
-			return this._filter();
+				return self.ft.draw().then(function(){
+					/**
+					 * The after.ft.filtering event is raised after a filter has been applied.
+					 * @event FooTable.Filtering#"after.ft.filtering"
+					 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+					 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+					 * @param {FooTable.Filter} filter - The filters that were applied.
+					 */
+					self.ft.raise('after.ft.filtering', [self.filters]);
+				});
+			});
 		},
 		/**
 		 * Removes the current search filter.
@@ -419,10 +495,28 @@
 		 * @fires FooTable.Filtering#"after.ft.filtering"
 		 */
 		clear: function(){
+			this.filters = F.arr.get(this.filters, function(f){ return f.hidden; });
+			return this.filter();
+		},
+		/**
+		 * Toggles the button icon between the search and clear icons based on the supplied value.
+		 * @instance
+		 * @param {boolean} search - Whether or not to display the search icon.
+		 */
+		setButton: function(search){
+			if (!search){
+				this.$button.children('.fooicon').removeClass('fooicon-search').addClass('fooicon-remove');
+			} else {
 				this.$button.children('.fooicon').removeClass('fooicon-remove').addClass('fooicon-search');
-			this.$input.val(null);
+			}
-			this.removeFilter('search');
+		},
-			return this._filter();
+		/**
+		 * Finds a filter by name.
+		 * @param {string} name - The name of the filter to find.
+		 * @returns {(FooTable.Filter|null)}
+		 */
+		find: function(name){
+			return F.arr.first(this.filters, function(f){ return f.name == name; });
 		},
 		/**
 		 * Gets an array of {@link FooTable.Column} to apply the search filter to. This also doubles as the default columns for filters which do not specify any columns.
@@ -451,48 +545,47 @@
 			var self = this, parsed = [], filterable = self.columns();
 			if (!F.is.emptyArray(filters)){
 				F.arr.each(filters, function(f){
-					if (F.is.object(f) && (!F.is.emptyString(f.query) || f.query instanceof F.Query)) {
+					f = self._ensure(f, filterable);
-						f.name = F.is.emptyString(f.name) ? 'anon' : f.name;
+					if (f instanceof F.Filter) parsed.push(f);
-						f.columns = F.is.emptyArray(f.columns) ? filterable : self.ft.columns.ensure(f.columns);
-						parsed.push(f instanceof F.Filter ? f : new F.Filter(f.name, f.query, f.columns, self.space, self.connectors));
-					}
 				});
 			}
 			return parsed;
 		},
 
-		/* PRIVATE */
 		/**
-		 * Performs the required steps to handle filtering including the raising of the {@link FooTable.Filtering#"before.ft.filtering"} and {@link FooTable.Filtering#"after.ft.filtering"} events.
+		 * Creates a new filter using the supplied object or individual parameters to populate it.
 		 * @instance
-		 * @private
+		 * @param {(string|FooTable.Filter|object)} nameOrObject - The name for the filter or the actual filter object itself.
-		 * @returns {jQuery.Promise}
+		 * @param {(string|FooTable.Query)} [query] - The query for the filter. This is only optional when the first parameter is a filter object.
-		 * @fires FooTable.Filtering#"before.ft.filtering"
+		 * @param {(Array.<number>|Array.<string>|Array.<FooTable.Column>)} [columns] - The columns to apply the filter to.
-		 * @fires FooTable.Filtering#"after.ft.filtering"
+		 * 	If not supplied the filter will be applied to all selected columns in the search input dropdown.
+		 * @param {boolean} [ignoreCase=true] - Whether or not ignore case when matching.
+		 * @param {boolean} [connectors=true] - Whether or not to replace phrase connectors (+.-_) with spaces.
+		 * @param {string} [space="AND"] - How the query treats space chars.
+		 * @param {boolean} [hidden=true] - Whether or not this is a hidden filter.
+		 * @returns {*}
 		 */
-		_filter: function(){
+		createFilter: function(nameOrObject, query, columns, ignoreCase, connectors, space, hidden){
-			var self = this;
+			if (F.is.string(nameOrObject)){
-			self.filters = self.ensure(self.filters);
+				nameOrObject = {name: nameOrObject, query: query, columns: columns, ignoreCase: ignoreCase, connectors: connectors, space: space, hidden: hidden};
-			/**
+			}
-			 * The before.ft.filtering event is raised before a filter is applied and allows listeners to modify the filter or cancel it completely by calling preventDefault on the jQuery.Event object.
+			return this._ensure(nameOrObject, this.columns());
-			 * @event FooTable.Filtering#"before.ft.filtering"
+		},
-			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+
-			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+		/* PRIVATE */
-			 * @param {Array.<FooTable.Filter>} filters - The filters that are about to be applied.
+		_ensure: function(filter, selectedColumns){
-			 */
+			if ((F.is.hash(filter) || filter instanceof F.Filter) && !F.is.emptyString(filter.name) && (!F.is.emptyString(filter.query) || filter.query instanceof F.Query)){
-			return self.ft.raise('before.ft.filtering', [self.filters]).then(function(){
+				filter.columns = F.is.emptyArray(filter.columns) ? selectedColumns : this.ft.columns.ensure(filter.columns);
-				self.filters = self.ensure(self.filters);
+				filter.ignoreCase = F.is.boolean(filter.ignoreCase) ? filter.ignoreCase : this.ignoreCase;
-				return self.ft.draw().then(function(){
+				filter.connectors = F.is.boolean(filter.connectors) ? filter.connectors : this.connectors;
-					/**
+				filter.hidden = F.is.boolean(filter.hidden) ? filter.hidden : false;
-					 * The after.ft.filtering event is raised after a filter has been applied.
+				filter.space = F.is.string(filter.space) && (filter.space === 'AND' || filter.space === 'OR') ? filter.space : this.space;
-					 * @event FooTable.Filtering#"after.ft.filtering"
+				filter.query = F.is.string(filter.query) ? new F.Query(filter.query, filter.space, filter.connectors, filter.ignoreCase) : filter.query;
-					 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+				return (filter instanceof F.Filter)
-					 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+					? filter
-					 * @param {FooTable.Filter} filter - The filters that were applied.
+					: new F.Filter(filter.name, filter.query, filter.columns, filter.space, filter.connectors, filter.ignoreCase, filter.hidden);
-					 */
+			}
-					self.ft.raise('after.ft.filtering', [self.filters]);
+			return null;
-				});
-			});
 		},
 		/**
 		 * Handles the change event for the {@link FooTable.Filtering#$input}.
@@ -503,15 +596,25 @@
 		_onSearchInputChanged: function (e) {
 			var self = e.data.self;
 			var alpha = e.type == 'keypress' && !F.is.emptyString(String.fromCharCode(e.charCode)),
-				ctrl = e.type == 'keyup' && (e.which == 8 || e.which == 46); // backspace & delete
+				ctrl = e.type == 'keyup' && (e.which == 8 || e.which == 46),
+				paste = e.type == 'paste'; // backspace & delete
 
 			// if alphanumeric characters or specific control characters
-			if(alpha || ctrl) {
+			if(alpha || ctrl || paste) {
 				if (e.which == 13) e.preventDefault();
 				if (self._filterTimeout != null) clearTimeout(self._filterTimeout);
 				self._filterTimeout = setTimeout(function(){
 					self._filterTimeout = null;
+					var query = self.$input.val();
+					if (query.length >= self.min){
+						if (self.exactMatch && !self._exactRegExp.test(query)){
+							query = '"' + query + '"';
+						}
+						self.addFilter('search', query);
 						self.filter();
+					} else if (F.is.emptyString(query)){
+						self.clear();
+					}
 				}, self.delay);
 			}
 		},
@@ -527,7 +630,16 @@
 			if (self._filterTimeout != null) clearTimeout(self._filterTimeout);
 			var $icon = self.$button.children('.fooicon');
 			if ($icon.hasClass('fooicon-remove')) self.clear();
-			else self.filter();
+			else {
+				var query = self.$input.val();
+				if (query.length >= self.min){
+					if (self.exactMatch && !self._exactRegExp.test(query)){
+						query = '"' + query + '"';
+					}
+					self.addFilter('search', query);
+					self.filter();
+				}
+			}
 		},
 		/**
 		 * Handles the click event for the column checkboxes in the {@link FooTable.Filtering#$dropdown}.
@@ -543,6 +655,7 @@
 				var $icon = self.$button.children('.fooicon');
 				if ($icon.hasClass('fooicon-remove')){
 					$icon.removeClass('fooicon-remove').addClass('fooicon-search');
+					self.addFilter('search', self.$input.val());
 					self.filter();
 				}
 			}, self.delay);
@@ -577,9 +690,10 @@
 		}
 	});
 
-	F.components.core.register('filtering', F.Filtering, 10);
+	F.components.register('filtering', F.Filtering, 500);
 
 })(jQuery, FooTable);
+
 (function(F){
 	F.Query = F.Class.extend(/** @lends FooTable.Query */{
 		/**
@@ -589,9 +703,10 @@
 		 * @param {string} query - The string value of the query.
 		 * @param {string} [space="AND"] - How the query treats whitespace.
 		 * @param {boolean} [connectors=true] - Whether or not to replace phrase connectors (+.-_) with spaces.
+		 * @param {boolean} [ignoreCase=true] - Whether or not ignore case when matching.
 		 * @returns {FooTable.Query}
 		 */
-		construct: function(query, space, connectors){
+		construct: function(query, space, connectors, ignoreCase){
 			/* PRIVATE */
 			/**
 			 * Holds the previous value of the query and is used internally in the {@link FooTable.Query#val} method.
@@ -617,6 +732,12 @@
 			 * @type {boolean}
 			 */
 			this.connectors = F.is.boolean(connectors) ? connectors : true;
+			/**
+			 * Whether or not ignore case when matching.
+			 * @instance
+			 * @type {boolean}
+			 */
+			this.ignoreCase = F.is.boolean(ignoreCase) ? ignoreCase : true;
 			/**
 			 * The left side of the query if one exists. OR takes precedence over AND.
 			 * @type {FooTable.Query}
@@ -680,26 +801,39 @@
 		 * @private
 		 */
 		_match: function(str, def){
-			var self = this, result = false;
+			var self = this, result = false, empty = F.is.emptyString(str);
 			if (F.is.emptyArray(self.parts) && self.left instanceof F.Query) return def;
 			if (F.is.emptyArray(self.parts)) return result;
 			if (self.space === 'OR'){
 				// with OR we give the str every part to test and if any match it is a success, we do exit early if a negated match occurs
 				F.arr.each(self.parts, function(p){
-					var match = F.str.contains(str, p.query, true);
+					if (p.empty && empty){
+						result = true;
+						if (p.negate){
+							result = false;
+							return result;
+						}
+					} else {
+						var match = (p.exact ? F.str.containsExact : F.str.contains)(str, p.query, self.ignoreCase);
 						if (match && !p.negate) result = true;
 						if (match && p.negate) {
 							result = false;
 							return result;
 						}
+					}
 				});
 			} else {
 				// otherwise with AND we check until the first failure and then exit
 				result = true;
 				F.arr.each(self.parts, function(p){
-					var match = F.str.contains(str, p.query, true);
+					if (p.empty){
+						if ((!empty && !p.negate) || (empty && p.negate)) result = false;
+						return result;
+					} else {
+						var match = (p.exact ? F.str.containsExact : F.str.contains)(str, p.query, self.ignoreCase);
 						if ((!match && !p.negate) || (match && p.negate)) result = false;
 						return result;
+					}
 				});
 			}
 			return result;
@@ -735,14 +869,14 @@
 				// we have an OR so split the value on the first occurrence of OR to get the left and right sides of the statement
 				this.operator = 'OR';
 				var or = this._value.split(/(?:\sOR\s)(.*)?/);
-				this.left = new F.Query(or[0], this.space, this.connectors);
+				this.left = new F.Query(or[0], this.space, this.connectors, this.ignoreCase);
-				this.right = new F.Query(or[1], this.space, this.connectors);
+				this.right = new F.Query(or[1], this.space, this.connectors, this.ignoreCase);
 			} else if (/\sAND\s/.test(this._value)) {
 				// there are no more OR's so start with AND
 				this.operator = 'AND';
 				var and = this._value.split(/(?:\sAND\s)(.*)?/);
-				this.left = new F.Query(and[0], this.space, this.connectors);
+				this.left = new F.Query(and[0], this.space, this.connectors, this.ignoreCase);
-				this.right = new F.Query(and[1], this.space, this.connectors);
+				this.right = new F.Query(and[1], this.space, this.connectors, this.ignoreCase);
 			} else {
 				// we have no more statements to parse so set the parts array by parsing each part of the remaining query
 				var self = this;
@@ -762,7 +896,8 @@
 				query: str,
 				negate: false,
 				phrase: false,
-				exact: false
+				exact: false,
+				empty: false
 			};
 			// support for NEGATE operand - (minus sign). Remove this first so we can get onto phrase checking
 			if (F.str.startsWith(p.query, '-')){
@@ -780,6 +915,7 @@
 				});
 				p.phrase = true;
 			}
+			p.empty = p.phrase && F.is.emptyString(p.query);
 			return p;
 		}
 	});
@@ -836,7 +972,10 @@
 	 */
 	F.Column.prototype.filterValue = function(valueOrElement){
 		// if we have an element or a jQuery object use jQuery to get the value
-		if (F.is.element(valueOrElement) || F.is.jq(valueOrElement)) return $(valueOrElement).data('filterValue') || $(valueOrElement).text();
+		if (F.is.element(valueOrElement) || F.is.jq(valueOrElement)){
+			var data = $(valueOrElement).data('filterValue');
+			return F.is.defined(data) ? ''+data : $(valueOrElement).text();
+		}
 		// if options are supplied with the value
 		if (F.is.hash(valueOrElement) && F.is.hash(valueOrElement.options)){
 			if (F.is.string(valueOrElement.options.filterValue)) return valueOrElement.options.filterValue;
@@ -849,6 +988,7 @@
 	// this is used to define the filtering specific properties on column creation
 	F.Column.prototype.__filtering_define__ = function(definition){
 		this.filterable = F.is.boolean(definition.filterable) ? definition.filterable : this.filterable;
+		this.filterValue = F.checkFnValue(this, definition.filterValue, this.filterValue);
 	};
 
 	// overrides the public define method and replaces it with our own
@@ -864,21 +1004,27 @@
 	 * @prop {boolean} enabled=false - Whether or not to allow filtering on the table.
 	 * @prop {({name: string, query: (string|FooTable.Query), columns: (Array.<string>|Array.<number>|Array.<FooTable.Column>)}|Array.<FooTable.Filter>)} filters - The filters to apply to the current {@link FooTable.Rows#array}.
 	 * @prop {number} delay=1200 - The delay in milliseconds before the query is auto applied after a change (any value equal to or less than zero will disable this).
-	 * @prop {number} min=3 - The minimum number of characters allowed in the search input before it is auto applied.
+	 * @prop {number} min=1 - The minimum number of characters allowed in the search input before it is auto applied.
 	 * @prop {string} space="AND" - Specifies how whitespace in a filter query is handled.
 	 * @prop {string} placeholder="Search" - The string used as the placeholder for the search input.
+	 * @prop {string} dropdownTitle=null - The title to display at the top of the search input column select.
 	 * @prop {string} position="right" - The string used to specify the alignment of the search input.
 	 * @prop {string} connectors=true - Whether or not to replace phrase connectors (+.-_) with space before executing the query.
+	 * @prop {boolean} ignoreCase=true - Whether or not ignore case when matching.
+	 * @prop {boolean} exactMatch=false - Whether or not search queries are treated as phrases when matching.
 	 */
 	F.Defaults.prototype.filtering = {
 		enabled: false,
 		filters: [],
 		delay: 1200,
-		min: 3,
+		min: 1,
 		space: 'AND',
 		placeholder: 'Search',
+		dropdownTitle: null,
 		position: 'right',
-		connectors: true
+		connectors: true,
+		ignoreCase: true,
+		exactMatch: false
 	};
 })(FooTable);
 (function(F){
@@ -896,30 +1042,3 @@
 		return result;
 	};
 })(FooTable);
-(function(F){
-	/**
-	 * Filter the table using the supplied query and columns. Added by the {@link FooTable.Filtering} component.
-	 * @instance
-	 * @param {string} query - The query to filter the rows by.
-	 * @param {(Array.<string>|Array.<number>|Array.<FooTable.Column>)} [columns] - The columns to apply the filter to in each row.
-	 * @returns {jQuery.Promise}
-	 * @fires FooTable.Filtering#before.ft.filtering
-	 * @fires FooTable.Filtering#after.ft.filtering
-	 * @see FooTable.Filtering#filter
-	 */
-	F.Table.prototype.applyFilter = function(query, columns){
-		return this.use(F.Filtering).filter(query, columns);
-	};
-
-	/**
-	 * Clear the current filter from the table. Added by the {@link FooTable.Filtering} component.
-	 * @instance
-	 * @returns {jQuery.Promise}
-	 * @fires FooTable.Filtering#before.ft.filtering
-	 * @fires FooTable.Filtering#after.ft.filtering
-	 * @see FooTable.Filtering#clear
-	 */
-	F.Table.prototype.clearFilter = function(){
-		return this.use(F.Filtering).clear();
-	};
-})(FooTable);

admin/custom/footable3/js/footable.paging.js

@@ -1,6 +1,6 @@
 /*
 * FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
-* @version 3.0.6
+* @version 3.1.4
 * @link http://fooplugins.com
 * @copyright Steven Usher & Brad Vincent 2015
 * @license Released under the GPLv3 license.
@@ -84,16 +84,19 @@
 			this.size = table.o.paging.size;
 			/**
 			 * The maximum number of page links to display at once.
+			 * @instance
 			 * @type {number}
 			 */
 			this.limit = table.o.paging.limit;
 			/**
 			 * The position of the pagination control within the paging rows cell.
+			 * @instance
 			 * @type {string}
 			 */
 			this.position = table.o.paging.position;
 			/**
 			 * The format string used to generate the text displayed under the pagination control.
+			 * @instance
 			 * @type {string}
 			 */
 			this.countFormat = table.o.paging.countFormat;
@@ -103,6 +106,24 @@
 			 * @type {number}
 			 */
 			this.total = -1;
+			/**
+			 * The number of rows in the {@link FooTable.Rows#array} before paging is applied.
+			 * @instance
+			 * @type {number}
+			 */
+			this.totalRows = 0;
+			/**
+			 * A number indicating the previous page displayed.
+			 * @instance
+			 * @type {number}
+			 */
+			this.previous = -1;
+			/**
+			 * The count string generated using the {@link FooTable.Filtering#countFormat} option. This value is only set after the first call to the {@link FooTable.Filtering#predraw} method.
+			 * @instance
+			 * @type {string}
+			 */
+			this.formattedCount = null;
 			/**
 			 * The jQuery row object that contains all the paging specific elements.
 			 * @instance
@@ -117,29 +138,31 @@
 			this.$cell = null;
 			/**
 			 * The jQuery object that contains the links for the pagination control.
+			 * @instance
 			 * @type {jQuery}
 			 */
 			this.$pagination = null;
 			/**
 			 * The jQuery object that contains the row count.
+			 * @instance
 			 * @type {jQuery}
 			 */
 			this.$count = null;
+			/**
+			 * Whether or not the pagination row is detached from the table.
+			 * @instance
+			 * @type {boolean}
+			 */
+			this.detached = true;
 
 			/* PRIVATE */
 			/**
-			 * A number indicating the previous page displayed.
+			 * Used to hold the number of page links created.
-			 * @private
+			 * @instance
-			 * @type {number}
-			 */
-			this._previous = 1;
-
-			/**
-			 * Used to hold the number of rows in the {@link FooTable.Rows#array} before paging is applied.
 			 * @type {number}
 			 * @private
 			 */
-			this._total = 0;
+			this._createdLinks = 0;
 		},
 
 		/* PROTECTED */
@@ -196,8 +219,7 @@
 					? data.pagingCountFormat
 					: self.countFormat;
 
-				self.total = Math.ceil(self.ft.rows.array.length / self.size);
+				self.total = Math.ceil(self.ft.rows.all.length / self.size);
-				self._total = self.total;
 			}, function(){
 				self.enabled = false;
 			});
@@ -241,6 +263,8 @@
 			this.ft.raise('destroy.ft.paging').then(function(){
 				self.ft.$el.removeClass('footable-paging')
 					.find('tfoot > tr.footable-paging').remove();
+				self.detached = true;
+				self._createdLinks = 0;
 			});
 		},
 		/**
@@ -251,9 +275,11 @@
 		predraw: function(){
 			this.total = Math.ceil(this.ft.rows.array.length / this.size);
 			this.current = this.current > this.total ? this.total : (this.current < 1 ? 1 : this.current);
-			this._total = this.ft.rows.array.length;
+			this.totalRows = this.ft.rows.array.length;
-			if (this.ft.rows.array.length > this.size)
+			if (this.totalRows > this.size){
 				this.ft.rows.array = this.ft.rows.array.splice((this.current - 1) * this.size, this.size);
+			}
+			this.formattedCount = this.format(this.countFormat);
 		},
 		/**
 		 * Updates the paging UI setting the state of the pagination control.
@@ -261,9 +287,27 @@
 		 * @protected
 		 */
 		draw: function(){
+			if (this.total <= 1){
+				if (!this.detached){
+					this.$row.detach();
+					this.detached = true;
+				}
+			} else {
+				if (this.detached){
+					var $tfoot = this.ft.$el.children('tfoot');
+					if ($tfoot.length == 0){
+						$tfoot = $('<tfoot/>');
+						this.ft.$el.append($tfoot);
+					}
+					this.$row.appendTo($tfoot);
+					this.detached = false;
+				}
 				this.$cell.attr('colspan', this.ft.columns.visibleColspan);
-			this._setVisible(this.current, this.current > this._previous);
+				this._createLinks();
+				this._setVisible(this.current, this.current > this.previous);
 				this._setNavigation(true);
+				this.$count.text(this.formattedCount);
+			}
 		},
 		/**
 		 * Creates the paging UI from the current options setting the various jQuery properties of this component.
@@ -271,62 +315,54 @@
 		 * @protected
 		 */
 		$create: function(){
-			var self = this,
+			this._createdLinks = 0;
-				multiple = self.total > 1,
+			var position = 'footable-paging-center';
-				link = function(attr, html, klass){
+			switch (this.position){
-					return $('<li/>', {
-						'class': klass
-					}).attr('data-page', attr)
-						.append($('<a/>', {
-							'class': 'footable-page-link',
-							href: '#'
-						}).data('page', attr).html(html));
-				},
-				position;
-
-			if (!multiple) return;
-
-			switch (self.position){
 				case 'left': position = 'footable-paging-left'; break;
 				case 'right': position = 'footable-paging-right'; break;
-				default: position = 'footable-paging-center'; break;
 			}
-			self.ft.$el.addClass('footable-paging').addClass(position);
+			this.ft.$el.addClass('footable-paging').addClass(position);
-			self.$cell = $('<td/>').attr('colspan', self.ft.columns.visibleColspan);
+			this.$cell = $('<td/>').attr('colspan', this.ft.columns.visibleColspan);
-			var $tfoot = self.ft.$el.children('tfoot');
+			var $tfoot = this.ft.$el.children('tfoot');
 			if ($tfoot.length == 0){
 				$tfoot = $('<tfoot/>');
-				self.ft.$el.append($tfoot);
+				this.ft.$el.append($tfoot);
 			}
-			self.$row = $('<tr/>', { 'class': 'footable-paging' }).append(self.$cell).appendTo($tfoot);
+			this.$row = $('<tr/>', { 'class': 'footable-paging' }).append(this.$cell).appendTo($tfoot);
-			self.$pagination = $('<ul/>', { 'class': 'pagination' }).on('click.footable', 'a.footable-page-link', { self: self }, self._onPageClicked);
+			this.$pagination = $('<ul/>', { 'class': 'pagination' }).on('click.footable', 'a.footable-page-link', { self: this }, this._onPageClicked);
-			self.$count = $('<span/>', { 'class': 'label label-default' });
+			this.$count = $('<span/>', { 'class': 'label label-default' });
-
+			this.$cell.append(this.$pagination, $('<div/>', {'class': 'divider'}), this.$count);
-			self.$pagination.empty();
+			this.detached = false;
-			if (multiple) {
-				self.$pagination.append(link('first', self.strings.first, 'footable-page-nav'));
-				self.$pagination.append(link('prev', self.strings.prev, 'footable-page-nav'));
-				if (self.limit > 0 && self.limit < self.total){
-					self.$pagination.append(link('prev-limit', self.strings.prevPages, 'footable-page-nav'));
-				}
-			}
-			for (var i = 0, $li; i < self.total; i++){
-				$li = link(i + 1, i + 1, 'footable-page');
-				self.$pagination.append($li);
-			}
-			if (multiple){
-				if (self.limit > 0 && self.limit < self.total){
-					self.$pagination.append(link('next-limit', self.strings.nextPages, 'footable-page-nav'));
-				}
-				self.$pagination.append(link('next', self.strings.next, 'footable-page-nav'));
-				self.$pagination.append(link('last', self.strings.last, 'footable-page-nav'));
-			}
-
-			self.$cell.append(self.$pagination, $('<div/>', {'class': 'divider'}), self.$count);
-			self._total = self.total;
 		},
 
 		/* PUBLIC */
+		/**
+		 * @summary Uses the supplied format string and replaces the placeholder strings with the current values.
+		 * @description This method is used to generate the short description label for the pagination control. i.e. Showing X of Y records. The placeholders for this string are the following:
+		 * * {CP} - The current page number.
+		 * * {TP} - The total number of pages.
+		 * * {PF} - The first row of the current page.
+		 * * {PL} - The last row of the current page.
+		 * * {TR} - The total rows available.
+		 * These placeholders can be supplied in a string like; "Showing {PF} to {PL} of {TR} rows."
+		 * @param {string} formatString - The string to be formatted with the paging specific variables.
+		 * @returns {string}
+		 */
+		format: function(formatString){
+			var firstRow = (this.size * (this.current - 1)) + 1,
+				lastRow = this.size * this.current;
+			if (this.ft.rows.array.length == 0){
+				firstRow = 0;
+				lastRow = 0;
+			} else {
+				lastRow = lastRow > this.totalRows ? this.totalRows : lastRow;
+			}
+			return formatString.replace(/\{CP}/g, this.current)
+				.replace(/\{TP}/g, this.total)
+				.replace(/\{PF}/g, firstRow)
+				.replace(/\{PL}/g, lastRow)
+				.replace(/\{TR}/g, this.totalRows);
+		},
 		/**
 		 * Pages to the first page.
 		 * @instance
@@ -437,7 +473,7 @@
 				pager.page = pager.page > pager.total ? pager.total	: pager.page;
 				pager.page = pager.page < 1 ? 1 : pager.page;
 				if (self.current == page) return $.when();
-				self._previous = self.current;
+				self.previous = self.current;
 				self.current = pager.page;
 				return self.ft.draw().then(function(){
 					/**
@@ -451,6 +487,46 @@
 				});
 			});
 		},
+		/**
+		 * Creates the pagination links using the current state of the plugin. If the total number of pages is the same as
+		 * the last time this function was executed it does nothing.
+		 * @instance
+		 * @private
+		 */
+		_createLinks: function(){
+			if (this._createdLinks === this.total) return;
+			var self = this,
+				multiple = self.total > 1,
+				link = function(attr, html, klass){
+					return $('<li/>', {
+						'class': klass
+					}).attr('data-page', attr)
+						.append($('<a/>', {
+							'class': 'footable-page-link',
+							href: '#'
+						}).data('page', attr).html(html));
+				};
+			self.$pagination.empty();
+			if (multiple) {
+				self.$pagination.append(link('first', self.strings.first, 'footable-page-nav'));
+				self.$pagination.append(link('prev', self.strings.prev, 'footable-page-nav'));
+				if (self.limit > 0 && self.limit < self.total){
+					self.$pagination.append(link('prev-limit', self.strings.prevPages, 'footable-page-nav'));
+				}
+			}
+			for (var i = 0, $li; i < self.total; i++){
+				$li = link(i + 1, i + 1, 'footable-page');
+				self.$pagination.append($li);
+			}
+			if (multiple){
+				if (self.limit > 0 && self.limit < self.total){
+					self.$pagination.append(link('next-limit', self.strings.nextPages, 'footable-page-nav'));
+				}
+				self.$pagination.append(link('next', self.strings.next, 'footable-page-nav'));
+				self.$pagination.append(link('last', self.strings.last, 'footable-page-nav'));
+			}
+			self._createdLinks = self.total;
+		},
 		/**
 		 * Sets the state for the navigation links of the pagination control and optionally sets the active class state on the current page link.
 		 * @instance
@@ -483,9 +559,9 @@
 			}
 
 			if (this.limit > 0 && this.total < this.limit){
-				this.$pagination.children('li[data-page="prev-limit"],li[data-page="next-limit"]').hide();
+				this.$pagination.children('li[data-page="prev-limit"],li[data-page="next-limit"]').css('display', 'none');
 			} else {
-				this.$pagination.children('li[data-page="prev-limit"],li[data-page="next-limit"]').show();
+				this.$pagination.children('li[data-page="prev-limit"],li[data-page="next-limit"]').css('display', '');
 			}
 
 			if (active){
@@ -523,31 +599,6 @@
 			} else {
 				this.$pagination.children('li.footable-page').removeClass('visible').slice(0, this.total).addClass('visible');
 			}
-			var first = (this.size * (page - 1)) + 1,
-				last = this.size * page;
-			if (this.ft.rows.array.length == 0){
-				first = 0;
-				last = 0;
-			} else {
-				last = last > this._total ? this._total : last;
-			}
-			this._setCount(page, this.total, first, last, this._total);
-		},
-		/**
-		 * Uses the countFormat option to generate the text using the supplied parameters.
-		 * @param {number} currentPage - The current page.
-		 * @param {number} totalPages - The total number of pages.
-		 * @param {number} pageFirst - The first row number of the current page.
-		 * @param {number} pageLast - The last row number of the current page.
-		 * @param {number} totalRows - The total number of rows.
-		 * @private
-		 */
-		_setCount: function(currentPage, totalPages, pageFirst, pageLast, totalRows){
-			this.$count.text(this.countFormat.replace(/\{CP}/g, currentPage)
-				.replace(/\{TP}/g, totalPages)
-				.replace(/\{PF}/g, pageFirst)
-				.replace(/\{PL}/g, pageLast)
-				.replace(/\{TR}/g, totalRows));
 		},
 		/**
 		 * Handles the click event for all links in the pagination control.
@@ -579,7 +630,7 @@
 		}
 	});
 
-	F.components.core.register('paging', F.Paging, 0);
+	F.components.register('paging', F.Paging, 400);
 
 })(jQuery, FooTable);
 (function(F){

admin/custom/footable3/js/footable.sorting.js

@@ -1,6 +1,6 @@
 /*
 * FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
-* @version 3.0.6
+* @version 3.1.4
 * @link http://fooplugins.com
 * @copyright Steven Usher & Brad Vincent 2015
 * @license Released under the GPLv3 license.
@@ -58,15 +58,18 @@
 			 * @type {FooTable.Column}
 			 */
 			this.column = null;
-
-			/* PRIVATE */
 			/**
-			 * Sets a flag indicating whether or not the sorting has changed. When set to true the {@link FooTable.Sorting#sorting_changing} and {@link FooTable.Sorting#sorting_changed} events
+			 * Whether or not to allow sorting to occur, should be set using the {@link FooTable.Sorting#toggleAllowed} method.
-			 * will be raised during the drawing operation.
+			 * @instance
-			 * @private
 			 * @type {boolean}
 			 */
-			this._changed = false;
+			this.allowed = true;
+			/**
+			 * The initial sort state of the table, this value is used for determining if the sorting has occurred or to reset the state to default.
+			 * @instance
+			 * @type {{isset: boolean, rows: Array.<FooTable.Row>, column: string, direction: ?string}}
+			 */
+			this.initial = null;
 		},
 
 		/* PROTECTED */
@@ -117,6 +120,17 @@
 			 */
 			var self = this;
 			this.ft.raise('init.ft.sorting').then(function(){
+				if (!self.initial){
+					var isset = !!self.column;
+					self.initial = {
+						isset: isset,
+						// grab a shallow copy of the rows array prior to sorting - allows us to reset without an initial sort
+						rows: self.ft.rows.all.slice(0),
+						// if there is a sorted column store its name and direction
+						column: isset ? self.column.name : null,
+						direction: isset ? self.column.direction : null
+					}
+				}
 				F.arr.each(self.ft.columns.array, function(col){
 					if (col.sortable){
 						col.$el.addClass('footable-sortable').append($('<span/>', {'class': 'fooicon fooicon-sort'}));
@@ -145,7 +159,7 @@
 			this.ft.raise('destroy.ft.paging').then(function(){
 				self.ft.$el.off('click.footable', '.footable-sortable', self._onSortClicked);
 				self.ft.$el.children('thead').children('tr.footable-header')
-					.children('.footable-sortable').removeClass('footable-sortable')
+					.children('.footable-sortable').removeClass('footable-sortable footable-asc footable-desc')
 					.find('span.fooicon').remove();
 			});
 		},
@@ -157,15 +171,10 @@
 		predraw: function () {
 			if (!this.column) return;
 			var self = this, col = self.column;
-			//self.ft.rows.array.sort(function (a, b) {
-			//	return col.direction == 'ASC'
-			//			? col.sorter(a.cells[col.index].value, b.cells[col.index].value)
-			//			: col.sorter(b.cells[col.index].value, a.cells[col.index].value);
-			//});
 			self.ft.rows.array.sort(function (a, b) {
-				return col.direction == 'ASC'
+				return col.direction == 'DESC'
-						? col.sorter(a.cells[col.index].sortValue, b.cells[col.index].sortValue)
+						? col.sorter(b.cells[col.index].sortValue, a.cells[col.index].sortValue)
-						: col.sorter(b.cells[col.index].sortValue, a.cells[col.index].sortValue);
+						: col.sorter(a.cells[col.index].sortValue, b.cells[col.index].sortValue);
 			});
 		},
 		/**
@@ -181,8 +190,8 @@
 
 			$sortable.removeClass('footable-asc footable-desc').children('.fooicon').removeClass('fooicon-sort fooicon-sort-asc fooicon-sort-desc');
 			$sortable.not($active).children('.fooicon').addClass('fooicon-sort');
-			$active.addClass(self.column.direction == 'ASC' ? 'footable-asc' : 'footable-desc')
+			$active.addClass(self.column.direction == 'DESC' ? 'footable-desc' : 'footable-asc')
-				.children('.fooicon').addClass(self.column.direction == 'ASC' ? 'fooicon-sort-asc' : 'fooicon-sort-desc');
+				.children('.fooicon').addClass(self.column.direction == 'DESC' ? 'fooicon-sort-desc' : 'fooicon-sort-asc');
 		},
 
 		/* PUBLIC */
@@ -198,6 +207,47 @@
 		sort: function(column, direction){
 			return this._sort(column, direction);
 		},
+		/**
+		 * Toggles whether or not sorting is currently allowed.
+		 * @param {boolean} [state] - You can optionally specify the state you want it to be, if not supplied the current value is flipped.
+		 */
+		toggleAllowed: function(state){
+			state = F.is.boolean(state) ? state : !this.allowed;
+			this.allowed = state;
+			this.ft.$el.toggleClass('footable-sorting-disabled', !this.allowed);
+		},
+		/**
+		 * Checks whether any sorting has occurred for the table.
+		 * @returns {boolean}
+		 */
+		hasChanged: function(){
+			return !(!this.initial || !this.column ||
+				(this.column.name === this.initial.column &&
+					(this.column.direction === this.initial.direction || (this.initial.direction === null && this.column.direction === 'ASC')))
+			);
+		},
+		/**
+		 * Resets the table sorting to the initial state recorded in the components init method.
+		 */
+		reset: function(){
+			if (!!this.initial){
+				if (this.initial.isset){
+					// if the initial value specified a column, sort by it
+					this.sort(this.initial.column, this.initial.direction);
+				} else {
+					// if there was no initial column then we need to reset the rows to there original order
+					if (!!this.column){
+						// if there is a currently sorted column remove the asc/desc classes and set it to null.
+						this.column.$el.removeClass('footable-asc footable-desc');
+						this.column = null;
+					}
+					// replace the current all rows array with the one stored in the initial value
+					this.ft.rows.all = this.initial.rows;
+					// force the table to redraw itself using the updated rows array
+					this.ft.draw();
+				}
+			}
+		},
 
 		/* PRIVATE */
 		/**
@@ -211,6 +261,7 @@
 		 * @fires FooTable.Sorting#"after.ft.sorting"
 		 */
 		_sort: function(column, direction){
+			if (!this.allowed) return $.Deferred().reject('sorting disabled');
 			var self = this;
 			var sorter = new F.Sorter(self.ft.columns.get(column), F.Sorting.dir(direction));
 			/**
@@ -245,7 +296,6 @@
 		 * @param {jQuery.Event} e - The event object for the event.
 		 */
 		_onSortClicked: function (e) {
-			e.preventDefault();
 			var self = e.data.self, $header = $(this).closest('th,td'),
 				direction = $header.is('.footable-asc, .footable-desc')
 					? ($header.hasClass('footable-desc') ? 'ASC' : 'DESC')
@@ -264,7 +314,7 @@
 		return F.is.string(str) && (str == 'ASC' || str == 'DESC') ? str : 'ASC';
 	};
 
-	F.components.core.register('sorting', F.Sorting, 5);
+	F.components.register('sorting', F.Sorting, 600);
 
 })(jQuery, FooTable);
 (function(F){
@@ -355,7 +405,10 @@
 	 */
 	F.Column.prototype.sortValue = function(valueOrElement){
 		// if we have an element or a jQuery object use jQuery to get the value
-		if (F.is.element(valueOrElement) || F.is.jq(valueOrElement)) return $(valueOrElement).data('sortValue') || this.parser(valueOrElement);
+		if (F.is.element(valueOrElement) || F.is.jq(valueOrElement)){
+			var data = $(valueOrElement).data('sortValue');
+			return F.is.defined(data) ? data : this.parser(valueOrElement);
+		}
 		// if options are supplied with the value
 		if (F.is.hash(valueOrElement) && F.is.hash(valueOrElement.options)){
 			if (F.is.string(valueOrElement.options.sortValue)) return valueOrElement.options.sortValue;
@@ -371,6 +424,7 @@
 		this.direction = F.is.type(definition.direction, 'string') ? F.Sorting.dir(definition.direction) : null;
 		this.sortable = F.is.boolean(definition.sortable) ? definition.sortable : true;
 		this.sorted = F.is.boolean(definition.sorted) ? definition.sorted : false;
+		this.sortValue = F.checkFnValue(this, definition.sortValue, this.sortValue);
 	};
 
 	// overrides the public define method and replaces it with our own
@@ -406,7 +460,8 @@
 	F.HTMLColumn.prototype.sortValue = function(valueOrElement){
 		// if we have an element or a jQuery object use jQuery to get the data value or pass it off to the parser
 		if (F.is.element(valueOrElement) || F.is.jq(valueOrElement)){
-			return $(valueOrElement).data('sortValue') || $.trim($(valueOrElement)[this.sortUse]());
+			var data = $(valueOrElement).data('sortValue');
+			return F.is.defined(data) ? data : $.trim($(valueOrElement)[this.sortUse]());
 		}
 		// if options are supplied with the value
 		if (F.is.hash(valueOrElement) && F.is.hash(valueOrElement.options)){

admin/custom/footable3/js/footable.state.js

@@ -0,0 +1,362 @@
+/*
+* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
+* @version 3.1.4
+* @link http://fooplugins.com
+* @copyright Steven Usher & Brad Vincent 2015
+* @license Released under the GPLv3 license.
+*/
+(function($, F){
+
+	// global int to use if the table has no ID
+	var _uid = 0,
+	// a hash value for the current url
+		_url_hash = (function(str){
+			var i, l, hval = 0x811c9dc5;
+			for (i = 0, l = str.length; i < l; i++) {
+				hval ^= str.charCodeAt(i);
+				hval += (hval << 1) + (hval << 4) + (hval << 7) + (hval << 8) + (hval << 24);
+			}
+			return hval >>> 0;
+		})(location.origin + location.pathname);
+
+	F.State = F.Component.extend(/** @lends FooTable.State */{
+		/**
+		 * The state component adds the ability for the table to remember its basic state for filtering, paging and sorting.
+		 * @constructs
+		 * @extends FooTable.Component
+		 * @param {FooTable.Table} table - The parent {@link FooTable.Table} object for the component.
+		 * @returns {FooTable.State}
+		 */
+		construct: function(table){
+			// call the constructor of the base class
+			this._super(table, table.o.state.enabled);
+			// Change this value if an update to this component requires any stored data to be reset
+			this._key = '1';
+			/**
+			 * The key to use to store the state for this table.
+			 * @type {(null|string)}
+			 */
+			this.key = this._key + (F.is.string(table.o.state.key) ? table.o.state.key : this._uid());
+			/**
+			 * Whether or not to allow the filtering component to store it's state.
+			 * @type {boolean}
+			 */
+			this.filtering = F.is.boolean(table.o.state.filtering) ? table.o.state.filtering : true;
+			/**
+			 * Whether or not to allow the paging component to store it's state.
+			 * @type {boolean}
+			 */
+			this.paging = F.is.boolean(table.o.state.paging) ? table.o.state.paging : true;
+			/**
+			 * Whether or not to allow the sorting component to store it's state.
+			 * @type {boolean}
+			 */
+			this.sorting = F.is.boolean(table.o.state.sorting) ? table.o.state.sorting : true;
+		},
+		/* PROTECTED */
+		/**
+		 * Checks the supplied data and options for the state component.
+		 * @instance
+		 * @protected
+		 * @param {object} data - The jQuery data object from the parent table.
+		 * @fires FooTable.State#"preinit.ft.state"
+		 * @this FooTable.State
+		 */
+		preinit: function(data){
+			var self = this;
+			/**
+			 * The preinit.ft.state event is raised before the UI is created and provides the tables jQuery data object for additional options parsing.
+			 * Calling preventDefault on this event will disable the component.
+			 * @event FooTable.State#"preinit.ft.state"
+			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+			 * @param {object} data - The jQuery data object of the table raising the event.
+			 */
+			this.ft.raise('preinit.ft.state', [data]).then(function(){
+
+				self.enabled = F.is.boolean(data.state)
+					? data.state
+					: self.enabled;
+
+				if (!self.enabled) return;
+
+				self.key = self._key + (F.is.string(data.stateKey) ? data.stateKey : self.key);
+
+				self.filtering = F.is.boolean(data.stateFiltering) ? data.stateFiltering : self.filtering;
+
+				self.paging = F.is.boolean(data.statePaging) ? data.statePaging : self.paging;
+
+				self.sorting = F.is.boolean(data.stateSorting) ? data.stateSorting : self.sorting;
+
+			}, function(){
+				self.enabled = false;
+			});
+		},
+		/**
+		 * Gets the state value for the specified key for this table.
+		 * @instance
+		 * @param {string} key - The key to get the value for.
+		 * @returns {(*|null)}
+		 */
+		get: function(key){
+			return JSON.parse(localStorage.getItem(this.key + ':' + key));
+		},
+		/**
+		 * Sets the state value for the specified key for this table.
+		 * @instance
+		 * @param {string} key - The key to set the value for.
+		 * @param {*} data - The value to store for the key. This value must be JSON.stringify friendly.
+		 */
+		set: function(key, data){
+			localStorage.setItem(this.key + ':' + key, JSON.stringify(data));
+		},
+		/**
+		 * Clears the state value for the specified key for this table.
+		 * @instance
+		 * @param {string} key - The key to clear the value for.
+		 */
+		remove: function(key){
+			localStorage.removeItem(this.key + ':' + key);
+		},
+		/**
+		 * Executes the {@link FooTable.Component#readState} function on all components.
+		 * @instance
+		 */
+		read: function(){
+			this.ft.execute(false, true, 'readState');
+		},
+		/**
+		 * Executes the {@link FooTable.Component#writeState} function on all components.
+		 * @instance
+		 */
+		write: function(){
+			this.ft.execute(false, true, 'writeState');
+		},
+		/**
+		 * Executes the {@link FooTable.Component#clearState} function on all components.
+		 * @instance
+		 */
+		clear: function(){
+			this.ft.execute(false, true, 'clearState');
+		},
+		/**
+		 * Generates a unique identifier for the current {@link FooTable.Table} if one is not supplied through the options.
+		 * This value is a combination of the url hash and either the element ID or an incremented global int value.
+		 * @instance
+		 * @returns {*}
+		 * @private
+		 */
+		_uid: function(){
+			var id = this.ft.$el.attr('id');
+			return _url_hash + '_' + (F.is.string(id) ? id : ++_uid);
+		}
+	});
+
+	F.components.register('state', F.State, 700);
+
+})(jQuery, FooTable);
+(function(F){
+
+	/**
+	 * This method is called from the {@link FooTable.State#read} method and allows a component to retrieve its' stored state.
+	 * @instance
+	 * @protected
+	 * @function
+	 */
+	F.Component.prototype.readState = function(){};
+
+	/**
+	 * This method is called from the {@link FooTable.State#write} method and allows a component to write its' current state to the store.
+	 * @instance
+	 * @protected
+	 * @function
+	 */
+	F.Component.prototype.writeState = function(){};
+
+	/**
+	 * This method is called from the {@link FooTable.State#clear} method and allows a component to clear any stored state.
+	 * @instance
+	 * @protected
+	 * @function
+	 */
+	F.Component.prototype.clearState = function(){};
+
+})(FooTable);
+(function(F){
+
+	/**
+	 * An object containing the state options for the plugin. Added by the {@link FooTable.State} component.
+	 * @type {object}
+	 * @prop {boolean} enabled=false - Whether or not to allow state to be stored for the table. This overrides the individual component enable options.
+	 * @prop {boolean} filtering=true - Whether or not to allow the filtering state to be stored.
+	 * @prop {boolean} paging=true - Whether or not to allow the filtering state to be stored.
+	 * @prop {boolean} sorting=true - Whether or not to allow the filtering state to be stored.
+	 * @prop {string} key=null - The unique key to use to store the table's data.
+	 */
+	F.Defaults.prototype.state = {
+		enabled: false,
+		filtering: true,
+		paging: true,
+		sorting: true,
+		key: null
+	};
+
+})(FooTable);
+(function(F){
+
+	if (!F.Filtering) return;
+
+	/**
+	 * Allows the filtering component to retrieve its' stored state.
+	 */
+	F.Filtering.prototype.readState = function(){
+		if (this.ft.state.filtering){
+			var state = this.ft.state.get('filtering');
+			if (F.is.hash(state) && !F.is.emptyArray(state.filters)){
+				this.filters = this.ensure(state.filters);
+			}
+		}
+	};
+
+	/**
+	 * Allows the filtering component to write its' current state to the store.
+	 */
+	F.Filtering.prototype.writeState = function(){
+		if (this.ft.state.filtering) {
+			var filters = F.arr.map(this.filters, function (f) {
+				return {
+					name: f.name,
+					query: f.query instanceof F.Query ? f.query.val() : f.query,
+					columns: F.arr.map(f.columns, function (c) {
+						return c.name;
+					}),
+					hidden: f.hidden,
+					space: f.space,
+					connectors: f.connectors,
+					ignoreCase: f.ignoreCase
+				};
+			});
+			this.ft.state.set('filtering', {filters: filters});
+		}
+	};
+
+	/**
+	 * Allows the filtering component to clear any stored state.
+	 */
+	F.Filtering.prototype.clearState = function(){
+		if (this.ft.state.filtering) {
+			this.ft.state.remove('filtering');
+		}
+	};
+
+})(FooTable);
+(function(F){
+
+	if (!F.Paging) return;
+
+	/**
+	 * Allows the paging component to retrieve its' stored state.
+	 */
+	F.Paging.prototype.readState = function(){
+		if (this.ft.state.paging) {
+			var state = this.ft.state.get('paging');
+			if (F.is.hash(state)) {
+				this.current = state.current;
+				this.size = state.size;
+			}
+		}
+	};
+
+	/**
+	 * Allows the paging component to write its' current state to the store.
+	 */
+	F.Paging.prototype.writeState = function(){
+		if (this.ft.state.paging) {
+			this.ft.state.set('paging', {
+				current: this.current,
+				size: this.size
+			});
+		}
+	};
+
+	/**
+	 * Allows the paging component to clear any stored state.
+	 */
+	F.Paging.prototype.clearState = function(){
+		if (this.ft.state.paging) {
+			this.ft.state.remove('paging');
+		}
+	};
+
+})(FooTable);
+(function(F){
+
+	if (!F.Sorting) return;
+
+	/**
+	 * Allows the sorting component to retrieve its' stored state.
+	 */
+	F.Sorting.prototype.readState = function(){
+		if (this.ft.state.sorting) {
+			var state = this.ft.state.get('sorting');
+			if (F.is.hash(state)) {
+				var column = this.ft.columns.get(state.column);
+				if (column instanceof F.Column) {
+					this.column = column;
+					this.column.direction = state.direction;
+				}
+			}
+		}
+	};
+
+	/**
+	 * Allows the sorting component to write its' current state to the store.
+	 */
+	F.Sorting.prototype.writeState = function(){
+		if (this.ft.state.sorting && this.column instanceof F.Column){
+			this.ft.state.set('sorting', {
+				column: this.column.name,
+				direction: this.column.direction
+			});
+		}
+	};
+
+	/**
+	 * Allows the sorting component to clear any stored state.
+	 */
+	F.Sorting.prototype.clearState = function(){
+		if (this.ft.state.sorting) {
+			this.ft.state.remove('sorting');
+		}
+	};
+
+})(FooTable);
+(function(F){
+
+	// hook into the _construct method so we can add the state property to the table.
+	F.Table.extend('_construct', function(ready){
+		this.state = this.use(FooTable.State);
+		this._super(ready);
+	});
+
+	// hook into the _preinit method so we can trigger a plugin wide read state operation.
+	F.Table.extend('_preinit', function(){
+		var self = this;
+		return self._super().then(function(){
+			if (self.state.enabled){
+				self.state.read();
+			}
+		});
+	});
+
+	// hook into the draw method so we can trigger a plugin wide write state operation.
+	F.Table.extend('draw', function(){
+		var self = this;
+		return self._super().then(function(){
+			if (self.state.enabled){
+				self.state.write();
+			}
+		});
+	});
+
+})(FooTable);

admin/custom/footable3/js/footable.state.min.js

@@ -0,0 +1,8 @@
+/*
+* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
+* @version 3.1.4
+* @link http://fooplugins.com
+* @copyright Steven Usher & Brad Vincent 2015
+* @license Released under the GPLv3 license.
+*/
+!function(a,b){var c=0,d=function(a){var b,c,d=2166136261;for(b=0,c=a.length;c>b;b++)d^=a.charCodeAt(b),d+=(d<<1)+(d<<4)+(d<<7)+(d<<8)+(d<<24);return d>>>0}(location.origin+location.pathname);b.State=b.Component.extend({construct:function(a){this._super(a,a.o.state.enabled),this._key="1",this.key=this._key+(b.is.string(a.o.state.key)?a.o.state.key:this._uid()),this.filtering=b.is["boolean"](a.o.state.filtering)?a.o.state.filtering:!0,this.paging=b.is["boolean"](a.o.state.paging)?a.o.state.paging:!0,this.sorting=b.is["boolean"](a.o.state.sorting)?a.o.state.sorting:!0},preinit:function(a){var c=this;this.ft.raise("preinit.ft.state",[a]).then(function(){c.enabled=b.is["boolean"](a.state)?a.state:c.enabled,c.enabled&&(c.key=c._key+(b.is.string(a.stateKey)?a.stateKey:c.key),c.filtering=b.is["boolean"](a.stateFiltering)?a.stateFiltering:c.filtering,c.paging=b.is["boolean"](a.statePaging)?a.statePaging:c.paging,c.sorting=b.is["boolean"](a.stateSorting)?a.stateSorting:c.sorting)},function(){c.enabled=!1})},get:function(a){return JSON.parse(localStorage.getItem(this.key+":"+a))},set:function(a,b){localStorage.setItem(this.key+":"+a,JSON.stringify(b))},remove:function(a){localStorage.removeItem(this.key+":"+a)},read:function(){this.ft.execute(!1,!0,"readState")},write:function(){this.ft.execute(!1,!0,"writeState")},clear:function(){this.ft.execute(!1,!0,"clearState")},_uid:function(){var a=this.ft.$el.attr("id");return d+"_"+(b.is.string(a)?a:++c)}}),b.components.register("state",b.State,700)}(jQuery,FooTable),function(a){a.Component.prototype.readState=function(){},a.Component.prototype.writeState=function(){},a.Component.prototype.clearState=function(){}}(FooTable),function(a){a.Defaults.prototype.state={enabled:!1,filtering:!0,paging:!0,sorting:!0,key:null}}(FooTable),function(a){a.Filtering&&(a.Filtering.prototype.readState=function(){if(this.ft.state.filtering){var b=this.ft.state.get("filtering");a.is.hash(b)&&!a.is.emptyArray(b.filters)&&(this.filters=this.ensure(b.filters))}},a.Filtering.prototype.writeState=function(){if(this.ft.state.filtering){var b=a.arr.map(this.filters,function(b){return{name:b.name,query:b.query instanceof a.Query?b.query.val():b.query,columns:a.arr.map(b.columns,function(a){return a.name}),hidden:b.hidden,space:b.space,connectors:b.connectors,ignoreCase:b.ignoreCase}});this.ft.state.set("filtering",{filters:b})}},a.Filtering.prototype.clearState=function(){this.ft.state.filtering&&this.ft.state.remove("filtering")})}(FooTable),function(a){a.Paging&&(a.Paging.prototype.readState=function(){if(this.ft.state.paging){var b=this.ft.state.get("paging");a.is.hash(b)&&(this.current=b.current,this.size=b.size)}},a.Paging.prototype.writeState=function(){this.ft.state.paging&&this.ft.state.set("paging",{current:this.current,size:this.size})},a.Paging.prototype.clearState=function(){this.ft.state.paging&&this.ft.state.remove("paging")})}(FooTable),function(a){a.Sorting&&(a.Sorting.prototype.readState=function(){if(this.ft.state.sorting){var b=this.ft.state.get("sorting");if(a.is.hash(b)){var c=this.ft.columns.get(b.column);c instanceof a.Column&&(this.column=c,this.column.direction=b.direction)}}},a.Sorting.prototype.writeState=function(){this.ft.state.sorting&&this.column instanceof a.Column&&this.ft.state.set("sorting",{column:this.column.name,direction:this.column.direction})},a.Sorting.prototype.clearState=function(){this.ft.state.sorting&&this.ft.state.remove("sorting")})}(FooTable),function(a){a.Table.extend("_construct",function(a){this.state=this.use(FooTable.State),this._super(a)}),a.Table.extend("_preinit",function(){var a=this;return a._super().then(function(){a.state.enabled&&a.state.read()})}),a.Table.extend("draw",function(){var a=this;return a._super().then(function(){a.state.enabled&&a.state.write()})})}(FooTable);

admin/helpers/compiler.php

@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version			2.2.0
+	@version			2.3.0
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		compiler.php
@@ -46,6 +46,7 @@ class Compiler extends Infusion
 	protected $dynamicIntegration	= false;
 	protected $backupPath		= false;
 	protected $gitPath		= false;
+	protected $addCustomCodeAt	= array();
 
 	/**
 	 * Constructor
@@ -101,6 +102,13 @@ class Compiler extends Infusion
 			}
 			// check if we have custom code to add
 			$this->getCustomCode();
+			// now add the other custom code by placeholder
+			if (ComponentbuilderHelper::checkArray($this->addCustomCodeAt))
+			{
+				// load error messages incase code can not be added
+				$app = JFactory::getApplication();
+				$this->addCustomCodeViaPlaceholders($app);
+			}
 			// now insert into the new files
 			if (ComponentbuilderHelper::checkArray($this->customCode))
 			{
@@ -166,12 +174,16 @@ class Compiler extends Infusion
 					{
 						list($wast,$code) = explode('###BOM###',$string);
 						$answer = str_replace(array_keys($this->fileContentStatic),array_values($this->fileContentStatic),$php.$bom.$code);
+						// add custom Code by placeholder if found
+						$this->getPlaceHolderKeys($static['path'], $answer);
 						// add to zip array
 						$this->writeFile($static['path'],$answer);
 					}
 					else
 					{
 						$answer = str_replace(array_keys($this->fileContentStatic),array_values($this->fileContentStatic),$string);
+						// add custom Code by placeholder if found
+						$this->getPlaceHolderKeys($static['path'], $answer);
 						// add to zip array
 						$this->writeFile($static['path'],$answer);
 					}
@@ -203,6 +215,8 @@ class Compiler extends Infusion
 									list($bin,$code) = explode('###BOM###',$string);
 									$answer = str_replace(array_keys($this->fileContentStatic),array_values($this->fileContentStatic),$php.$bom.$code);
 									$answer = str_replace(array_keys($this->fileContentDynamic[$view]),array_values($this->fileContentDynamic[$view]),$answer);
+									// add custom Code by placeholder if found
+									$this->getPlaceHolderKeys($file['path'], $answer, $view);
 									// add to zip array
 									$this->writeFile($file['path'],$answer);
 								}
@@ -210,6 +224,8 @@ class Compiler extends Infusion
 								{
 									$answer = str_replace(array_keys($this->fileContentStatic),array_values($this->fileContentStatic),$string);
 									$answer = str_replace(array_keys($this->fileContentDynamic[$view]),array_values($this->fileContentDynamic[$view]),$answer);
+									// add custom Code by placeholder if found
+									$this->getPlaceHolderKeys($file['path'], $answer, $view);
 									// add to zip array
 									$this->writeFile($file['path'],$answer);
 								}
@@ -242,6 +258,29 @@ class Compiler extends Infusion
 		return false;
 	}
 
+	protected function getPlaceHolderKeys(&$file, &$content, &$view = '')
+	{
+		// check if line has custom code place holder
+		if (strpos($content, '[CUSTO'.'MCODE=') !== false)
+		{
+			if (!isset($this->addCustomCodeAt[$file]))
+			{
+				$this->addCustomCodeAt[$file] = array();
+				$this->addCustomCodeAt[$file]['ids'] = array();
+				$this->addCustomCodeAt[$file]['replace'] = array();
+				$this->addCustomCodeAt[$file]['view'] = $view;
+			}
+			$found = ComponentbuilderHelper::getAllBetween($content, '[CUSTO'.'MCODE=', ']');
+			if (ComponentbuilderHelper::checkArray($found))
+			{
+				foreach ($found as $id)
+				{
+					$this->addCustomCodeAt[$file]['ids'][$id] = $id;
+				}
+			}
+		}
+	}
+	
 	protected function freeMemory()
 	{		
 		// free up some memory
@@ -591,6 +630,63 @@ class Compiler extends Infusion
 		return false;
 	}
 	
+	protected function addCustomCodeViaPlaceholders($app)
+	{
+		// reset all these
+		unset($this->placeholders['###view###']);
+		unset($this->placeholders['###VIEW###']);
+		unset($this->placeholders['###View###']);
+		unset($this->placeholders['[[[view]]]']);
+		unset($this->placeholders['[[[VIEW]]]']);
+		unset($this->placeholders['[[[View]]]']);
+		unset($this->placeholders['###views###']);
+		unset($this->placeholders['###VIEWS###']);
+		unset($this->placeholders['###Views###']);
+		unset($this->placeholders['[[[views]]]']);
+		unset($this->placeholders['[[[VIEWS]]]']);
+		unset($this->placeholders['[[[Views]]]']);
+		unset($this->placeholders['###SView###']);
+		unset($this->placeholders['###sview###']);
+		unset($this->placeholders['###SVIEW###']);
+		unset($this->placeholders['[[[SView]]]']);
+		unset($this->placeholders['[[[sview]]]']);
+		unset($this->placeholders['[[[SVIEW]]]']);
+		unset($this->placeholders['###SViews###']);
+		unset($this->placeholders['###sviews###']);
+		unset($this->placeholders['###SVIEWS###']);
+		unset($this->placeholders['[[[SViews]]]']);
+		unset($this->placeholders['[[[sviews]]]']);
+		unset($this->placeholders['[[[SVIEWS]]]']);
+		foreach ($this->addCustomCodeAt as $path => $item)
+		{
+			if (ComponentbuilderHelper::checkString($item['view']))
+			{
+				$this->placeholders['[[[view]]]'] = $item['view'];
+			}
+			elseif (isset($this->placeholders['[[[view]]]']))
+			{
+				unset($this->placeholders['[[[view]]]']);
+			}
+			if ($this->getCustomCode($item['ids']))
+			{
+				$code = array();
+				foreach($this->customCode as $item)
+				{
+					$placeholder	= $this->getPlaceHolder(2, $item['id']);
+					$code['[CUSTOM'.'CODE='.$item['id'].']'] = $placeholder['start'] . PHP_EOL . str_replace(array_keys($this->placeholders),array_values($this->placeholders),$item['code']) . $placeholder['end'];
+				}
+				// now update the file
+				$string = JFile::read($path);
+				$answer = str_replace(array_keys($code),array_values($code),$string);
+				$this->writeFile($path,$answer);
+			}
+			else
+			{
+				$app->enqueueMessage(JText::sprintf('Custom code could not be added to <b>%s</b> <br />Since there where no publish code returned from the database.', $path), 'warning');
+			}
+		}
+	}
+	
 	protected function addCustomCode($app)
 	{
 		foreach($this->customCode as $nr => $target)
@@ -687,7 +783,7 @@ class Compiler extends Infusion
 					if ($found)
 					{
 						$placeholder	= $this->getPlaceHolder($target['type'], $target['id']);
-						$data		= $placeholder['start'] . "\n" . $target['code'] . $placeholder['end'];
+						$data		= $placeholder['start'] . PHP_EOL . $target['code'] . $placeholder['end'];
 						if ($target['type'] == 2)
 						{
 							// found it now add code from the next line
@@ -696,20 +792,20 @@ class Compiler extends Infusion
 						elseif ($target['type'] == 1 && $foundEnd)
 						{
 							// found it now add code from the next line
-							$this->addDataToFile($file, $data . "\n", $bites, (int) array_sum($replace));
+							$this->addDataToFile($file, $data . PHP_EOL, $bites, (int) array_sum($replace));
 						}
 						else
 						{
 							// Load escaped code since the target endhash has changed
 							$this->loadEscapedCode($file, $target, $lineBites);
-							$app->enqueueMessage(JText::sprintf('Custom code could not be added to <b>%s</b> please review the file at line %s. This could be due to a change to lines below the custom code.', $target['path'], $target['from_line']), 'warning');
+							$app->enqueueMessage(JText::sprintf('Custom code could not be added to <b>%s</b> please review the file at <b>line %s</b>. This could be due to a change to lines below the custom code.', $target['path'], $target['from_line']), 'warning');
 						}
 					}
 					else
 					{
 						// Load escaped code since the target hash has changed
 						$this->loadEscapedCode($file, $target, $lineBites);
-						$app->enqueueMessage(JText::sprintf('Custom code could not be added to <b>%s</b> please review the file at line %s. This could be due to a change to lines above the custom code.', $target['path'], $target['from_line']), 'warning');
+						$app->enqueueMessage(JText::sprintf('Custom code could not be added to <b>%s</b> please review the file at <b>line %s</b>. This could be due to a change to lines above the custom code.', $target['path'], $target['from_line']), 'warning');
 					}
 				}
 				else
@@ -724,12 +820,12 @@ class Compiler extends Infusion
 	protected function loadEscapedCode($file, $target, $lineBites)
 	{
 		// escape the code
-		$code = explode("\n", $target['code']);
+		$code = explode(PHP_EOL, $target['code']);
-		$code = "\n// " .implode("\n// ",$code). "\n";
+		$code = PHP_EOL."// " .implode(PHP_EOL."// ",$code). PHP_EOL;
 		// get place holders
 		$placeholder	= $this->getPlaceHolder($target['type'], $target['id']);
 		// build the data
-		$data		= $placeholder['start'] . $code . $placeholder['end']. "\n";
+		$data		= $placeholder['start'] . $code . $placeholder['end']. PHP_EOL;
 		// get the bites before insertion
 		$bitBucket	= array();
 		foreach($lineBites as $line => $value)

admin/helpers/compiler/a_Get.php

@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version			2.2.0
+	@version			2.3.0
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		compiler.php
@@ -95,6 +95,13 @@ class Get
 	 */
 	protected $newCustomCode = array();
 	
+	/**
+	 * The index of code already loaded
+	 * 
+	 * @var      array
+	 */
+	protected $codeAreadyDone = array();
+	
 	/**
 	 * The Language prefix
 	 * 
@@ -706,7 +713,7 @@ class Get
 		if ($component->add_php_helper_admin == 1)
 		{
 			$this->lang = 'admin';
-			$this->customScriptBuilder['component_php_helper_admin'] = "\n\n".$this->setCustomContentLang(base64_decode($component->php_helper_admin));
+			$this->customScriptBuilder['component_php_helper_admin'] = PHP_EOL.PHP_EOL.$this->setCustomContentLang(base64_decode($component->php_helper_admin));
 		}
 		else
 		{
@@ -728,7 +735,7 @@ class Get
 		if ($component->add_php_helper_both == 1)
 		{
 			$this->lang = 'both';
-			$this->customScriptBuilder['component_php_helper_both'] = "\n\n".$this->setCustomContentLang(base64_decode($component->php_helper_both));
+			$this->customScriptBuilder['component_php_helper_both'] = PHP_EOL.PHP_EOL.$this->setCustomContentLang(base64_decode($component->php_helper_both));
 		}
 		else
 		{
@@ -738,7 +745,7 @@ class Get
 		if ($component->add_php_helper_site == 1)
 		{
 			$this->lang = 'site';
-			$this->customScriptBuilder['component_php_helper_site'] = "\n\n".$this->setCustomContentLang(base64_decode($component->php_helper_site));
+			$this->customScriptBuilder['component_php_helper_site'] = PHP_EOL.PHP_EOL.$this->setCustomContentLang(base64_decode($component->php_helper_site));
 		}
 		else
 		{
@@ -1535,7 +1542,7 @@ class Get
 						$this->_fieldData[$id]->javascript_view_footer = $this->setCustomContentLang(base64_decode($this->_fieldData[$id]->javascript_view_footer));
 						$this->_fieldData[$id]->javascript_view_footer_decoded = true;
 					}
-					$this->customScriptBuilder['view_footer'][$name_single] .= "\n".$this->_fieldData[$id]->javascript_view_footer;
+					$this->customScriptBuilder['view_footer'][$name_single] .= PHP_EOL.$this->_fieldData[$id]->javascript_view_footer;
 					if (strpos($this->_fieldData[$id]->javascript_view_footer,"token") !== false && strpos($this->_fieldData[$id]->javascript_view_footer,"task=ajax") !== false)
 					{
 						if (!isset($this->customScriptBuilder['token'][$name_single]) || !$this->customScriptBuilder['token'][$name_single])
@@ -1565,7 +1572,7 @@ class Get
 						$this->_fieldData[$id]->css_view = base64_decode($this->_fieldData[$id]->css_view);
 						$this->_fieldData[$id]->css_view_decoded = true;
 					}
-					$this->customScriptBuilder['css_view'][$name_single] .= "\n".$this->_fieldData[$id]->css_view;
+					$this->customScriptBuilder['css_view'][$name_single] .= PHP_EOL.$this->_fieldData[$id]->css_view;
 				}
 
 				// add this only once to view.
@@ -1674,7 +1681,7 @@ class Get
 							{
 								$this->customScriptBuilder[$this->target.'_php_before_getitem'][$view_code] = '';
 							}
-							$this->customScriptBuilder[$this->target.'_php_before_getitem'][$view_code] .= "\n\n".base64_decode($result->php_before_getitem);
+							$this->customScriptBuilder[$this->target.'_php_before_getitem'][$view_code] .= PHP_EOL.PHP_EOL.base64_decode($result->php_before_getitem);
 							unset($result->php_before_getitem);
 						}
 						// add php custom scripting (php_after_getitem)
@@ -1684,7 +1691,7 @@ class Get
 							{
 								$this->customScriptBuilder[$this->target.'_php_after_getitem'][$view_code] = '';
 							}
-							$this->customScriptBuilder[$this->target.'_php_after_getitem'][$view_code] .= "\n\n".base64_decode($result->php_after_getitem);
+							$this->customScriptBuilder[$this->target.'_php_after_getitem'][$view_code] .= PHP_EOL.PHP_EOL.base64_decode($result->php_after_getitem);
 							unset($result->php_after_getitem);
 						}
 						// add php custom scripting (php_before_getitems)
@@ -1694,7 +1701,7 @@ class Get
 							{
 								$this->customScriptBuilder[$this->target.'_php_before_getitems'][$view_code] = '';
 							}
-							$this->customScriptBuilder[$this->target.'_php_before_getitems'][$view_code] .= "\n\n".base64_decode($result->php_before_getitems);
+							$this->customScriptBuilder[$this->target.'_php_before_getitems'][$view_code] .= PHP_EOL.PHP_EOL.base64_decode($result->php_before_getitems);
 							unset($result->php_before_getitems);
 						}
 						// add php custom scripting (php_after_getitems)
@@ -1704,7 +1711,7 @@ class Get
 							{
 								$this->customScriptBuilder[$this->target.'_php_after_getitems'][$view_code] = '';
 							}
-							$this->customScriptBuilder[$this->target.'_php_after_getitems'][$view_code] .= "\n\n".base64_decode($result->php_after_getitems);
+							$this->customScriptBuilder[$this->target.'_php_after_getitems'][$view_code] .= PHP_EOL.PHP_EOL.base64_decode($result->php_after_getitems);
 							unset($result->php_after_getitems);
 						}
 						// add php custom scripting (php_getlistquery)
@@ -1714,7 +1721,7 @@ class Get
 							{
 								$this->customScriptBuilder[$this->target.'_php_getlistquery'][$view_code] = '';
 							}
-							$this->customScriptBuilder[$this->target.'_php_getlistquery'][$view_code] .= "\n".base64_decode($result->php_getlistquery);
+							$this->customScriptBuilder[$this->target.'_php_getlistquery'][$view_code] .= PHP_EOL.base64_decode($result->php_getlistquery);
 							unset($result->php_getlistquery);
 						}
 						// set the getmethod code name
@@ -2256,7 +2263,7 @@ class Get
 				}
 				if (ComponentbuilderHelper::checkArray($gets) && ComponentbuilderHelper::checkArray($keys))
 				{
-					$querySelect = '$query->select($db->quoteName('."\n\t\t\t".'array('.implode(',',$gets).'),'."\n\t\t\t".'array('.implode(',',$keys).')));';
+					$querySelect = '$query->select($db->quoteName('.PHP_EOL."\t\t\t".'array('.implode(',',$gets).'),'.PHP_EOL."\t\t\t".'array('.implode(',',$keys).')));';
 					$queryFrom = '$db->quoteName('.$db->quote($table).', '.$db->quote($as).')';
 					// return the select query
 					return array('select' => $querySelect, 'from' => $queryFrom, 'name' => $queryName, 'table' => $table, 'type' => $type, 'select_gets' => $gets, 'select_keys' => $keys);
@@ -2390,9 +2397,9 @@ class Get
 				$data = $db->loadObjectList();
 				// start building the MySql dump
 				$dump = "--";
-				$dump .= "\n-- Dumping data for table `#__[[[component]]]_".$view."`";
+				$dump .= PHP_EOL."-- Dumping data for table `#__[[[component]]]_".$view."`";
-				$dump .= "\n--";
+				$dump .= PHP_EOL."--";
-				$dump .= "\n\nINSERT INTO `#__[[[component]]]_".$view."` (";
+				$dump .= PHP_EOL.PHP_EOL."INSERT INTO `#__[[[component]]]_".$view."` (";
 				foreach ($data as $line)
 				{
 					$comaSet = 0;
@@ -2416,11 +2423,11 @@ class Get
 				{
 					if ($coma == 0)
 					{
-						$dump .= "\n(";
+						$dump .= PHP_EOL."(";
 					}
 					else
 					{
-						$dump .= ",\n(";
+						$dump .= ",".PHP_EOL."(";
 					}
 					$comaSet = 0;
 					foreach($line as $fieldName => $fieldValue)
@@ -2596,17 +2603,27 @@ class Get
 	 * @return  void
 	 * 
 	 */
-	public function getCustomCode()
+	public function getCustomCode($ids = null)
 	{
 		// Get a db connection.
 		$db = JFactory::getDbo();
 		// Create a new query object.
 		$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('a.id','a.code','a.component','a.from_line','a.hashtarget','a.hashendtarget','a.path','a.to_line','a.type')));
 		$query->from($db->quoteName('#__componentbuilder_custom_code','a'));
+		if ($ids)
+		{
+			$query->select($db->quoteName(array('a.id','a.code')));
+			$query->where($db->quoteName('a.id') . ' IN (' . implode(',',$ids) . ')');
+			$query->where($db->quoteName('a.target') . ' = 2'); // <--- to load the correct target
+		}
+		else
+		{
+			$query->select($db->quoteName(array('a.id','a.code','a.component','a.from_line','a.hashtarget','a.hashendtarget','a.path','a.to_line','a.type')));
 			$query->where($db->quoteName('a.component') . ' = '. (int) $this->componentData->id);
-		$query->where($db->quoteName('a.published') . ' >= 1');
+			$query->where($db->quoteName('a.target') . ' = 1'); // <--- to load the correct target
 			$query->order($db->quoteName('a.from_line') . ' ASC'); // <--- insrue we always add code from top of file
+		}
+		$query->where($db->quoteName('a.published') . ' >= 1');
 		$db->setQuery($query);
 		$db->execute();
 		if ($db->getNumRows())
@@ -2616,6 +2633,8 @@ class Get
 			foreach($this->customCode as $nr => &$customCode)
 			{
 				$customCode['code'] = base64_decode($customCode['code']);
+				if (isset($customCode['hashtarget']))
+				{
 					$customCode['hashtarget'] = explode("__", $customCode['hashtarget']);
 					if ($customCode['type'] == 1 && strpos($customCode['hashendtarget'], '__') !== false)
 					{
@@ -2623,6 +2642,8 @@ class Get
 					}
 				}
 			}
+			return true;
+		}
 		return false;
 	}
 	
@@ -2642,13 +2663,21 @@ class Get
 			// Create a new query object.
 			$query = $db->getQuery(true);
 			// Insert columns.
-			$columns = array('path','type','component','published','created','created_by','version','access','hashtarget','from_line','to_line','code','hashendtarget');
+			$columns = array('path','type','target','component','published','created','created_by','version','access','hashtarget','from_line','to_line','code','hashendtarget');
 			// Prepare the insert query.
 			$query->insert($db->quoteName('#__componentbuilder_custom_code'));
 			$query->columns($db->quoteName($columns));
-			foreach($this->newCustomCode as $values){
+			foreach($this->newCustomCode as $values)
+			{
+				if (count($values) == 14)
+				{
 					$query->values(implode(',', $values));
 				}
+				else
+				{
+					// TODO line mismatch... should not happen
+				}
+			}
 			// clear the values array
 			$this->newCustomCode = array();
 			// Set the query using our newly populated query object and execute it.
@@ -2759,7 +2788,17 @@ class Get
 		$pointer		= array();
 		$reading		= array();
 		$reader			= 0;
-		$path			= $target . '/' . str_replace('./', '', $file);
+		// make sure we have the path correct (the script file is not in admin path for example)
+		// there may be more... will nead to keep our eye on this... since files could be moved during install
+		$file = str_replace('./', '', $file);
+		if ($file !== 'script.php')
+		{
+			$path		= $target . '/' . $file;
+		}
+		else
+		{
+			$path		= $file;
+		}
 		foreach (new SplFileObject($file) as $lineNumber => $lineContent)
 		{
 			// we musk keep last few lines to dynamic find target entry later
@@ -2771,8 +2810,8 @@ class Get
 			}
 			foreach ($placeholders as $type => $placeholder)
 			{
-				$i	= (int) ($type === 3 ||$type === 4) ? 2 : 1;
+				$i	= (int) ($type == 3 ||$type == 4) ? 2 : 1;
-				$_type	= (int) ($type === 1 || $type === 3) ? 1 : 2;
+				$_type	= (int) ($type == 1 || $type == 3) ? 1 : 2;
 				if ($reader === 0 || $reader === $i)
 				{
 					$targetKey	= $type;
@@ -2793,6 +2832,7 @@ class Get
 							// activate fingerPrint for replacement end target
 							$loadEndFingerPrint	= true;
 							$backupTargetKey	= $targetKey;
+							$backupI		= $i;
 						}
 						// all new records we can do a bulk insert
 						if ($i === 1)
@@ -2826,12 +2866,12 @@ class Get
 						if ($i === 1)
 						{
 							// load the last value
-							$this->newCustomCode[$pointer[$backupTargetKey]][]	= $db->quote($hashendtarget); // 'hashendtarget'
+							$this->newCustomCode[$pointer[$targetKey]][]	= $db->quote($hashendtarget); // 'hashendtarget'
 						}
 						// the record already exist so we must use module to update
 						elseif ($i === 2)
 						{
-							$this->existingCustomCode[$pointer[$backupTargetKey]]['fields'][] = $db->quoteName('hashendtarget') . ' = ' . $db->quote($hashendtarget);
+							$this->existingCustomCode[$pointer[$targetKey]]['fields'][] = $db->quoteName('hashendtarget') . ' = ' . $db->quote($hashendtarget);
 						}
 						// reset the needed values
 						$endFingerPrint		= array();
@@ -2847,6 +2887,20 @@ class Get
 					// check if the starting place holder was found
 					if((!isset($reading[$targetKey]) || !$reading[$targetKey]) && (($i === 1 && trim($lineContent) === $start) || strpos($lineContent, $start) !== false))
 					{
+						if ($i === 2)
+						{
+							$id = $this->getSystemID($lineContent, $start);
+						}
+						if ($i === 2 && $id > 0)
+						{
+							// make sure we update it only once even if found again.
+							if (isset($this->codeAreadyDone[$id]))
+							{
+								continue;
+							}
+							// store the id to avoid duplication
+							$this->codeAreadyDone[$id] = (int) $id;
+						}
 						// set active reader (to lock out other search)
 						$reader				= $i;
 						// set pointer
@@ -2863,10 +2917,6 @@ class Get
 						$hashtarget	= $hasleng.'__'.md5(implode('',$hasharray));
 						// do a quick check to insure we have an id
 						$id = false;
-						if ($i === 2)
-						{
-							$id = $this->getSystemID($lineContent, $start);
-						}
 						// all new records we can do a buldk insert
 						if ($i === 1 || !$id)
 						{
@@ -2874,6 +2924,7 @@ class Get
 							$this->newCustomCode[$pointer[$targetKey]]	= array();
 							$this->newCustomCode[$pointer[$targetKey]][]	= $db->quote($path);						// 'path'
 							$this->newCustomCode[$pointer[$targetKey]][]	= $db->quote((int) $_type);					// 'type'
+							$this->newCustomCode[$pointer[$targetKey]][]	= $db->quote(1);						// 'target'
 							$this->newCustomCode[$pointer[$targetKey]][]	= $db->quote((int) $this->componentData->id);			// 'component'
 							$this->newCustomCode[$pointer[$targetKey]][]	= $db->quote(1);						// 'published'
 							$this->newCustomCode[$pointer[$targetKey]][]	= $db->quote($today);						// 'created'
@@ -2900,6 +2951,13 @@ class Get
 							$this->existingCustomCode[$pointer[$targetKey]]['fields'][]	= $db->quoteName('modified_by') . ' = ' . $db->quote($userId);
 							$this->existingCustomCode[$pointer[$targetKey]]['fields'][]	= $db->quoteName('hashtarget') . ' = ' . $db->quote($hashtarget);
 						}
+						else // this should actualy never happen
+						{
+							// de activate the reader
+							$reading[$targetKey]			= false;
+							$reader					= 0;
+							
+						}
 						// update the counter
 						$counter[$i]++;
 					}
@@ -2924,13 +2982,13 @@ class Get
 				$hashendtarget = 0;
 			}
 			// all new records we can do a buldk insert
-			if ($i === 1)
+			if ($backupI === 1)
 			{
 				// load the last value
 				$this->newCustomCode[$pointer[$backupTargetKey]][]	= $db->quote($hashendtarget); // 'hashendtarget'
 			}
 			// the record already exist so we must use module to update
-			elseif ($i === 2)
+			elseif ($backupI === 2)
 			{
 				$this->existingCustomCode[$pointer[$backupTargetKey]]['fields'][] = $db->quoteName('hashendtarget') . ' = ' . $db->quote($hashendtarget);
 			}
@@ -2970,7 +3028,7 @@ class Get
 	 * @return  array    on success
 	 * 
 	 */
-	public function getPlaceHolder(&$type, &$id)
+	public function getPlaceHolder($type, &$id)
 	{
 		switch ($type)
 		{
@@ -2985,8 +3043,8 @@ class Get
 				else
 				{
 					return array(
-						'start' => "\t\t//////////////////////////////////////////", 
+						'start' => "/*////////////////////////////////////////*/", 
-						'end' => "\t\t//////////////////////////////////////////");
+						'end' => "/*////////////////////////////////////////*/");
 				}
 				break;
 			case 2:
@@ -3000,8 +3058,8 @@ class Get
 				else
 				{
 					return array(
-						'start' => "\t\t//////////////////////////////////////////", 
+						'start' => "/*////////////////////////////////////////*/", 
-						'end' => "\t\t//////////////////////////////////////////");
+						'end' => "/*////////////////////////////////////////*/");
 				}
 				break;
 		}

admin/helpers/compiler/b_Structure.php

@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version			2.2.0
+	@version			2.3.0
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		compiler.php
@@ -513,14 +513,14 @@ class Structure extends Get
 				{
 					// set list view$view
 					$target = array('custom_admin' => $view['settings']->code);
-					$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => JFactory::getDate($view['settings']->modified)->format('jS F, Y'),'###VERSION###' => $view['settings']->version);
+					$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version);
 					$this->buildDynamique($target,'list', false, $config);
 				}
 				elseif ($view['settings']->main_get->gettype == 1)
 				{
 					// set single view
 					$target = array('custom_admin' => $view['settings']->code);
-					$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => JFactory::getDate($view['settings']->modified)->format('jS F, Y'),'###VERSION###' => $view['settings']->version);
+					$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version);
 					$this->buildDynamique($target, 'single', false, $config);
 				}
 			}
@@ -811,7 +811,7 @@ class Structure extends Get
 				}
 				if (count($pathArray) == 1 && $firstFolder === 'media')
 				{
-					$this->fileContentStatic['###EXSTRA_MEDIA_FOLDERS###'] .= "\n\t\t<folder>".$lastFolder."</folder>";
+					$this->fileContentStatic['###EXSTRA_MEDIA_FOLDERS###'] .= PHP_EOL."\t\t<folder>".$lastFolder."</folder>";
 				}
 				// check if we sould add it to the site xml list
 				if (!isset($this->fileContentStatic['###EXSTRA_SITE_FOLDERS###']))
@@ -820,7 +820,7 @@ class Structure extends Get
 				}
 				if (count($pathArray) == 1 && $firstFolder === 'site')
 				{
-					$this->fileContentStatic['###EXSTRA_SITE_FOLDERS###'] .= "\n\t\t<folder>".$lastFolder."</folder>";
+					$this->fileContentStatic['###EXSTRA_SITE_FOLDERS###'] .= PHP_EOL."\t\t<folder>".$lastFolder."</folder>";
 				}
 				// check if we sould add it to the admin xml list
 				if (!isset($this->fileContentStatic['###EXSTRA_ADMIN_FOLDERS###']))
@@ -829,7 +829,7 @@ class Structure extends Get
 				}
 				if (count($pathArray) == 1 && $firstFolder === 'admin')
 				{
-					$this->fileContentStatic['###EXSTRA_ADMIN_FOLDERS###'] .= "\n\t\t\t<folder>".$lastFolder."</folder>";
+					$this->fileContentStatic['###EXSTRA_ADMIN_FOLDERS###'] .= PHP_EOL."\t\t\t<folder>".$lastFolder."</folder>";
 				}
 				// make we have not duplicates
 				$key_pointer = ComponentbuilderHelper::safeString($custom['folder']).'_f'.$pointer_tracker;

admin/helpers/compiler/c_Fields.php

@@ -11,7 +11,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version			2.2.0
+	@version			2.3.0
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		compiler.php
@@ -382,7 +382,7 @@ class Fields extends Structure
 			$readOnly = "";
 			if ($view['settings']->type == 2)
 			{
-				$readOnly = "\t\t\t" . 'readonly="true"' . "\n\t\t\t" . 'disabled="true"';
+				$readOnly = "\t\t\t" . 'readonly="true"' . PHP_EOL."\t\t\t" . 'disabled="true"';
 			}
 			// main lang prefix
 			$langView = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($view['settings']->name_single, 'U');
@@ -601,7 +601,7 @@ class Fields extends Structure
 			// check if metadata is added to this view
 			if (isset($this->metadataBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$viewName]))
 			{
-				$fieldSet[] = "\n\t<!--" . $this->setLine(__LINE__) . " Metadata Fields. -->";
+				$fieldSet[] = PHP_EOL."\t<!--" . $this->setLine(__LINE__) . " Metadata Fields. -->";
 				$fieldSet[] = "\t<fields" . ' name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">';
 				$fieldSet[] = "\t\t" . '<fieldset name="vdmmetadata"';
 				$fieldSet[] = "\t\t\t" . 'label="JGLOBAL_FIELDSET_METADATA_OPTIONS">';
@@ -634,7 +634,7 @@ class Fields extends Structure
 				$fieldSet[] = "\t</fields>";
 			}
 			// retunr the set
-			return implode("\n", $fieldSet);
+			return implode(PHP_EOL, $fieldSet);
 		}
 		return '';
 	}
@@ -797,14 +797,14 @@ class Fields extends Structure
 		if ($setType === 'option')
 		{
 			// now add to the field set
-			$fieldSet .= "\n\t" . $taber . "\t<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
+			$fieldSet .= PHP_EOL."\t" . $taber . "\t<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
-			$fieldSet .= "\n\t" . $taber . "\t<field";
+			$fieldSet .= PHP_EOL."\t" . $taber . "\t<field";
 			$optionSet = '';
 			foreach ($fieldAttributes as $property => $value)
 			{
 				if ($property != 'option')
 				{
-					$fieldSet .= "\n\t\t" . $taber . "\t" . $property . '="' . $value . '"';
+					$fieldSet .= PHP_EOL."\t\t" . $taber . "\t" . $property . '="' . $value . '"';
 				}
 				elseif ($property === 'option')
 				{
@@ -823,7 +823,7 @@ class Fields extends Structure
 								// add to lang array
 								$this->langContent[$this->lang][$langValue] = $t;
 								// no add to option set
-								$optionSet .= "\n\t" . $taber . "\t\t" . '<option value="' . $v . '">' . "\n\t" . $taber . "\t\t\t" . $langValue . '</option>';
+								$optionSet .= PHP_EOL."\t" . $taber . "\t\t" . '<option value="' . $v . '">' . PHP_EOL."\t" . $taber . "\t\t\t" . $langValue . '</option>';
 								$optionArray[$v] = $langValue;
 							}
 							else
@@ -833,7 +833,7 @@ class Fields extends Structure
 								// add to lang array
 								$this->langContent[$this->lang][$langValue] = $option;
 								// no add to option set
-								$optionSet .= "\n\t\t" . $taber . "\t" . '<option value="' . $option . '">' . "\n\t\t" . $taber . "\t\t" . $langValue . '</option>';
+								$optionSet .= PHP_EOL."\t\t" . $taber . "\t" . '<option value="' . $option . '">' . PHP_EOL."\t\t" . $taber . "\t\t" . $langValue . '</option>';
 								$optionArray[$option] = $langValue;
 							}
 						}
@@ -849,7 +849,7 @@ class Fields extends Structure
 							// add to lang array
 							$this->langContent[$this->lang][$langValue] = $t;
 							// no add to option set
-							$optionSet .= "\n\t\t" . $taber . "\t" . '<option value="' . $v . '">' . "\n\t\t" . $taber . "\t\t" . $langValue . '</option>';
+							$optionSet .= PHP_EOL."\t\t" . $taber . "\t" . '<option value="' . $v . '">' . PHP_EOL."\t\t" . $taber . "\t\t" . $langValue . '</option>';
 							$optionArray[$v] = $langValue;
 						}
 						else
@@ -859,7 +859,7 @@ class Fields extends Structure
 							// add to lang array
 							$this->langContent[$this->lang][$langValue] = $value;
 							// no add to option set
-							$optionSet .= "\n\t\t" . $taber . "\t" . '<option value="' . $value . '">' . "\n\t\t" . $taber . "\t\t" . $langValue . '</option>';
+							$optionSet .= PHP_EOL."\t\t" . $taber . "\t" . '<option value="' . $value . '">' . PHP_EOL."\t\t" . $taber . "\t\t" . $langValue . '</option>';
 							$optionArray[$value] = $langValue;
 						}
 					}
@@ -868,41 +868,41 @@ class Fields extends Structure
 			if (ComponentbuilderHelper::checkString($optionSet))
 			{
 				$fieldSet .= '>';
-				$fieldSet .= "\n\t\t\t" . $taber . "<!--" . $this->setLine(__LINE__) . " Option Set. -->";
+				$fieldSet .= PHP_EOL."\t\t\t" . $taber . "<!--" . $this->setLine(__LINE__) . " Option Set. -->";
 				$fieldSet .= $optionSet;
-				$fieldSet .= "\n\t\t" . $taber . "</field>";
+				$fieldSet .= PHP_EOL."\t\t" . $taber . "</field>";
 			}
 			elseif ($typeName === 'sql')
 			{
 				$optionArray = false;
-				$fieldSet .= "\n\t\t" . $taber . "/>";
+				$fieldSet .= PHP_EOL."\t\t" . $taber . "/>";
 			}
 			else
 			{
 				$optionArray = false;
-				$fieldSet .= "\n\t\t\t" . $taber . "<!--" . $this->setLine(__LINE__) . " No Manual Options Were Added In Field Settings. -->";
+				$fieldSet .= PHP_EOL."\t\t\t" . $taber . "<!--" . $this->setLine(__LINE__) . " No Manual Options Were Added In Field Settings. -->";
-				$fieldSet .= "\n\t\t" . $taber . "/>";
+				$fieldSet .= PHP_EOL."\t\t" . $taber . "/>";
 			}
 		}
 		elseif ($setType === 'plain')
 		{
 			// now add to the field set
-			$fieldSet .= "\n\t\t" . $taber . "<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
+			$fieldSet .= PHP_EOL."\t\t" . $taber . "<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
-			$fieldSet .= "\n\t\t" . $taber . "<field";
+			$fieldSet .= PHP_EOL."\t\t" . $taber . "<field";
 			foreach ($fieldAttributes as $property => $value)
 			{
 				if ($property != 'option')
 				{
-					$fieldSet .= "\n\t\t" . $taber . "\t" . $property . '="' . $value . '"';
+					$fieldSet .= PHP_EOL."\t\t" . $taber . "\t" . $property . '="' . $value . '"';
 				}
 			}
-			$fieldSet .= "\n\t\t" . $taber . "/>";
+			$fieldSet .= PHP_EOL."\t\t" . $taber . "/>";
 		}
 		elseif ($setType === 'spacer')
 		{
 			// now add to the field set
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". A None Database Field. (joomla) -->";
+			$fieldSet .= PHP_EOL."\t\t<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". A None Database Field. (joomla) -->";
-			$fieldSet .= "\n\t\t<field";
+			$fieldSet .= PHP_EOL."\t\t<field";
 			foreach ($fieldAttributes as $property => $value)
 			{
 				if ($property != 'option')
@@ -918,19 +918,19 @@ class Fields extends Structure
 			if ($typeName === 'repeatable')
 			{
 				// now add to the field set
-				$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
+				$fieldSet .= PHP_EOL."\t\t<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
-				$fieldSet .= "\n\t\t<field";
+				$fieldSet .= PHP_EOL."\t\t<field";
 				$fieldsSet = array();
 				foreach ($fieldAttributes as $property => $value)
 				{
 					if ($property != 'fields')
 					{
-						$fieldSet .= "\n\t\t\t" . $property . '="' . $value . '"';
+						$fieldSet .= PHP_EOL."\t\t\t" . $property . '="' . $value . '"';
 					}
 				}
 				$fieldSet .= ">";
-				$fieldSet .= "\n\t\t\t" . '<fields name="' . $fieldAttributes['name'] . '_fields" label="">';
+				$fieldSet .= PHP_EOL."\t\t\t" . '<fields name="' . $fieldAttributes['name'] . '_fields" label="">';
-				$fieldSet .= "\n\t\t\t\t" . '<fieldset hidden="true" name="' . $fieldAttributes['name'] . '_modal" repeat="true">';
+				$fieldSet .= PHP_EOL."\t\t\t\t" . '<fieldset hidden="true" name="' . $fieldAttributes['name'] . '_modal" repeat="true">';
 				if (strpos($fieldAttributes['fields'], ',') !== false)
 				{
 					// mulitpal fields
@@ -999,24 +999,24 @@ class Fields extends Structure
 						}
 					}
 				}
-				$fieldSet .= "\n\t\t\t\t</fieldset>";
+				$fieldSet .= PHP_EOL."\t\t\t\t</fieldset>";
-				$fieldSet .= "\n\t\t\t</fields>";
+				$fieldSet .= PHP_EOL."\t\t\t</fields>";
-				$fieldSet .= "\n\t\t</field>";
+				$fieldSet .= PHP_EOL."\t\t</field>";
 			}
 		}
 		elseif ($setType === 'custom')
 		{
 			// now add to the field set
-			$fieldSet .= "\n\t\t" . $taber . "<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (custom) -->";
+			$fieldSet .= PHP_EOL."\t\t" . $taber . "<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (custom) -->";
-			$fieldSet .= "\n\t\t" . $taber . "<field";
+			$fieldSet .= PHP_EOL."\t\t" . $taber . "<field";
 			foreach ($fieldAttributes as $property => $value)
 			{
 				if ($property != 'option')
 				{
-					$fieldSet .= "\n\t\t" . $taber . "\t" . $property . '="' . $value . '"';
+					$fieldSet .= PHP_EOL."\t\t" . $taber . "\t" . $property . '="' . $value . '"';
 				}
 			}
-			$fieldSet .= "\n\t\t" . $taber . "/>";
+			$fieldSet .= PHP_EOL."\t\t" . $taber . "/>";
 			// incase the field is in the config and has not been set
 			if ('config' === $viewName && 'configs' === $listViewName)
 			{
@@ -1791,7 +1791,7 @@ class Fields extends Structure
 			// set tab and break replacements
 			$tabBreak = array(
 				'\t' => "\t",
-				'\n' => "\n"
+				'\n' => PHP_EOL
 			);
 			// make field dynamic
 			$replace = array(
@@ -1822,7 +1822,7 @@ class Fields extends Structure
 						}
 						else
 						{
-							$phpCode .= "\n\t\t".str_replace(array_keys($tabBreak),array_values($tabBreak),$code);
+							$phpCode .= PHP_EOL."\t\t".str_replace(array_keys($tabBreak),array_values($tabBreak),$code);
 						}
 					}
 				}
@@ -1855,7 +1855,7 @@ class Fields extends Structure
 							}
 							else
 							{
-								$phpxCode .= "\n\t\t".str_replace(array_keys($tabBreak),array_values($tabBreak),$code);
+								$phpxCode .= PHP_EOL."\t\t".str_replace(array_keys($tabBreak),array_values($tabBreak),$code);
 							}
 						}
 					}

admin/helpers/compiler/f_Infusion.php

@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version			2.2.0
+	@version			2.3.0
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		compiler.php
@@ -173,22 +173,22 @@ class Infusion extends Interpretation
 			if ($this->componentData->add_admin_event == 1)
 			{
 				// ###ADMIN_GLOBAL_EVENT###
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT###'] = "\n\n".'// Triger the Global Admin Event';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT###'] = PHP_EOL.PHP_EOL.'// Triger the Global Admin Event';
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT###'] .= "\n".$this->fileContentStatic['###Component###'].'Helper::globalEvent($document);';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT###'] .= PHP_EOL.$this->fileContentStatic['###Component###'].'Helper::globalEvent($document);';
 				// ###ADMIN_GLOBAL_EVENT_HELPER###
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] = "\n\n\t".'/**';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] = PHP_EOL.PHP_EOL."\t".'/**';
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= "\n\t".'*	The Global Admin Event Method.';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'*	The Global Admin Event Method.';
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= "\n\t".'**/';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'**/';
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= "\n\t".'public static function globalEvent($document)';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'public static function globalEvent($document)';
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= "\n\t".'{';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'{';
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_php_admin_event']);
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_php_admin_event']);
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= "\n\t".'}';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'}';
 			}
 			
 			// now load the readme file if needed
 			if ($this->componentData->addreadme == 1)
 			{
-				$this->fileContentStatic['###EXSTRA_ADMIN_FILES###'] .= "\n\t\t\t<filename>README.txt</filename>";
+				$this->fileContentStatic['###EXSTRA_ADMIN_FILES###'] .= PHP_EOL."\t\t\t<filename>README.txt</filename>";
 			}
 			
 			// ###HELPER_CREATEUSER###
@@ -254,6 +254,9 @@ class Infusion extends Interpretation
                                         $this->placeholders['###view###'] = $viewName_single;
                                         $this->placeholders['###VIEW###'] = $viewName_u;
                                         $this->placeholders['###View###'] = $viewName_f;
+                                        $this->placeholders['[[[view]]]'] = $viewName_single;
+                                        $this->placeholders['[[[VIEW]]]'] = $viewName_u;
+                                        $this->placeholders['[[[View]]]'] = $viewName_f;
 
                                         // set license per view if needed
                                         $this->setLockLicensePer($viewName_single, $this->target);
@@ -287,7 +290,7 @@ class Infusion extends Interpretation
                                         {
                                                 // ###DOCUMENT_CUSTOM_PHP### <<<DYNAMIC>>>
                                                 $this->fileContentDynamic[$viewName_single]['###DOCUMENT_CUSTOM_PHP###'] 
-                                                        = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_document'][$viewName_single]);
+                                                        = PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_document'][$viewName_single]);
                                                 // clear some memory
                                                 unset($this->customScriptBuilder['php_document'][$viewName_single]);
                                         }
@@ -324,16 +327,16 @@ class Infusion extends Interpretation
                                         $this->fileContentDynamic[$viewName_single]['###LINKEDVIEWMETHODS###'] = '';
 
                                         // ###JMODELADMIN_BEFORE_DELETE### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_DELETE###'] = $this->getCustomScriptBuilder('php_before_delete', $viewName_single, "\n");
+                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_DELETE###'] = $this->getCustomScriptBuilder('php_before_delete', $viewName_single, PHP_EOL);
 
                                         // ###JMODELADMIN_AFTER_DELETE### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_DELETE###'] = $this->getCustomScriptBuilder('php_after_delete', $viewName_single, "\n\n");
+                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_DELETE###'] = $this->getCustomScriptBuilder('php_after_delete', $viewName_single, PHP_EOL.PHP_EOL);
 
                                         // ###JMODELADMIN_BEFORE_DELETE### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_PUBLISH###'] = $this->getCustomScriptBuilder('php_before_publish', $viewName_single, "\n");
+                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_PUBLISH###'] = $this->getCustomScriptBuilder('php_before_publish', $viewName_single, PHP_EOL);
 
                                         // ###JMODELADMIN_AFTER_DELETE### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_PUBLISH###'] = $this->getCustomScriptBuilder('php_after_publish', $viewName_single, "\n\n");
+                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_PUBLISH###'] = $this->getCustomScriptBuilder('php_after_publish', $viewName_single, PHP_EOL.PHP_EOL);
 
                                         // ###CHECKBOX_SAVE### <<<DYNAMIC>>>
                                         $this->fileContentDynamic[$viewName_single]['###CHECKBOX_SAVE###'] = $this->setCheckboxSave($viewName_single);
@@ -342,7 +345,7 @@ class Infusion extends Interpretation
                                         $this->fileContentDynamic[$viewName_single]['###METHOD_ITEM_SAVE###'] = $this->setMethodItemSave($viewName_single);
 
                                         // ###POSTSAVEHOOK### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###POSTSAVEHOOK###'] = $this->getCustomScriptBuilder('php_postsavehook', $viewName_single, "\n", null, true, "\n\t\treturn;", "\n\n\t\treturn;");
+                                        $this->fileContentDynamic[$viewName_single]['###POSTSAVEHOOK###'] = $this->getCustomScriptBuilder('php_postsavehook', $viewName_single, PHP_EOL, null, true, PHP_EOL."\t\treturn;", PHP_EOL.PHP_EOL."\t\treturn;");
 
                                         if (isset($this->customScriptBuilder['css_view'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['css_view'][$viewName_single]))
                                         {
@@ -387,6 +390,9 @@ class Infusion extends Interpretation
                                         $this->placeholders['###views###'] = $viewName_list;
                                         $this->placeholders['###VIEWS###'] = $viewsName_u;
                                         $this->placeholders['###Views###'] = $viewsName_f;
+                                        $this->placeholders['[[[views]]]'] = $viewName_list;
+                                        $this->placeholders['[[[VIEWS]]]'] = $viewsName_u;
+                                        $this->placeholders['[[[Views]]]'] = $viewsName_f;
 
                                         // set the export/import option
                                         if ($view['port'])
@@ -424,7 +430,7 @@ class Infusion extends Interpretation
                                         $this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_STRING_FIX###'] = $this->setGetItemsMethodStringFix($viewName_single,$this->fileContentStatic['###Component###']);
 
                                         // ###GET_ITEMS_METHOD_AFTER_ALL### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_AFTER_ALL###'] = $this->getCustomScriptBuilder('php_getitems_after_all', $viewName_single, "\n");
+                                        $this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_AFTER_ALL###'] = $this->getCustomScriptBuilder('php_getitems_after_all', $viewName_single, PHP_EOL);
 
                                         // ###SELECTIONTRANSLATIONFIX### <<<DYNAMIC>>>
                                         $this->fileContentDynamic[$viewName_list]['###SELECTIONTRANSLATIONFIX###'] = $this->setSelectionTranslationFix($viewName_list,$this->fileContentStatic['###Component###']);
@@ -554,7 +560,7 @@ class Infusion extends Interpretation
                                 if ($view['edit_create_site_view'])
                                 {
                                         // add needed router stuff for front edit views
-                                        $this->fileContentStatic['###ROUTER_PARSE_SWITCH###'] .= $this->routerParseSwitch($viewName_single);
+                                        $this->fileContentStatic['###ROUTER_PARSE_SWITCH###'] .= $this->routerParseSwitch($viewName_single, null, false);
                                         $this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] .= $this->routerBuildViews($viewName_single);
                                 }
 
@@ -661,7 +667,7 @@ class Infusion extends Interpretation
                                                 {
                                                         // ###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY### <<<DYNAMIC>>>
                                                         $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY###']
-                                                                = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]);
+                                                                = PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]);
                                                         // clear some memory
                                                         unset($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]);
                                                 }
@@ -676,7 +682,7 @@ class Infusion extends Interpretation
                                                 {
                                                         // ###CUSTOM_ADMIN_BEFORE_GET_ITEMS### <<<DYNAMIC>>>
                                                         $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEMS###']
-                                                                = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]);
+                                                                = PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]);
                                                         // clear some memory
                                                         unset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]);
                                                 }
@@ -694,7 +700,7 @@ class Infusion extends Interpretation
                                                 {
                                                         // ###CUSTOM_ADMIN_AFTER_GET_ITEMS### <<<DYNAMIC>>>
                                                         $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEMS###']
-                                                                = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]);
+                                                                = PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]);
                                                         // clear some memory
                                                         unset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]);
                                                 }
@@ -730,10 +736,10 @@ class Infusion extends Interpretation
                         }
 
                         // ###VIEWARRAY###
-                        $this->fileContentStatic['###VIEWARRAY###'] = "\n".implode(",\n",$viewarray);
+                        $this->fileContentStatic['###VIEWARRAY###'] = PHP_EOL.implode(",".PHP_EOL,$viewarray);
 
                         // ###CUSTOM_ADMIN_EDIT_VIEW_ARRAY###
-                        $this->fileContentStatic['###SITE_EDIT_VIEW_ARRAY###'] = "\n".implode(",\n",$site_edit_view_array);
+                        $this->fileContentStatic['###SITE_EDIT_VIEW_ARRAY###'] = PHP_EOL.implode(",".PHP_EOL,$site_edit_view_array);
 
                         // ###MAINMENUS###
                         $this->fileContentStatic['###MAINMENUS###'] = $this->setMainMenus();
@@ -930,7 +936,7 @@ class Infusion extends Interpretation
 						{
 							// ###SITE_BEFORE_GET_ITEMS### <<<DYNAMIC>>>
 							$this->fileContentDynamic[$view['settings']->code]['###SITE_BEFORE_GET_ITEMS###']
-								= "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]);
+								= PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]);
 							// clear some memory
 							unset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]);
 						}
@@ -948,7 +954,7 @@ class Infusion extends Interpretation
 						{
 							// ###SITE_AFTER_GET_ITEMS### <<<DYNAMIC>>>
 							$this->fileContentDynamic[$view['settings']->code]['###SITE_AFTER_GET_ITEMS###']
-								= "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]);
+								= PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]);
 							// clear some memory
 							unset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]);
 						}
@@ -994,16 +1000,16 @@ class Infusion extends Interpretation
 				// now load the data for the global event if needed
 				if ($this->componentData->add_site_event == 1)
 				{
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT###'] = "\n\n".'// Triger the Global Site Event';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT###'] = PHP_EOL.PHP_EOL.'// Triger the Global Site Event';
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT###'] .= "\n".$this->fileContentStatic['###Component###'].'Helper::globalEvent($document);';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT###'] .= PHP_EOL.$this->fileContentStatic['###Component###'].'Helper::globalEvent($document);';
 					// ###SITE_GLOBAL_EVENT_HELPER###
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] = "\n\n\t".'/**';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] = PHP_EOL.PHP_EOL."\t".'/**';
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= "\n\t".'*	The Global Site Event Method.';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'*	The Global Site Event Method.';
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= "\n\t".'**/';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'**/';
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= "\n\t".'public static function globalEvent($document)';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'public static function globalEvent($document)';
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= "\n\t".'{';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'{';
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_php_site_event']);
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_php_site_event']);
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= "\n\t".'}';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'}';
 				}
 				// setup the layouts
 				$this->setCustomViewLayouts();
@@ -1027,10 +1033,10 @@ class Infusion extends Interpretation
 			$this->fileContentStatic['###LANG_SITE_SYS###'] = $this->setLangSiteSys();
 
 			// ###PREINSTALLSCRIPT###
-			$this->fileContentStatic['###PREINSTALLSCRIPT###'] = $this->getCustomScriptBuilder('php_preflight', 'install', "\n", null, true);
+			$this->fileContentStatic['###PREINSTALLSCRIPT###'] = $this->getCustomScriptBuilder('php_preflight', 'install', PHP_EOL, null, true);
 
 			// ###PREUPDATESCRIPT###
-			$this->fileContentStatic['###PREUPDATESCRIPT###'] = $this->getCustomScriptBuilder('php_preflight', 'update', "\n", null, true);
+			$this->fileContentStatic['###PREUPDATESCRIPT###'] = $this->getCustomScriptBuilder('php_preflight', 'update', PHP_EOL, null, true);
 
 			// ###POSTINSTALLSCRIPT###
 			$this->fileContentStatic['###POSTINSTALLSCRIPT###'] = $this->setPostInstallScript();
@@ -1045,7 +1051,7 @@ class Infusion extends Interpretation
 			$this->fileContentStatic['###HELPER_UIKIT###'] = $this->setUikitHelperMethods();
 			
 			// ###CONFIG_FIELDSETS###
-			$this->fileContentStatic['###CONFIG_FIELDSETS###'] = implode("\n",$this->configFieldSets);
+			$this->fileContentStatic['###CONFIG_FIELDSETS###'] = implode(PHP_EOL,$this->configFieldSets);
 			
 			// check if this has been set
 			if (!isset($this->fileContentStatic['###ROUTER_BUILD_VIEWS###']) || !ComponentbuilderHelper::checkString($this->fileContentStatic['###ROUTER_BUILD_VIEWS###']))

admin/helpers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/helpers/headercheck.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		headercheck.php

admin/helpers/html/batch_.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batch_.php

admin/helpers/indenter.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		indenter.php

admin/helpers/js.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		js.php

admin/helpers/minify.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		minify.php

admin/language/en-GB/en-GB.com_componentbuilder.ini

@@ -1928,13 +1928,18 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET="Hashtarget"
 COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_DESCRIPTION="The start hash target to help insert the code at the correct place, if the line position change. This hash is the md5 of a few lines above the custom code"
 COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_HINT="autogenerated md5 hash"
 COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_LABEL="Start Hash Target"
+COM_COMPONENTBUILDER_CUSTOM_CODE_HASH_AUTOMATION="Hash (automation)"
 COM_COMPONENTBUILDER_CUSTOM_CODE_ID="Id"
 COM_COMPONENTBUILDER_CUSTOM_CODE_INSERTION="Insertion"
+COM_COMPONENTBUILDER_CUSTOM_CODE_JCB_MANUAL="JCB (manual)"
 COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_BY_DESC="The last user that modified this Custom Code."
 COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_BY_LABEL="Modified By"
 COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_DATE_DESC="The date this Custom Code was modified."
 COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_CUSTOM_CODE_NEW="A New Custom Code"
+COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_DESCRIPTION="<span id='jcb-placeholder'><code>[save to see]</code></span>"
+COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_LABEL="Use This Place Holder"
+COM_COMPONENTBUILDER_CUSTOM_CODE_NOT_REQUIRED="Not Required"
 COM_COMPONENTBUILDER_CUSTOM_CODE_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_CUSTOM_CODE_PATH="Path"
 COM_COMPONENTBUILDER_CUSTOM_CODE_PATH_DESCRIPTION="File path of where this code should be added."
@@ -1945,6 +1950,9 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_CUSTOM_CODE_REPLACEMENT="Replacement"
 COM_COMPONENTBUILDER_CUSTOM_CODE_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Custom Code to customise the alias."
 COM_COMPONENTBUILDER_CUSTOM_CODE_STATUS="Status"
+COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET="Target"
+COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_DESCRIPTION="Set the way this code will be added to the component.<br />Hash automation means it is added using the hash target of the lines surrounding the code.<br />JCB manual means you add a place-holder in Component Builder User Interface area in one of the custom code blocks manually, and this code is added in at those place holders in any component."
+COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_LABEL="Target"
 COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE="To Line"
 COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_DESCRIPTION="The line to where the code must be replaced."
 COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_HINT="Only Numbers"

admin/layouts/admin_view/css_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		css_fullwidth.php

admin/layouts/admin_view/custom_buttons_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php

admin/layouts/admin_view/custom_buttons_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php

admin/layouts/admin_view/custom_import_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_import_fullwidth.php

admin/layouts/admin_view/fields_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields_fullwidth.php

admin/layouts/admin_view/javascript_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		javascript_fullwidth.php

admin/layouts/admin_view/linked_components_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		linked_components_fullwidth.php

admin/layouts/admin_view/mysql_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_fullwidth.php

admin/layouts/admin_view/mysql_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_left.php

admin/layouts/admin_view/php_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php

admin/layouts/admin_view/publishing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/admin_view/publlshing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/admin_view/settings_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_above.php

admin/layouts/admin_view/settings_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php

admin/layouts/admin_view/settings_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php

admin/layouts/admin_view/settings_under.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_under.php

admin/layouts/batchselection.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batchselection.php

admin/layouts/component/admin_views_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views_fullwidth.php

admin/layouts/component/custom_admin_views_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views_fullwidth.php

admin/layouts/component/details_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php

admin/layouts/component/details_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php

admin/layouts/component/details_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php

admin/layouts/component/details_under.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php

admin/layouts/component/dynamic_build_beta_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_build_beta_fullwidth.php

admin/layouts/component/dynamic_integration_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_integration_fullwidth.php

admin/layouts/component/libs_helpers_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		libs_helpers_fullwidth.php

admin/layouts/component/mysql_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_fullwidth.php

admin/layouts/component/php_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php

admin/layouts/component/publishing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/component/publlshing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/component/readme_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		readme_left.php

admin/layouts/component/readme_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		readme_right.php

admin/layouts/component/settings_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php

admin/layouts/component/settings_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php

admin/layouts/component/site_views_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views_fullwidth.php

admin/layouts/custom_admin_view/custom_buttons_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php

admin/layouts/custom_admin_view/custom_buttons_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php

admin/layouts/custom_admin_view/custom_script_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_script_fullwidth.php

admin/layouts/custom_admin_view/details_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php

admin/layouts/custom_admin_view/details_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php

admin/layouts/custom_admin_view/details_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php

admin/layouts/custom_admin_view/details_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php

admin/layouts/custom_admin_view/details_rightside.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_rightside.php

admin/layouts/custom_admin_view/details_under.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php

admin/layouts/custom_admin_view/linked_components_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		linked_components_fullwidth.php

admin/layouts/custom_admin_view/publishing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/custom_admin_view/publlshing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.0
+	@version		2.3.1
-	@build			4th February, 2017
+	@build			9th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php