From 5b5599575bec191acbe3ca5353f685097f0b8672 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Thu, 9 Feb 2017 18:11:10 +0200 Subject: [PATCH] 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 | 12 +- admin/README.txt | 12 +- admin/assets/css/admin.css | 4 +- admin/assets/css/custom_code.css | 4 +- admin/assets/css/custom_codes.css | 4 +- admin/assets/css/dashboard.css | 4 +- admin/compiler/joomla_3/JModelAdmin_site.php | 41 +- admin/compiler/joomla_3/router.php | 48 +- admin/componentbuilder.php | 4 +- admin/controller.php | 4 +- admin/controllers/ajax.json.php | 4 +- admin/controllers/componentbuilder.php | 4 +- admin/controllers/custom_code.php | 4 +- admin/controllers/custom_codes.php | 4 +- admin/controllers/field.php | 37 +- admin/controllers/fieldtype.php | 37 +- admin/controllers/help.php | 4 +- admin/controllers/import.php | 4 +- .../footable3/css/footable.core.bootstrap.css | 344 +- .../css/footable.core.bootstrap.min.css | 1 + .../css/footable.core.standalone.css | 1305 ++-- .../css/footable.core.standalone.min.css | 1 + .../custom/footable3/css/footable.editing.css | 50 + .../footable3/css/footable.editing.min.css | 1 + .../footable3/css/footable.filtering.css | 108 +- .../custom/footable3/css/footable.paging.css | 60 +- .../custom/footable3/css/footable.sorting.css | 76 +- .../footable3/css/footable.sorting.min.css | 2 +- admin/custom/footable3/js/footable.core.js | 6753 +++++++++-------- .../custom/footable3/js/footable.core.min.js | 6 +- admin/custom/footable3/js/footable.editing.js | 802 ++ .../footable3/js/footable.editing.min.js | 8 + .../custom/footable3/js/footable.filtering.js | 1967 ++--- .../footable3/js/footable.filtering.min.js | 4 +- admin/custom/footable3/js/footable.paging.js | 1469 ++-- .../footable3/js/footable.paging.min.js | 4 +- admin/custom/footable3/js/footable.sorting.js | 923 +-- .../footable3/js/footable.sorting.min.js | 4 +- admin/custom/footable3/js/footable.state.js | 362 + .../custom/footable3/js/footable.state.min.js | 8 + admin/helpers/compiler.php | 112 +- admin/helpers/compiler/a_Get.php | 144 +- admin/helpers/compiler/b_Structure.php | 12 +- admin/helpers/compiler/c_Fields.php | 74 +- admin/helpers/compiler/e_Interpretation.php | 4662 ++++++------ admin/helpers/compiler/f_Infusion.php | 82 +- admin/helpers/componentbuilder.php | 4 +- admin/helpers/headercheck.php | 4 +- admin/helpers/html/batch_.php | 4 +- admin/helpers/indenter.php | 4 +- admin/helpers/js.php | 4 +- admin/helpers/minify.php | 4 +- .../en-GB/en-GB.com_componentbuilder.ini | 8 + admin/layouts/admin_view/css_fullwidth.php | 4 +- .../admin_view/custom_buttons_fullwidth.php | 4 +- .../admin_view/custom_buttons_left.php | 4 +- .../admin_view/custom_import_fullwidth.php | 4 +- admin/layouts/admin_view/fields_fullwidth.php | 4 +- .../admin_view/javascript_fullwidth.php | 4 +- .../linked_components_fullwidth.php | 4 +- admin/layouts/admin_view/mysql_fullwidth.php | 4 +- admin/layouts/admin_view/mysql_left.php | 4 +- admin/layouts/admin_view/php_fullwidth.php | 4 +- admin/layouts/admin_view/publishing.php | 4 +- admin/layouts/admin_view/publlshing.php | 4 +- admin/layouts/admin_view/settings_above.php | 4 +- admin/layouts/admin_view/settings_left.php | 4 +- admin/layouts/admin_view/settings_right.php | 4 +- admin/layouts/admin_view/settings_under.php | 4 +- admin/layouts/batchselection.php | 4 +- .../component/admin_views_fullwidth.php | 4 +- .../custom_admin_views_fullwidth.php | 4 +- admin/layouts/component/details_above.php | 4 +- admin/layouts/component/details_left.php | 4 +- admin/layouts/component/details_right.php | 4 +- admin/layouts/component/details_under.php | 4 +- .../dynamic_build_beta_fullwidth.php | 4 +- .../dynamic_integration_fullwidth.php | 4 +- .../component/libs_helpers_fullwidth.php | 4 +- admin/layouts/component/mysql_fullwidth.php | 4 +- admin/layouts/component/php_fullwidth.php | 4 +- admin/layouts/component/publishing.php | 4 +- admin/layouts/component/publlshing.php | 4 +- admin/layouts/component/readme_left.php | 4 +- admin/layouts/component/readme_right.php | 4 +- admin/layouts/component/settings_left.php | 4 +- admin/layouts/component/settings_right.php | 4 +- .../component/site_views_fullwidth.php | 4 +- .../custom_buttons_fullwidth.php | 4 +- .../custom_admin_view/custom_buttons_left.php | 4 +- .../custom_script_fullwidth.php | 4 +- .../custom_admin_view/details_above.php | 4 +- .../custom_admin_view/details_fullwidth.php | 4 +- .../custom_admin_view/details_left.php | 4 +- .../custom_admin_view/details_right.php | 4 +- .../custom_admin_view/details_rightside.php | 4 +- .../custom_admin_view/details_under.php | 4 +- .../linked_components_fullwidth.php | 4 +- .../layouts/custom_admin_view/publishing.php | 4 +- .../layouts/custom_admin_view/publlshing.php | 4 +- admin/layouts/custom_code/details_above.php | 6 +- .../layouts/custom_code/details_fullwidth.php | 5 +- admin/layouts/custom_code/details_left.php | 7 +- admin/layouts/custom_code/details_right.php | 4 +- admin/layouts/custom_code/details_under.php | 41 + admin/layouts/custom_code/publishing.php | 4 +- admin/layouts/custom_code/publlshing.php | 4 +- .../layouts/dynamic_get/abacus_fullwidth.php | 4 +- admin/layouts/dynamic_get/abacus_left.php | 4 +- .../dynamic_get/custom_script_fullwidth.php | 4 +- admin/layouts/dynamic_get/gettable_above.php | 4 +- .../dynamic_get/gettable_fullwidth.php | 4 +- admin/layouts/dynamic_get/gettable_left.php | 4 +- admin/layouts/dynamic_get/gettable_right.php | 4 +- admin/layouts/dynamic_get/gettable_under.php | 4 +- admin/layouts/dynamic_get/publishing.php | 4 +- admin/layouts/dynamic_get/publlshing.php | 4 +- admin/layouts/field/details_fullwidth.php | 4 +- admin/layouts/field/details_left.php | 4 +- admin/layouts/field/details_right.php | 4 +- admin/layouts/field/details_under.php | 4 +- .../field/linked_admin_views_fullwidth.php | 6 +- admin/layouts/field/publishing.php | 4 +- admin/layouts/field/publlshing.php | 4 +- admin/layouts/field/scripts_left.php | 4 +- admin/layouts/field/scripts_right.php | 4 +- admin/layouts/fieldtype/details_left.php | 4 +- admin/layouts/fieldtype/details_right.php | 4 +- admin/layouts/fieldtype/fields_fullwidth.php | 6 +- admin/layouts/fieldtype/publishing.php | 4 +- admin/layouts/fieldtype/publlshing.php | 4 +- admin/layouts/help_document/details_above.php | 4 +- .../help_document/details_fullwidth.php | 4 +- admin/layouts/help_document/details_left.php | 4 +- admin/layouts/help_document/details_right.php | 4 +- admin/layouts/help_document/details_under.php | 4 +- admin/layouts/help_document/publishing.php | 4 +- admin/layouts/help_document/publlshing.php | 4 +- .../layout/custom_script_fullwidth.php | 4 +- admin/layouts/layout/details_fullwidth.php | 4 +- admin/layouts/layout/details_left.php | 4 +- admin/layouts/layout/details_right.php | 4 +- admin/layouts/layout/details_rightside.php | 4 +- admin/layouts/layout/details_under.php | 4 +- admin/layouts/layout/publishing.php | 4 +- admin/layouts/layout/publlshing.php | 4 +- .../site_view/custom_buttons_fullwidth.php | 4 +- admin/layouts/site_view/details_above.php | 4 +- admin/layouts/site_view/details_fullwidth.php | 4 +- admin/layouts/site_view/details_left.php | 4 +- admin/layouts/site_view/details_right.php | 4 +- admin/layouts/site_view/details_rightside.php | 4 +- admin/layouts/site_view/details_under.php | 4 +- .../site_view/javascript_css_fullwidth.php | 4 +- .../site_view/linked_components_fullwidth.php | 4 +- admin/layouts/site_view/php_fullwidth.php | 4 +- admin/layouts/site_view/publishing.php | 4 +- admin/layouts/site_view/publlshing.php | 4 +- admin/layouts/snippet/details_above.php | 4 +- admin/layouts/snippet/details_left.php | 4 +- admin/layouts/snippet/details_right.php | 4 +- admin/layouts/snippet/publishing.php | 4 +- admin/layouts/snippet/publlshing.php | 4 +- .../template/custom_script_fullwidth.php | 4 +- admin/layouts/template/details_fullwidth.php | 4 +- admin/layouts/template/details_left.php | 4 +- admin/layouts/template/details_right.php | 4 +- admin/layouts/template/details_rightside.php | 4 +- admin/layouts/template/details_under.php | 4 +- admin/layouts/template/publishing.php | 4 +- admin/layouts/template/publlshing.php | 4 +- admin/models/ajax.php | 4 +- admin/models/componentbuilder.php | 4 +- admin/models/custom_code.php | 40 +- admin/models/custom_codes.php | 55 +- admin/models/field.php | 46 +- admin/models/fields/adminviewfolderlist.php | 4 +- admin/models/fields/adminviews.php | 4 +- admin/models/fields/articles.php | 4 +- admin/models/fields/component.php | 4 +- admin/models/fields/customadminviews.php | 4 +- admin/models/fields/customfilelist.php | 4 +- admin/models/fields/customfolderlist.php | 4 +- admin/models/fields/customgets.php | 4 +- admin/models/fields/dbtables.php | 4 +- admin/models/fields/dynamicgets.php | 4 +- admin/models/fields/fields.php | 4 +- admin/models/fields/fieldsmulti.php | 4 +- admin/models/fields/fieldtypes.php | 4 +- admin/models/fields/maingets.php | 4 +- admin/models/fields/siteviewfolderlist.php | 4 +- admin/models/fields/siteviews.php | 4 +- admin/models/fields/snippets.php | 4 +- admin/models/fieldtype.php | 56 +- admin/models/forms/custom_code.js | 162 +- admin/models/forms/custom_code.xml | 90 +- admin/models/forms/field.js | 420 +- admin/models/forms/help_document.js | 424 +- admin/models/import.php | 4 +- admin/sql/install.mysql.utf8.sql | 7 +- admin/sql/updates/mysql/2.3.0.sql | 1 + admin/tables/custom_code.php | 4 +- admin/views/compiler/view.html.php | 2 +- admin/views/componentbuilder/tmpl/default.php | 4 +- ...sed_issues_the_closed_issues_on_github.php | 4 +- .../componentbuilder/tmpl/default_main.php | 4 +- ..._open_issues_the_open_issues_on_github.php | 4 +- .../tmpl/default_readme_information.php | 4 +- ...t_vast_development_method_notice_board.php | 4 +- .../componentbuilder/tmpl/default_vdm.php | 4 +- admin/views/componentbuilder/view.html.php | 4 +- admin/views/custom_code/submitbutton.js | 4 +- admin/views/custom_code/tmpl/edit.php | 108 +- admin/views/custom_code/view.html.php | 4 +- admin/views/custom_codes/tmpl/default.php | 4 +- .../custom_codes/tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../views/custom_codes/tmpl/default_body.php | 7 +- .../views/custom_codes/tmpl/default_foot.php | 6 +- .../views/custom_codes/tmpl/default_head.php | 7 +- .../custom_codes/tmpl/default_toolbar.php | 4 +- admin/views/custom_codes/view.html.php | 63 +- admin/views/field/tmpl/edit.php | 108 +- admin/views/field/view.html.php | 2 +- admin/views/fieldtype/view.html.php | 2 +- admin/views/help_document/tmpl/edit.php | 60 +- admin/views/import/tmpl/default.php | 4 +- admin/views/import/view.html.php | 4 +- componentbuilder.xml | 6 +- componentbuilder_update_server.xml | 17 + .../footable/css/footable.core.bootstrap.css | 344 +- .../css/footable.core.bootstrap.min.css | 1 + .../footable/css/footable.core.standalone.css | 1305 ++-- .../css/footable.core.standalone.min.css | 1 + media/footable/css/footable.editing.css | 50 + media/footable/css/footable.editing.min.css | 1 + media/footable/css/footable.filtering.css | 108 +- media/footable/css/footable.paging.css | 60 +- media/footable/css/footable.sorting.css | 76 +- media/footable/css/footable.sorting.min.css | 2 +- media/footable/js/footable.core.js | 6753 +++++++++-------- media/footable/js/footable.core.min.js | 6 +- media/footable/js/footable.editing.js | 802 ++ media/footable/js/footable.editing.min.js | 8 + media/footable/js/footable.filtering.js | 1967 ++--- media/footable/js/footable.filtering.min.js | 4 +- media/footable/js/footable.paging.js | 1469 ++-- media/footable/js/footable.paging.min.js | 4 +- media/footable/js/footable.sorting.js | 923 +-- media/footable/js/footable.sorting.min.js | 4 +- media/footable/js/footable.state.js | 362 + media/footable/js/footable.state.min.js | 8 + script.php | 14 +- 253 files changed, 20214 insertions(+), 16025 deletions(-) create mode 100644 admin/custom/footable3/css/footable.core.bootstrap.min.css create mode 100644 admin/custom/footable3/css/footable.core.standalone.min.css create mode 100644 admin/custom/footable3/css/footable.editing.css create mode 100644 admin/custom/footable3/css/footable.editing.min.css create mode 100644 admin/custom/footable3/js/footable.editing.js create mode 100644 admin/custom/footable3/js/footable.editing.min.js create mode 100644 admin/custom/footable3/js/footable.state.js create mode 100644 admin/custom/footable3/js/footable.state.min.js create mode 100644 admin/layouts/custom_code/details_under.php create mode 100644 admin/sql/updates/mysql/2.3.0.sql create mode 100644 media/footable/css/footable.core.bootstrap.min.css create mode 100644 media/footable/css/footable.core.standalone.min.css create mode 100644 media/footable/css/footable.editing.css create mode 100644 media/footable/css/footable.editing.min.css create mode 100644 media/footable/js/footable.editing.js create mode 100644 media/footable/js/footable.editing.min.js create mode 100644 media/footable/js/footable.state.js create mode 100644 media/footable/js/footable.state.min.js diff --git a/README.md b/README.md index 22db36136..64f469832 100644 --- a/README.md +++ b/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 -+ *Version*: 2.3.0 ++ *Last Build*: 9th February, 2017 ++ *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** -+ *File count*: **589** ++ *Line count*: **91404** ++ *File count*: **591** + *Folder count*: **105** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). diff --git a/admin/README.txt b/admin/README.txt index 22db36136..64f469832 100644 --- a/admin/README.txt +++ b/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 -+ *Version*: 2.3.0 ++ *Last Build*: 9th February, 2017 ++ *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** -+ *File count*: **589** ++ *Line count*: **91404** ++ *File count*: **591** + *Folder count*: **105** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index f8daccb0d..4d154ba36 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.css diff --git a/admin/assets/css/custom_code.css b/admin/assets/css/custom_code.css index 5b277936e..2b102ef38 100644 --- a/admin/assets/css/custom_code.css +++ b/admin/assets/css/custom_code.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC - @build 31st January, 2017 + @version @update number 28 of this MVC + @build 9th February, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_code.css diff --git a/admin/assets/css/custom_codes.css b/admin/assets/css/custom_codes.css index 4be7b1f46..addc9a537 100644 --- a/admin/assets/css/custom_codes.css +++ b/admin/assets/css/custom_codes.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC - @build 31st January, 2017 + @version @update number 28 of this MVC + @build 9th February, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_codes.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index c0231f2b8..0608d1b92 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage dashboard.css diff --git a/admin/compiler/joomla_3/JModelAdmin_site.php b/admin/compiler/joomla_3/JModelAdmin_site.php index d1a780b55..47374e011 100644 --- a/admin/compiler/joomla_3/JModelAdmin_site.php +++ b/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. @@ -248,6 +248,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. diff --git a/admin/compiler/joomla_3/router.php b/admin/compiler/joomla_3/router.php index b5d1ecd3d..e0504bcd6 100644 --- a/admin/compiler/joomla_3/router.php +++ b/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,19 +153,42 @@ 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)) { - $query->where($db->quoteName($whereString) . ' '.$operator.' '. $db->quote((string)$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)); + } + else + { + return false; + } } else { @@ -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) diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php index f684b0634..f129ed3fe 100644 --- a/admin/componentbuilder.php +++ b/admin/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controller.php b/admin/controller.php index dca8dc8c1..53db5fa81 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage controller.php diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 89369f506..c383f3ffa 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.json.php diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index 5b3e28118..ab393d25c 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controllers/custom_code.php b/admin/controllers/custom_code.php index be53e88e9..a628efa15 100644 --- a/admin/controllers/custom_code.php +++ b/admin/controllers/custom_code.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC - @build 31st January, 2017 + @version @update number 28 of this MVC + @build 9th February, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_code.php diff --git a/admin/controllers/custom_codes.php b/admin/controllers/custom_codes.php index 81ef93197..f20623526 100644 --- a/admin/controllers/custom_codes.php +++ b/admin/controllers/custom_codes.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC - @build 31st January, 2017 + @version @update number 28 of this MVC + @build 9th February, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_codes.php diff --git a/admin/controllers/field.php b/admin/controllers/field.php index 3f05fa45b..31abd5adb 100644 --- a/admin/controllers/field.php +++ b/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); - } - else - { - return $allow; - } + // In the absense of better information, revert to the component permissions. + return JFactory::getUser()->authorise('field.create', $this->option); } /** @@ -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); diff --git a/admin/controllers/fieldtype.php b/admin/controllers/fieldtype.php index f888c903e..b40418bac 100644 --- a/admin/controllers/fieldtype.php +++ b/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); - } - else - { - return $allow; - } + // In the absense of better information, revert to the component permissions. + return JFactory::getUser()->authorise('fieldtype.create', $this->option); } /** @@ -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); diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 808e754a4..1b7f771a8 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 6e386f341..94f5a6e24 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/custom/footable3/css/footable.core.bootstrap.css b/admin/custom/footable3/css/footable.core.bootstrap.css index d652b6ffa..30be581fb 100644 --- a/admin/custom/footable3/css/footable.core.bootstrap.css +++ b/admin/custom/footable3/css/footable.core.bootstrap.css @@ -1,169 +1,175 @@ -/* -* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome. -* @version 3.0.6 -* @link http://fooplugins.com -* @copyright Steven Usher & Brad Vincent 2015 -* @license Released under the GPLv3 license. -*/ -table.footable, -table.footable-details { - position: relative; - width: 100%; - border-spacing: 0; - border-collapse: collapse; -} -table.footable-details { - margin-bottom: 0; -} -table > tbody > tr > td > span.footable-toggle { - margin-right: 8px; - opacity: 0.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 > thead > tr:first-child > th, -table.footable-details > thead > tr:first-child > td, -table.footable-details > tbody > tr:first-child > th, -table.footable-details > tbody > tr:first-child > td, -table.footable-details > tfoot > tr:first-child > th, -table.footable-details > tfoot > tr:first-child > td { - border-top-width: 0; -} -table.footable-details.table-bordered > thead > tr:first-child > th, -table.footable-details.table-bordered > thead > tr:first-child > td, -table.footable-details.table-bordered > tbody > tr:first-child > th, -table.footable-details.table-bordered > tbody > tr:first-child > td, -table.footable-details.table-bordered > tfoot > tr:first-child > th, -table.footable-details.table-bordered > tfoot > tr:first-child > td { - 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: 0.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-empty > td, -table.footable > tbody > tr.footable-empty > th, -table.footable > tbody > tr.footable-detail-row > td, -table.footable > tbody > tr.footable-detail-row > th { - display: table-cell; -} -@-webkit-keyframes fooicon-spin-r { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - - 100% { - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} - -@keyframes fooicon-spin-r { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - - 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:before, -.fooicon:after { - -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"; -} \ No newline at end of file +/* +* 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. +*/ +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: 0.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 > thead > tr:first-child > th, +table.footable-details > thead > tr:first-child > td, +table.footable-details > tbody > tr:first-child > th, +table.footable-details > tbody > tr:first-child > td, +table.footable-details > tfoot > tr:first-child > th, +table.footable-details > tfoot > tr:first-child > td { + border-top-width: 0; +} +table.footable-details.table-bordered > thead > tr:first-child > th, +table.footable-details.table-bordered > thead > tr:first-child > td, +table.footable-details.table-bordered > tbody > tr:first-child > th, +table.footable-details.table-bordered > tbody > tr:first-child > td, +table.footable-details.table-bordered > tfoot > tr:first-child > th, +table.footable-details.table-bordered > tfoot > tr:first-child > td { + 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: 0.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-empty > td, +table.footable > tbody > tr.footable-empty > th, +table.footable > tbody > tr.footable-detail-row > td, +table.footable > tbody > tr.footable-detail-row > th { + display: table-cell; +} +@-webkit-keyframes fooicon-spin-r { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} + +@keyframes fooicon-spin-r { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + + 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:before, +.fooicon:after { + -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"; +} diff --git a/admin/custom/footable3/css/footable.core.bootstrap.min.css b/admin/custom/footable3/css/footable.core.bootstrap.min.css new file mode 100644 index 000000000..771e966d6 --- /dev/null +++ b/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"} \ No newline at end of file diff --git a/admin/custom/footable3/css/footable.core.standalone.css b/admin/custom/footable3/css/footable.core.standalone.css index 3238ef696..679543a6f 100644 --- a/admin/custom/footable3/css/footable.core.standalone.css +++ b/admin/custom/footable3/css/footable.core.standalone.css @@ -1,630 +1,675 @@ -/* -* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome. -* @version 3.0.6 -* @link http://fooplugins.com -* @copyright Steven Usher & Brad Vincent 2015 -* @license Released under the GPLv3 license. -*/ -/* globals - instead we house them under the .footable.table class as the root of FooTable is always the table itself. */ -.footable.table, .footable.table *, -.footable-details.table, .footable-details.table * { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -.footable.table th, -.footable-details.table th { - text-align: left; -} -/* tables */ -.footable.table, -.footable-details.table { - width: 100%; - max-width: 100%; - margin-bottom: 20px; -} -.footable.table > caption + thead > tr:first-child > th, -.footable.table > colgroup + thead > tr:first-child > th, -.footable.table > thead:first-child > tr:first-child > th, -.footable.table > caption + thead > tr:first-child > td, -.footable.table > colgroup + thead > tr:first-child > td, -.footable.table > thead:first-child > tr:first-child > td, -.footable-details.table > caption + thead > tr:first-child > th, -.footable-details.table > colgroup + thead > tr:first-child > th, -.footable-details.table > thead:first-child > tr:first-child > th, -.footable-details.table > caption + thead > tr:first-child > td, -.footable-details.table > colgroup + thead > tr:first-child > td, -.footable-details.table > thead:first-child > tr:first-child > td { - border-top: 0; -} -.footable.table > thead > tr > th, -.footable.table > tbody > tr > th, -.footable.table > tfoot > tr > th, -.footable.table > thead > tr > td, -.footable.table > tbody > tr > td, -.footable.table > tfoot > tr > td, -.footable-details.table > thead > tr > th, -.footable-details.table > tbody > tr > th, -.footable-details.table > tfoot > tr > th, -.footable-details.table > thead > tr > td, -.footable-details.table > tbody > tr > td, -.footable-details.table > tfoot > tr > td { - padding: 8px; - line-height: 1.42857143; - vertical-align: top; - border-top: 1px solid #ddd; -} -.footable.table > thead > tr > th, -.footable.table > thead > tr > td, -.footable-details.table > thead > tr > th, -.footable-details.table > thead > tr > td { - vertical-align: bottom; - border-bottom: 2px solid #ddd; -} -.footable.table-condensed > thead > tr > th, -.footable.table-condensed > tbody > tr > th, -.footable.table-condensed > tfoot > tr > th, -.footable.table-condensed > thead > tr > td, -.footable.table-condensed > tbody > tr > td, -.footable.table-condensed > tfoot > tr > td, -.footable-details.table-condensed > thead > tr > th, -.footable-details.table-condensed > tbody > tr > th, -.footable-details.table-condensed > tfoot > tr > th, -.footable-details.table-condensed > thead > tr > td, -.footable-details.table-condensed > tbody > tr > td, -.footable-details.table-condensed > tfoot > tr > td { - padding: 5px; -} -.footable.table-bordered, -.footable-details.table-bordered { - border: 1px solid #ddd; -} -.footable.table-bordered > thead > tr > th, -.footable.table-bordered > tbody > tr > th, -.footable.table-bordered > tfoot > tr > th, -.footable.table-bordered > thead > tr > td, -.footable.table-bordered > tbody > tr > td, -.footable.table-bordered > tfoot > tr > td, -.footable-details.table-bordered > thead > tr > th, -.footable-details.table-bordered > tbody > tr > th, -.footable-details.table-bordered > tfoot > tr > th, -.footable-details.table-bordered > thead > tr > td, -.footable-details.table-bordered > tbody > tr > td, -.footable-details.table-bordered > tfoot > tr > td { - border: 1px solid #ddd; -} -.footable.table-bordered > thead > tr > th, -.footable.table-bordered > thead > tr > td, -.footable-details.table-bordered > thead > tr > th, -.footable-details.table-bordered > thead > tr > td { - border-bottom-width: 2px; -} -.footable.table-striped > tbody > tr:nth-child(odd), -.footable-details.table-striped > tbody > tr:nth-child(odd) { - background-color: #f9f9f9; -} -.footable.table-hover > tbody > tr:hover, -.footable-details.table-hover > tbody > tr:hover { - background-color: #f5f5f5; -} -/* buttons */ -.footable .btn { - display: inline-block; - padding: 6px 12px; - margin-bottom: 0; - font-size: 14px; - font-weight: 400; - line-height: 1.42857143; - text-align: center; - white-space: nowrap; - vertical-align: middle; - -ms-touch-action: manipulation; - touch-action: manipulation; - cursor: pointer; - -webkit-appearance: button; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - background-image: none; - border: 1px solid transparent; - border-radius: 4px; - overflow: visible; - text-transform: none; -} -.footable .btn:hover, -.footable .btn:focus, -.footable .btn.focus { - color: #333; - text-decoration: none; -} -.footable .btn-default { - color: #333; - background-color: #fff; - border-color: #ccc; -} -.footable .btn-default:hover, -.footable .btn-default:focus, -.footable .btn-default.focus, -.footable .btn-default:active, -.footable .btn-default.active, -.footable .open > .dropdown-toggle.btn-default { - color: #333; - background-color: #e6e6e6; - border-color: #adadad; -} -.footable .btn-primary { - color: #fff; - background-color: #337ab7; - border-color: #2e6da4; -} -.footable .btn-primary:hover, -.footable .btn-primary:focus, -.footable .btn-primary.focus, -.footable .btn-primary:active, -.footable .btn-primary.active, -.footable .open > .dropdown-toggle.btn-primary { - color: #fff; - background-color: #286090; - border-color: #204d74; -} -/* caret */ -.footable .caret { - display: inline-block; - width: 0; - height: 0; - margin-left: 2px; - vertical-align: middle; - border-top: 4px solid; - border-right: 4px solid transparent; - border-left: 4px solid transparent; -} -.footable .btn .caret { - margin-left: 0; -} -/* form-group */ -.form-group { - margin-bottom: 15px; -} -/* form-control */ -.footable .form-control { - display: block; - width: 100%; - height: 34px; - padding: 6px 12px; - margin: 0; - font-family: inherit; - font-size: 14px; - line-height: 1.42857143; - color: #555; - background-color: #fff; - background-image: none; - border: 1px solid #ccc; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); - -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s; - -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; - transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; -} -/* input-group */ -.footable .input-group { - position: relative; - display: table; - border-collapse: separate; -} -.footable .input-group .form-control { - position: relative; - z-index: 2; - float: left; - width: 100%; - margin-bottom: 0; -} -.footable .input-group-btn { - position: relative; - font-size: 0; - white-space: nowrap; -} -.footable .input-group-addon, -.footable .input-group-btn { - width: 1%; - white-space: nowrap; - vertical-align: middle; -} -.footable .input-group-addon, -.footable .input-group-btn, -.footable .input-group .form-control { - display: table-cell; -} -.footable .input-group-btn > .btn + .btn, -.footable .input-group-btn:last-child > .btn, -.footable .input-group-btn:last-child > .btn-group { - margin-left: -1px; -} -.footable .input-group-btn > .btn { - position: relative; -} -.footable .input-group-btn > .btn:hover, -.footable .input-group-btn > .btn:focus, -.footable .input-group-btn > .btn:active { - z-index: 2; -} -.footable .input-group .form-control:first-child, -.footable .input-group-addon:first-child, -.footable .input-group-btn:first-child > .btn, -.footable .input-group-btn:first-child > .btn-group > .btn, -.footable .input-group-btn:first-child > .dropdown-toggle, -.footable .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle), -.footable .input-group-btn:last-child > .btn-group:not(:last-child) > .btn { - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} -.footable .input-group .form-control:last-child, -.footable .input-group-addon:last-child, -.footable .input-group-btn:last-child > .btn, -.footable .input-group-btn:last-child > .btn-group > .btn, -.footable .input-group-btn:last-child > .dropdown-toggle, -.footable .input-group-btn:first-child > .btn:not(:first-child), -.footable .input-group-btn:first-child > .btn-group:not(:first-child) > .btn { - border-top-left-radius: 0; - border-bottom-left-radius: 0; -} -/* checkboxes & radios */ -.footable .radio, -.footable .checkbox { - position: relative; - display: block; - margin-top: 10px; - margin-bottom: 10px; -} -.footable .radio label, -.footable .checkbox label { - max-width: 100%; - min-height: 20px; - padding-left: 20px; - margin-bottom: 0; - font-weight: 400; - cursor: pointer; -} -.footable .radio input[type=radio], -.footable .radio-inline input[type=radio], -.footable .checkbox input[type=checkbox], -.footable .checkbox-inline input[type=checkbox] { - position: absolute; - margin: 4px 0 0 -20px; - line-height: normal; -} -/* dropdown-menu */ -.footable .dropdown-menu { - position: absolute; - top: 100%; - left: 0; - z-index: 1000; - display: none; - float: left; - min-width: 160px; - padding: 5px 0; - margin: 2px 0 0; - font-size: 14px; - text-align: left; - list-style: none; - background-color: #fff; - -webkit-background-clip: padding-box; - background-clip: padding-box; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, .15); - border-radius: 4px; - -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175); - box-shadow: 0 6px 12px rgba(0, 0, 0, .175); -} -.footable .open > .dropdown-menu { - display: block; -} -.footable .dropdown-menu-right { - right: 0; - left: auto; -} -.footable .dropdown-menu > li > a { - display: block; - padding: 3px 20px; - clear: both; - font-weight: 400; - line-height: 1.42857143; - color: #333; - white-space: nowrap; -} -.footable .dropdown-menu > li > a:hover, -.footable .dropdown-menu > li > a:focus { - color: #262626; - text-decoration: none; - background-color: #f5f5f5; -} -/* pagination */ -.footable .pagination { - display: inline-block; - padding-left: 0; - margin: 20px 0; - border-radius: 4px; -} -.footable .pagination > li { - display: inline; -} -.footable .pagination > li:first-child > a, -.footable .pagination > li:first-child > span { - margin-left: 0; - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; -} -.footable .pagination > li > a, -.footable .pagination > li > span { - position: relative; - float: left; - padding: 6px 12px; - margin-left: -1px; - line-height: 1.42857143; - color: #337ab7; - text-decoration: none; - background-color: #fff; - border: 1px solid #ddd; -} -.footable .pagination > li > a:hover, -.footable .pagination > li > span:hover, -.footable .pagination > li > a:focus, -.footable .pagination > li > span:focus { - color: #23527c; - background-color: #eee; - border-color: #ddd; -} -.footable .pagination > .active > a, -.footable .pagination > .active > span, -.footable .pagination > .active > a:hover, -.footable .pagination > .active > span:hover, -.footable .pagination > .active > a:focus, -.footable .pagination > .active > span:focus { - z-index: 2; - color: #fff; - cursor: default; - background-color: #337ab7; - border-color: #337ab7; -} -.footable .pagination > .disabled > span, -.footable .pagination > .disabled > span:hover, -.footable .pagination > .disabled > span:focus, -.footable .pagination > .disabled > a, -.footable .pagination > .disabled > a:hover, -.footable .pagination > .disabled > a:focus { - color: #777; - cursor: not-allowed; - background-color: #fff; - border-color: #ddd; -} -/* labels */ -.footable .label { - display: inline; - padding: .2em .6em .3em; - font-size: 75%; - font-weight: 700; - line-height: 1; - color: #fff; - text-align: center; - white-space: nowrap; - vertical-align: baseline; - border-radius: .25em; -} -.footable .label-default { - background-color: #777; -} -/* wells */ -.footable-loader.well { - min-height: 20px; - padding: 19px; - margin-bottom: 20px; - background-color: #f5f5f5; - border: 1px solid #e3e3e3; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.05); - box-shadow: inset 0 1px 1px rgba(0,0,0,.05); -} -/* screen reader only */ -.footable .sr-only { - position: absolute; - width: 1px; - height: 1px; - padding: 0; - margin: -1px; - overflow: hidden; - clip: rect(0,0,0,0); - border: 0; -} -/* form-inline */ -@media (min-width: 768px) { - .footable .form-inline .form-group { - display:inline-block; - margin-bottom: 0; - vertical-align: middle - } - - .footable .form-inline .form-control { - display: inline-block; - width: auto; - vertical-align: middle - } - - .footable .form-inline .input-group { - display: inline-table; - vertical-align: middle - } - - .footable .form-inline .input-group .input-group-addon, - .footable .form-inline .input-group .input-group-btn, - .footable .form-inline .input-group .form-control { - width: auto - } - - .footable .form-inline .input-group>.form-control { - width: 100% - } -} -table.footable, -table.footable-details { - position: relative; - width: 100%; - border-spacing: 0; - border-collapse: collapse; -} -table.footable-details { - margin-bottom: 0; -} -table > tbody > tr > td > span.footable-toggle { - margin-right: 8px; - opacity: 0.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 > thead > tr:first-child > th, -table.footable-details > thead > tr:first-child > td, -table.footable-details > tbody > tr:first-child > th, -table.footable-details > tbody > tr:first-child > td, -table.footable-details > tfoot > tr:first-child > th, -table.footable-details > tfoot > tr:first-child > td { - border-top-width: 0; -} -table.footable-details.table-bordered > thead > tr:first-child > th, -table.footable-details.table-bordered > thead > tr:first-child > td, -table.footable-details.table-bordered > tbody > tr:first-child > th, -table.footable-details.table-bordered > tbody > tr:first-child > td, -table.footable-details.table-bordered > tfoot > tr:first-child > th, -table.footable-details.table-bordered > tfoot > tr:first-child > td { - 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: 0.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-empty > td, -table.footable > tbody > tr.footable-empty > th, -table.footable > tbody > tr.footable-detail-row > td, -table.footable > tbody > tr.footable-detail-row > th { - display: table-cell; -} -@-webkit-keyframes fooicon-spin-r { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - - 100% { - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} - -@keyframes fooicon-spin-r { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - - 100% { - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} - -.fooicon { - display: inline-block; - font-size: inherit; - font-family: FontAwesome !important; - font-style: normal; - font-weight: 400; - line-height: 1; - text-rendering: auto; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - transform: translate(0, 0); -} -.fooicon:before, -.fooicon:after { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -.fooicon-loader:before { - content: "\f01e"; -} -.fooicon-plus:before { - content: "\f067"; -} -.fooicon-minus:before { - content: "\f068"; -} -.fooicon-search:before { - content: "\f002"; -} -.fooicon-remove:before { - content: "\f00d"; -} -.fooicon-sort:before { - content: "\f0dc"; -} -.fooicon-sort-asc:before { - content: "\f160"; -} -.fooicon-sort-desc:before { - content: "\f161"; -} -.fooicon-pencil:before { - content: "\f040"; -} -.fooicon-trash:before { - content: "\f1f8"; -} -.fooicon-eye-close:before { - content: "\f070"; -} -.fooicon-flash:before { - content: "\f0e7"; -} -.fooicon-cog:before { - content: "\f013"; -} \ No newline at end of file +/* +* 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. +*/ +/* globals - instead we house them under the .footable.table class as the root of FooTable is always the table itself. */ +.footable.table, .footable.table *, +.footable-details.table, .footable-details.table * { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.footable.table th, +.footable-details.table th { + text-align: left; +} +/* tables */ +.footable.table, +.footable-details.table { + width: 100%; + max-width: 100%; + margin-bottom: 20px; +} +.footable.table > caption + thead > tr:first-child > th, +.footable.table > colgroup + thead > tr:first-child > th, +.footable.table > thead:first-child > tr:first-child > th, +.footable.table > caption + thead > tr:first-child > td, +.footable.table > colgroup + thead > tr:first-child > td, +.footable.table > thead:first-child > tr:first-child > td, +.footable-details.table > caption + thead > tr:first-child > th, +.footable-details.table > colgroup + thead > tr:first-child > th, +.footable-details.table > thead:first-child > tr:first-child > th, +.footable-details.table > caption + thead > tr:first-child > td, +.footable-details.table > colgroup + thead > tr:first-child > td, +.footable-details.table > thead:first-child > tr:first-child > td { + border-top: 0; +} +.footable.table > thead > tr > th, +.footable.table > tbody > tr > th, +.footable.table > tfoot > tr > th, +.footable.table > thead > tr > td, +.footable.table > tbody > tr > td, +.footable.table > tfoot > tr > td, +.footable-details.table > thead > tr > th, +.footable-details.table > tbody > tr > th, +.footable-details.table > tfoot > tr > th, +.footable-details.table > thead > tr > td, +.footable-details.table > tbody > tr > td, +.footable-details.table > tfoot > tr > td { + padding: 8px; + line-height: 1.42857143; + vertical-align: top; + border-top: 1px solid #ddd; +} +.footable.table > thead > tr > th, +.footable.table > thead > tr > td, +.footable-details.table > thead > tr > th, +.footable-details.table > thead > tr > td { + vertical-align: bottom; + border-bottom: 2px solid #ddd; +} +.footable.table-condensed > thead > tr > th, +.footable.table-condensed > tbody > tr > th, +.footable.table-condensed > tfoot > tr > th, +.footable.table-condensed > thead > tr > td, +.footable.table-condensed > tbody > tr > td, +.footable.table-condensed > tfoot > tr > td, +.footable-details.table-condensed > thead > tr > th, +.footable-details.table-condensed > tbody > tr > th, +.footable-details.table-condensed > tfoot > tr > th, +.footable-details.table-condensed > thead > tr > td, +.footable-details.table-condensed > tbody > tr > td, +.footable-details.table-condensed > tfoot > tr > td { + padding: 5px; +} +.footable.table-bordered, +.footable-details.table-bordered { + border: 1px solid #ddd; +} +.footable.table-bordered > thead > tr > th, +.footable.table-bordered > tbody > tr > th, +.footable.table-bordered > tfoot > tr > th, +.footable.table-bordered > thead > tr > td, +.footable.table-bordered > tbody > tr > td, +.footable.table-bordered > tfoot > tr > td, +.footable-details.table-bordered > thead > tr > th, +.footable-details.table-bordered > tbody > tr > th, +.footable-details.table-bordered > tfoot > tr > th, +.footable-details.table-bordered > thead > tr > td, +.footable-details.table-bordered > tbody > tr > td, +.footable-details.table-bordered > tfoot > tr > td { + border: 1px solid #ddd; +} +.footable.table-bordered > thead > tr > th, +.footable.table-bordered > thead > tr > td, +.footable-details.table-bordered > thead > tr > th, +.footable-details.table-bordered > thead > tr > td { + border-bottom-width: 2px; +} +.footable.table-striped > tbody > tr:nth-child(odd), +.footable-details.table-striped > tbody > tr:nth-child(odd) { + background-color: #f9f9f9; +} +.footable.table-hover > tbody > tr:hover, +.footable-details.table-hover > tbody > tr:hover { + background-color: #f5f5f5; +} +/* buttons */ +.footable .btn { + display: inline-block; + padding: 6px 12px; + margin-bottom: 0; + font-size: 14px; + font-weight: 400; + line-height: 1.42857143; + text-align: center; + white-space: nowrap; + vertical-align: middle; + -ms-touch-action: manipulation; + touch-action: manipulation; + cursor: pointer; + -webkit-appearance: button; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + background-image: none; + border: 1px solid transparent; + border-radius: 4px; + overflow: visible; + text-transform: none; +} +.footable .btn:hover, +.footable .btn:focus, +.footable .btn.focus { + color: #333; + text-decoration: none; +} +.footable .btn-default { + color: #333; + background-color: #fff; + border-color: #ccc; +} +.footable .btn-default:hover, +.footable .btn-default:focus, +.footable .btn-default.focus, +.footable .btn-default:active, +.footable .btn-default.active, +.footable .open > .dropdown-toggle.btn-default { + color: #333; + background-color: #e6e6e6; + border-color: #adadad; +} +.footable .btn-primary { + color: #fff; + background-color: #337ab7; + border-color: #2e6da4; +} +.footable .btn-primary:hover, +.footable .btn-primary:focus, +.footable .btn-primary.focus, +.footable .btn-primary:active, +.footable .btn-primary.active, +.footable .open > .dropdown-toggle.btn-primary { + color: #fff; + 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; + width: 0; + height: 0; + margin-left: 2px; + vertical-align: middle; + border-top: 4px solid; + border-right: 4px solid transparent; + border-left: 4px solid transparent; +} +.footable .btn .caret { + margin-left: 0; +} +/* form-group */ +.form-group { + margin-bottom: 15px; +} +/* form-control */ +.footable .form-control { + display: block; + width: 100%; + height: 34px; + padding: 6px 12px; + margin: 0; + font-family: inherit; + font-size: 14px; + line-height: 1.42857143; + color: #555; + background-color: #fff; + background-image: none; + border: 1px solid #ccc; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); + -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s; + -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; + transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; +} +/* input-group */ +.footable .input-group { + position: relative; + display: table; + border-collapse: separate; +} +.footable .input-group .form-control { + position: relative; + z-index: 2; + float: left; + width: 100%; + margin-bottom: 0; +} +.footable .input-group-btn { + position: relative; + font-size: 0; + white-space: nowrap; +} +.footable .input-group-addon, +.footable .input-group-btn { + width: 1%; + white-space: nowrap; + vertical-align: middle; +} +.footable .input-group-addon, +.footable .input-group-btn, +.footable .input-group .form-control { + display: table-cell; +} +.footable .input-group-btn > .btn + .btn, +.footable .input-group-btn:last-child > .btn, +.footable .input-group-btn:last-child > .btn-group { + margin-left: -1px; +} +.footable .input-group-btn > .btn { + position: relative; +} +.footable .input-group-btn > .btn:hover, +.footable .input-group-btn > .btn:focus, +.footable .input-group-btn > .btn:active { + z-index: 2; +} +.footable .input-group .form-control:first-child, +.footable .input-group-addon:first-child, +.footable .input-group-btn:first-child > .btn, +.footable .input-group-btn:first-child > .btn-group > .btn, +.footable .input-group-btn:first-child > .dropdown-toggle, +.footable .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle), +.footable .input-group-btn:last-child > .btn-group:not(:last-child) > .btn { + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} +.footable .input-group .form-control:last-child, +.footable .input-group-addon:last-child, +.footable .input-group-btn:last-child > .btn, +.footable .input-group-btn:last-child > .btn-group > .btn, +.footable .input-group-btn:last-child > .dropdown-toggle, +.footable .input-group-btn:first-child > .btn:not(:first-child), +.footable .input-group-btn:first-child > .btn-group:not(:first-child) > .btn { + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} +/* checkboxes & radios */ +.footable .radio, +.footable .checkbox { + position: relative; + display: block; + margin-top: 10px; + margin-bottom: 10px; +} +.footable .radio label, +.footable .checkbox label { + max-width: 100%; + min-height: 20px; + padding-left: 20px; + margin-bottom: 0; + font-weight: 400; + cursor: pointer; +} +.footable .radio input[type=radio], +.footable .radio-inline input[type=radio], +.footable .checkbox input[type=checkbox], +.footable .checkbox-inline input[type=checkbox] { + position: absolute; + margin: 4px 0 0 -20px; + line-height: normal; +} +/* dropdown-menu */ +.footable .dropdown-menu { + position: absolute; + top: 100%; + left: 0; + z-index: 1000; + display: none; + float: left; + min-width: 160px; + padding: 5px 0; + margin: 2px 0 0; + font-size: 14px; + text-align: left; + list-style: none; + background-color: #fff; + -webkit-background-clip: padding-box; + background-clip: padding-box; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, .15); + border-radius: 4px; + -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175); + box-shadow: 0 6px 12px rgba(0, 0, 0, .175); +} +.footable .open > .dropdown-menu { + display: block; +} +.footable .dropdown-menu-right { + right: 0; + left: auto; +} +.footable .dropdown-menu > li > a { + display: block; + padding: 3px 20px; + clear: both; + font-weight: 400; + line-height: 1.42857143; + color: #333; + white-space: nowrap; +} +.footable .dropdown-menu > li > a:hover, +.footable .dropdown-menu > li > a:focus { + color: #262626; + text-decoration: none; + background-color: #f5f5f5; +} +/* pagination */ +.footable .pagination { + display: inline-block; + padding-left: 0; + margin: 20px 0; + border-radius: 4px; +} +.footable .pagination > li { + display: inline; +} +.footable .pagination > li:first-child > a, +.footable .pagination > li:first-child > span { + margin-left: 0; + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; +} +.footable .pagination > li > a, +.footable .pagination > li > span { + position: relative; + float: left; + padding: 6px 12px; + margin-left: -1px; + line-height: 1.42857143; + color: #337ab7; + text-decoration: none; + background-color: #fff; + border: 1px solid #ddd; +} +.footable .pagination > li > a:hover, +.footable .pagination > li > span:hover, +.footable .pagination > li > a:focus, +.footable .pagination > li > span:focus { + color: #23527c; + background-color: #eee; + border-color: #ddd; +} +.footable .pagination > .active > a, +.footable .pagination > .active > span, +.footable .pagination > .active > a:hover, +.footable .pagination > .active > span:hover, +.footable .pagination > .active > a:focus, +.footable .pagination > .active > span:focus { + z-index: 2; + color: #fff; + cursor: default; + background-color: #337ab7; + border-color: #337ab7; +} +.footable .pagination > .disabled > span, +.footable .pagination > .disabled > span:hover, +.footable .pagination > .disabled > span:focus, +.footable .pagination > .disabled > a, +.footable .pagination > .disabled > a:hover, +.footable .pagination > .disabled > a:focus { + color: #777; + cursor: not-allowed; + background-color: #fff; + border-color: #ddd; +} +/* labels */ +.footable .label { + display: inline; + padding: .2em .6em .3em; + font-size: 75%; + font-weight: 700; + line-height: 1; + color: #fff; + text-align: center; + white-space: nowrap; + vertical-align: baseline; + border-radius: .25em; +} +.footable .label-default { + background-color: #777; +} +/* wells */ +.footable-loader.well { + min-height: 20px; + padding: 19px; + margin-bottom: 20px; + background-color: #f5f5f5; + border: 1px solid #e3e3e3; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.05); + box-shadow: inset 0 1px 1px rgba(0,0,0,.05); +} +/* screen reader only */ +.footable .sr-only { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; + clip: rect(0,0,0,0); + border: 0; +} +/* form-inline */ +@media (min-width: 768px) { + .footable .form-inline .form-group { + display:inline-block; + margin-bottom: 0; + vertical-align: middle + } + + .footable .form-inline .form-control { + display: inline-block; + width: auto; + vertical-align: middle + } + + .footable .form-inline .input-group { + display: inline-table; + vertical-align: middle + } + + .footable .form-inline .input-group .input-group-addon, + .footable .form-inline .input-group .input-group-btn, + .footable .form-inline .input-group .form-control { + width: auto + } + + .footable .form-inline .input-group>.form-control { + width: 100% + } +} +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: 0.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 > thead > tr:first-child > th, +table.footable-details > thead > tr:first-child > td, +table.footable-details > tbody > tr:first-child > th, +table.footable-details > tbody > tr:first-child > td, +table.footable-details > tfoot > tr:first-child > th, +table.footable-details > tfoot > tr:first-child > td { + border-top-width: 0; +} +table.footable-details.table-bordered > thead > tr:first-child > th, +table.footable-details.table-bordered > thead > tr:first-child > td, +table.footable-details.table-bordered > tbody > tr:first-child > th, +table.footable-details.table-bordered > tbody > tr:first-child > td, +table.footable-details.table-bordered > tfoot > tr:first-child > th, +table.footable-details.table-bordered > tfoot > tr:first-child > td { + 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: 0.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-empty > td, +table.footable > tbody > tr.footable-empty > th, +table.footable > tbody > tr.footable-detail-row > td, +table.footable > tbody > tr.footable-detail-row > th { + display: table-cell; +} +@-webkit-keyframes fooicon-spin-r { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} + +@keyframes fooicon-spin-r { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} + +.fooicon { + display: inline-block; + font-size: inherit; + font-family: FontAwesome !important; + font-style: normal; + font-weight: 400; + line-height: 1; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + transform: translate(0, 0); +} +.fooicon:before, +.fooicon:after { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.fooicon-loader:before { + content: "\f01e"; +} +.fooicon-plus:before { + content: "\f067"; +} +.fooicon-minus:before { + content: "\f068"; +} +.fooicon-search:before { + content: "\f002"; +} +.fooicon-remove:before { + content: "\f00d"; +} +.fooicon-sort:before { + content: "\f0dc"; +} +.fooicon-sort-asc:before { + content: "\f160"; +} +.fooicon-sort-desc:before { + content: "\f161"; +} +.fooicon-pencil:before { + content: "\f040"; +} +.fooicon-trash:before { + content: "\f1f8"; +} +.fooicon-eye-close:before { + content: "\f070"; +} +.fooicon-flash:before { + content: "\f0e7"; +} +.fooicon-cog:before { + content: "\f013"; +} +.fooicon-stats:before { + content: "\f080"; +} diff --git a/admin/custom/footable3/css/footable.core.standalone.min.css b/admin/custom/footable3/css/footable.core.standalone.min.css new file mode 100644 index 000000000..ca4cdc6d1 --- /dev/null +++ b/admin/custom/footable3/css/footable.core.standalone.min.css @@ -0,0 +1 @@ +.footable .btn,.footable .caret{display:inline-block;vertical-align:middle}.footable-details.table,.footable-details.table *,.footable.table,.footable.table *{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.footable-details.table th,.footable.table th{text-align:left}.footable-details.table,.footable.table{width:100%;max-width:100%;margin-bottom:20px}.footable-details.table>caption+thead>tr:first-child>td,.footable-details.table>caption+thead>tr:first-child>th,.footable-details.table>colgroup+thead>tr:first-child>td,.footable-details.table>colgroup+thead>tr:first-child>th,.footable-details.table>thead:first-child>tr:first-child>td,.footable-details.table>thead:first-child>tr:first-child>th,.footable.table>caption+thead>tr:first-child>td,.footable.table>caption+thead>tr:first-child>th,.footable.table>colgroup+thead>tr:first-child>td,.footable.table>colgroup+thead>tr:first-child>th,.footable.table>thead:first-child>tr:first-child>td,.footable.table>thead:first-child>tr:first-child>th{border-top:0}.footable-details.table>tbody>tr>td,.footable-details.table>tbody>tr>th,.footable-details.table>tfoot>tr>td,.footable-details.table>tfoot>tr>th,.footable-details.table>thead>tr>td,.footable-details.table>thead>tr>th,.footable.table>tbody>tr>td,.footable.table>tbody>tr>th,.footable.table>tfoot>tr>td,.footable.table>tfoot>tr>th,.footable.table>thead>tr>td,.footable.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.footable-details.table>thead>tr>td,.footable-details.table>thead>tr>th,.footable.table>thead>tr>td,.footable.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.footable-details.table-condensed>tbody>tr>td,.footable-details.table-condensed>tbody>tr>th,.footable-details.table-condensed>tfoot>tr>td,.footable-details.table-condensed>tfoot>tr>th,.footable-details.table-condensed>thead>tr>td,.footable-details.table-condensed>thead>tr>th,.footable.table-condensed>tbody>tr>td,.footable.table-condensed>tbody>tr>th,.footable.table-condensed>tfoot>tr>td,.footable.table-condensed>tfoot>tr>th,.footable.table-condensed>thead>tr>td,.footable.table-condensed>thead>tr>th{padding:5px}.footable-details.table-bordered,.footable-details.table-bordered>tbody>tr>td,.footable-details.table-bordered>tbody>tr>th,.footable-details.table-bordered>tfoot>tr>td,.footable-details.table-bordered>tfoot>tr>th,.footable-details.table-bordered>thead>tr>td,.footable-details.table-bordered>thead>tr>th,.footable.table-bordered,.footable.table-bordered>tbody>tr>td,.footable.table-bordered>tbody>tr>th,.footable.table-bordered>tfoot>tr>td,.footable.table-bordered>tfoot>tr>th,.footable.table-bordered>thead>tr>td,.footable.table-bordered>thead>tr>th{border:1px solid #ddd}.footable-details.table-bordered>thead>tr>td,.footable-details.table-bordered>thead>tr>th,.footable.table-bordered>thead>tr>td,.footable.table-bordered>thead>tr>th{border-bottom-width:2px}.footable-details.table-striped>tbody>tr:nth-child(odd),.footable.table-striped>tbody>tr:nth-child(odd){background-color:#f9f9f9}.footable-details.table-hover>tbody>tr:hover,.footable.table-hover>tbody>tr:hover{background-color:#f5f5f5}.footable .btn{padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-appearance:button;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px;overflow:visible;text-transform:none}.footable .btn.focus,.footable .btn:focus,.footable .btn:hover{color:#333;text-decoration:none}.footable .btn-default{color:#333;background-color:#fff;border-color:#ccc}.footable .btn-default.active,.footable .btn-default.focus,.footable .btn-default:active,.footable .btn-default:focus,.footable .btn-default:hover,.footable .open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.footable .btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.footable .btn-primary.active,.footable .btn-primary.focus,.footable .btn-primary:active,.footable .btn-primary:focus,.footable .btn-primary:hover,.footable .open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.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}.footable .caret{width:0;height:0;margin-left:2px;border-top:4px solid;border-right:4px solid transparent;border-left:4px solid transparent}.footable .btn .caret{margin-left:0}.form-group{margin-bottom:15px}.footable .form-control{display:block;width:100%;height:34px;padding:6px 12px;margin:0;font-family:inherit;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.footable .input-group{position:relative;display:table;border-collapse:separate}.footable .input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.footable .input-group-btn{position:relative;font-size:0}.footable .input-group-addon,.footable .input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.footable .input-group .form-control,.footable .input-group-addon,.footable .input-group-btn{display:table-cell}.footable .input-group-btn:last-child>.btn,.footable .input-group-btn:last-child>.btn-group,.footable .input-group-btn>.btn+.btn{margin-left:-1px}.footable .input-group-btn>.btn{position:relative}.footable .input-group-btn>.btn:active,.footable .input-group-btn>.btn:focus,.footable .input-group-btn>.btn:hover{z-index:2}.footable .input-group .form-control:first-child,.footable .input-group-addon:first-child,.footable .input-group-btn:first-child>.btn,.footable .input-group-btn:first-child>.btn-group>.btn,.footable .input-group-btn:first-child>.dropdown-toggle,.footable .input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.footable .input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.footable .input-group .form-control:last-child,.footable .input-group-addon:last-child,.footable .input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.footable .input-group-btn:first-child>.btn:not(:first-child),.footable .input-group-btn:last-child>.btn,.footable .input-group-btn:last-child>.btn-group>.btn,.footable .input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.footable .checkbox,.footable .radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.footable .checkbox label,.footable .radio label{max-width:100%;min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.footable .checkbox input[type=checkbox],.footable .checkbox-inline input[type=checkbox],.footable .radio input[type=radio],.footable .radio-inline input[type=radio]{position:absolute;margin:4px 0 0 -20px;line-height:normal}.footable .dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.footable .open>.dropdown-menu{display:block}.footable .dropdown-menu-right{right:0;left:auto}.footable .dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.footable .dropdown-menu>li>a:focus,.footable .dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.footable .pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.footable .pagination>li{display:inline}.footable .pagination>li:first-child>a,.footable .pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.footable .pagination>li>a,.footable .pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.footable .pagination>li>a:focus,.footable .pagination>li>a:hover,.footable .pagination>li>span:focus,.footable .pagination>li>span:hover{color:#23527c;background-color:#eee;border-color:#ddd}.footable .pagination>.active>a,.footable .pagination>.active>a:focus,.footable .pagination>.active>a:hover,.footable .pagination>.active>span,.footable .pagination>.active>span:focus,.footable .pagination>.active>span:hover{z-index:2;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.footable .pagination>.disabled>a,.footable .pagination>.disabled>a:focus,.footable .pagination>.disabled>a:hover,.footable .pagination>.disabled>span,.footable .pagination>.disabled>span:focus,.footable .pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.footable .label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}.footable .label-default{background-color:#777}.footable-loader.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.footable .sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}@media (min-width:768px){.footable .form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.footable .form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.footable .form-inline .input-group{display:inline-table;vertical-align:middle}.footable .form-inline .input-group .form-control,.footable .form-inline .input-group .input-group-addon,.footable .form-inline .input-group .input-group-btn{width:auto}.footable .form-inline .input-group>.form-control{width:100%}}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{display:inline-block;font-size:inherit;font-family:FontAwesome!important;font-style:normal;font-weight:400;line-height:1;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;transform:translate(0,0)}.fooicon:after,.fooicon:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.fooicon-loader:before{content:"\f01e"}.fooicon-plus:before{content:"\f067"}.fooicon-minus:before{content:"\f068"}.fooicon-search:before{content:"\f002"}.fooicon-remove:before{content:"\f00d"}.fooicon-sort:before{content:"\f0dc"}.fooicon-sort-asc:before{content:"\f160"}.fooicon-sort-desc:before{content:"\f161"}.fooicon-pencil:before{content:"\f040"}.fooicon-trash:before{content:"\f1f8"}.fooicon-eye-close:before{content:"\f070"}.fooicon-flash:before{content:"\f0e7"}.fooicon-cog:before{content:"\f013"}.fooicon-stats:before{content:"\f080"} \ No newline at end of file diff --git a/admin/custom/footable3/css/footable.editing.css b/admin/custom/footable3/css/footable.editing.css new file mode 100644 index 000000000..e99197c38 --- /dev/null +++ b/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; +} diff --git a/admin/custom/footable3/css/footable.editing.min.css b/admin/custom/footable3/css/footable.editing.min.css new file mode 100644 index 000000000..5bce15bd5 --- /dev/null +++ b/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} \ No newline at end of file diff --git a/admin/custom/footable3/css/footable.filtering.css b/admin/custom/footable3/css/footable.filtering.css index 8ffa73352..4f1800638 100644 --- a/admin/custom/footable3/css/footable.filtering.css +++ b/admin/custom/footable3/css/footable.filtering.css @@ -1,55 +1,55 @@ -/* -* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome. -* @version 3.0.6 -* @link http://fooplugins.com -* @copyright Steven Usher & Brad Vincent 2015 -* @license Released under the GPLv3 license. -*/ -table.footable > thead > tr.footable-filtering > th { - border-bottom-width: 1px; - font-weight: normal; -} -table.footable > thead > tr.footable-filtering > th, -table.footable.footable-filtering-right > thead > tr.footable-filtering > th { - text-align: right; -} -table.footable.footable-filtering-left > thead > tr.footable-filtering > th { - text-align: left; -} -table.footable.footable-filtering-center > thead > tr.footable-filtering > th { - text-align: center; -} -table.footable > thead > tr.footable-filtering > th div.form-group { - margin-bottom: 0; -} -table.footable > thead > tr.footable-filtering > th div.form-group+div.form-group { - margin-top: 5px; -} -table.footable > thead > tr.footable-filtering > th div.input-group { - width: 100%; -} -table.footable > thead > tr.footable-filtering > th ul.dropdown-menu > li > a.checkbox { - margin: 0; - display: block; - position: relative; -} -table.footable > thead > tr.footable-filtering > th ul.dropdown-menu > li > a.checkbox > label { - display: block; - padding-left: 20px; -} -table.footable > thead > tr.footable-filtering > th ul.dropdown-menu > li > a.checkbox input[type="checkbox"] { - position: absolute; - margin-left: -20px; -} -@media (min-width: 768px) { - table.footable > thead > tr.footable-filtering > th div.input-group { - width: auto; - } - table.footable > thead > tr.footable-filtering > th div.form-group { - margin-left: 2px; - margin-right: 2px; - } - table.footable > thead > tr.footable-filtering > th div.form-group+div.form-group { - margin-top: 0; - } +/* +* 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. +*/ +table.footable > thead > tr.footable-filtering > th { + border-bottom-width: 1px; + font-weight: normal; +} +table.footable > thead > tr.footable-filtering > th, +table.footable.footable-filtering-right > thead > tr.footable-filtering > th { + text-align: right; +} +table.footable.footable-filtering-left > thead > tr.footable-filtering > th { + text-align: left; +} +table.footable.footable-filtering-center > thead > tr.footable-filtering > th { + text-align: center; +} +table.footable > thead > tr.footable-filtering > th div.form-group { + margin-bottom: 0; +} +table.footable > thead > tr.footable-filtering > th div.form-group+div.form-group { + margin-top: 5px; +} +table.footable > thead > tr.footable-filtering > th div.input-group { + width: 100%; +} +table.footable > thead > tr.footable-filtering > th ul.dropdown-menu > li > a.checkbox { + margin: 0; + display: block; + position: relative; +} +table.footable > thead > tr.footable-filtering > th ul.dropdown-menu > li > a.checkbox > label { + display: block; + padding-left: 20px; +} +table.footable > thead > tr.footable-filtering > th ul.dropdown-menu > li > a.checkbox input[type="checkbox"] { + position: absolute; + margin-left: -20px; +} +@media (min-width: 768px) { + table.footable > thead > tr.footable-filtering > th div.input-group { + width: auto; + } + table.footable > thead > tr.footable-filtering > th div.form-group { + margin-left: 2px; + margin-right: 2px; + } + table.footable > thead > tr.footable-filtering > th div.form-group+div.form-group { + margin-top: 0; + } } \ No newline at end of file diff --git a/admin/custom/footable3/css/footable.paging.css b/admin/custom/footable3/css/footable.paging.css index 65e5d7055..f3e111dde 100644 --- a/admin/custom/footable3/css/footable.paging.css +++ b/admin/custom/footable3/css/footable.paging.css @@ -1,31 +1,31 @@ -/* -* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome. -* @version 3.0.6 -* @link http://fooplugins.com -* @copyright Steven Usher & Brad Vincent 2015 -* @license Released under the GPLv3 license. -*/ -table.footable > tfoot > tr.footable-paging > td > ul.pagination { - margin: 10px 0 0 0; -} -table.footable > tfoot > tr.footable-paging > td > span.label { - display: inline-block; - margin: 0 0 10px 0; - padding: 4px 10px; -} -table.footable > tfoot > tr.footable-paging > td, -table.footable-paging-center > tfoot > tr.footable-paging > td { - text-align: center; -} -table.footable-paging-left > tfoot > tr.footable-paging > td { - text-align: left; -} -table.footable-paging-right > tfoot > tr.footable-paging > td { - text-align: right; -} -ul.pagination > li.footable-page { - display: none; -} -ul.pagination > li.footable-page.visible { - display: inline; +/* +* 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. +*/ +table.footable > tfoot > tr.footable-paging > td > ul.pagination { + margin: 10px 0 0 0; +} +table.footable > tfoot > tr.footable-paging > td > span.label { + display: inline-block; + margin: 0 0 10px 0; + padding: 4px 10px; +} +table.footable > tfoot > tr.footable-paging > td, +table.footable-paging-center > tfoot > tr.footable-paging > td { + text-align: center; +} +table.footable-paging-left > tfoot > tr.footable-paging > td { + text-align: left; +} +table.footable-paging-right > tfoot > tr.footable-paging > td { + text-align: right; +} +ul.pagination > li.footable-page { + display: none; +} +ul.pagination > li.footable-page.visible { + display: inline; } \ No newline at end of file diff --git a/admin/custom/footable3/css/footable.sorting.css b/admin/custom/footable3/css/footable.sorting.css index 6548d49f7..8dce90d89 100644 --- a/admin/custom/footable3/css/footable.sorting.css +++ b/admin/custom/footable3/css/footable.sorting.css @@ -1,32 +1,46 @@ -/* -* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome. -* @version 3.0.6 -* @link http://fooplugins.com -* @copyright Steven Usher & Brad Vincent 2015 -* @license Released under the GPLv3 license. -*/ -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 0.3s ease-in; -} -td.footable-sortable:hover > span.fooicon, -th.footable-sortable:hover > span.fooicon { - opacity: 1; -} -td.footable-sortable.footable-asc > span.fooicon, -th.footable-sortable.footable-asc > span.fooicon, -td.footable-sortable.footable-desc > span.fooicon, -th.footable-sortable.footable-desc > span.fooicon { - opacity: 1; +/* +* 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. +*/ +table.footable > thead > tr > td.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; +} +td.footable-sortable > span.fooicon, +th.footable-sortable > span.fooicon { + position: absolute; + right: 6px; + top: 50%; + margin-top: -7px; + opacity: 0; + transition: opacity 0.3s ease-in; +} +td.footable-sortable:hover > span.fooicon, +th.footable-sortable:hover > span.fooicon { + opacity: 1; +} +td.footable-sortable.footable-asc > span.fooicon, +th.footable-sortable.footable-asc > span.fooicon, +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; } \ No newline at end of file diff --git a/admin/custom/footable3/css/footable.sorting.min.css b/admin/custom/footable3/css/footable.sorting.min.css index d976dfa54..1592c940b 100644 --- a/admin/custom/footable3/css/footable.sorting.min.css +++ b/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} \ No newline at end of file +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} \ No newline at end of file diff --git a/admin/custom/footable3/js/footable.core.js b/admin/custom/footable3/js/footable.core.js index a8a8e97b9..7bab629e5 100644 --- a/admin/custom/footable3/js/footable.core.js +++ b/admin/custom/footable3/js/footable.core.js @@ -1,3248 +1,3507 @@ -/* -* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome. -* @version 3.0.6 -* @link http://fooplugins.com -* @copyright Steven Usher & Brad Vincent 2015 -* @license Released under the GPLv3 license. -*/ -(function($, F){ - // add in console we use in case it's missing - window.console = window.console || { log:function(){}, error:function(){} }; - - /** - * The jQuery plugin initializer. - * @function jQuery.fn.footable - * @param {(object|FooTable.Defaults)} [options] - The options to initialize the plugin with. - * @param {function} [ready] - A callback function to execute for each initialized plugin. - * @returns {jQuery} - */ - $.fn.footable = function (options, ready) { - options = options || {}; - // make sure we only work with tables - return this.filter('table').each(function (i, tbl) { - var ft = F.get(tbl); - if (ft instanceof F.Table) ft.destroy(); - F.init(tbl, options, ready); - }); - }; - - var debug_defaults = { - events: [] - }; - F.__debug__ = JSON.parse(localStorage.getItem('footable_debug')) || false; - F.__debug_options__ = JSON.parse(localStorage.getItem('footable_debug_options')) || debug_defaults; - - /** - * Gets or sets the internal debug variable which enables some additional logging to the console. - * When enabled this value is stored in the localStorage so it can persist across page reloads. - * @param {boolean} value - Whether or not to enable additional logging. - * @param {object} [options] - Any debug specific options. - * @returns {(boolean|undefined)} - */ - F.debug = function(value, options){ - if (!F.is.boolean(value)) return F.__debug__; - F.__debug__ = value; - if (F.__debug__){ - localStorage.setItem('footable_debug', JSON.stringify(F.__debug__)); - F.__debug_options__ = $.extend(true, {}, debug_defaults, options || {}); - if (F.is.hash(options)){ - localStorage.setItem('footable_debug_options', JSON.stringify(F.__debug_options__)); - } - } else { - localStorage.removeItem('footable_debug'); - localStorage.removeItem('footable_debug_options'); - } - }; - - /** - * Gets the FooTable instance of the supplied table if one exists. - * @param {(jQuery|jQuery.selector|HTMLTableElement)} table - The jQuery table object, selector or the HTMLTableElement to retrieve FooTable from. - * @returns {(FooTable.Table|undefined)} - */ - F.get = function(table){ - return $(table).first().data('__FooTable__'); - }; - - /** - * Initializes a new instance of FooTable on the supplied table. - * @param {(jQuery|jQuery.selector|HTMLTableElement)} table - The jQuery table object, selector or the HTMLTableElement to initialize FooTable on. - * @param {object} options - The options to initialize FooTable with. - * @param {function} [ready] - A callback function to execute once the plugin is initialized. - * @returns {FooTable.Table} - */ - F.init = function(table, options, ready){ - return new F.Table(table, options, ready); - }; - - // The below are external type definitions mainly used as pointers to jQuery docs for important information - /** - * jQuery is a fast, small, and feature-rich JavaScript library. It makes things like HTML document traversal and manipulation, event handling, animation, and Ajax much simpler with an easy-to-use API - * that works across a multitude of browsers. With a combination of versatility and extensibility, jQuery has changed the way that millions of people write JavaScript. - * @name jQuery - * @constructor - * @returns {jQuery} - * @see {@link http://api.jquery.com/} - */ - - /** - * This object provides a subset of the methods of the Deferred object (then, done, fail, always, pipe, and state) to prevent users from changing the state of the Deferred. - * @typedef {object} jQuery.Promise - * @see {@link http://api.jquery.com/Types/#Promise} - */ - - /** - * As of jQuery 1.5, the Deferred object provides a way to register multiple callbacks into self-managed callback queues, invoke callback queues as appropriate, - * and relay the success or failure state of any synchronous or asynchronous function. - * @typedef {object} jQuery.Deferred - * @see {@link http://api.jquery.com/Types/#Deferred} - */ - - /** - * jQuery's event system normalizes the event object according to W3C standards. The event object is guaranteed to be passed to the event handler. Most properties from - * the original event are copied over and normalized to the new event object. - * @typedef {object} jQuery.Event - * @see {@link http://api.jquery.com/category/events/event-object/} - */ - - /** - * Provides a way to execute callback functions based on one or more objects, usually Deferred objects that represent asynchronous events. - * @memberof jQuery - * @function when - * @param {...jQuery.Deferred} deferreds - Any number of deferred objects to wait for. - * @returns {jQuery.Promise} - * @see {@link http://api.jquery.com/jQuery.when/} - */ - - /** - * The jQuery.fn namespace used to register plugins with jQuery. - * @memberof jQuery - * @namespace fn - * @see {@link http://learn.jquery.com/plugins/basic-plugin-creation/} - */ -})( - jQuery, - /** - * The core FooTable namespace containing all the plugin code. - * @namespace - */ - FooTable = window.FooTable || {} -); -(function(F){ - var returnTrue = function(){ return true; }; - - /** - * This namespace contains commonly used array utility methods. - * @namespace {object} FooTable.arr - */ - F.arr = {}; - - /** - * Iterates over each item in the supplied array and performs the supplied function passing in the current item as the first argument. - * @memberof FooTable.arr - * @function each - * @param {Array} array - The array to iterate - * @param {function} func - The function to execute for each item. The first argument supplied to this function is the current item and the second is the current index. - */ - F.arr.each = function (array, func) { - if (!F.is.array(array) || !F.is.fn(func)) return; - for (var i = 0, len = array.length; i < len; i++) { - if (func(array[i], i) === false) break; - } - }; - - /** - * Get all items in the supplied array that optionally matches the supplied where function. If no items are found an empty array is returned. - * @memberof FooTable.arr - * @function get - * @param {Array} array - The array to get items from. - * @param {function} where - This function must return a boolean value, true includes the item in the result array. - * @returns {Array} - */ - F.arr.get = function (array, where) { - var result = []; - if (!F.is.array(array)) return result; - if (!F.is.fn(where)) return array; - for (var i = 0, len = array.length; i < len; i++) { - if (where(array[i], i)) result.push(array[i]); - } - return result; - }; - - /** - * Get a boolean value indicating if any item exists in the supplied array that optionally matches the supplied where function. - * @memberof FooTable.arr - * @function any - * @param {Array} array - The array to check. - * @param {function} [where] - [Optional] This function must return a boolean value, true indicates that the current item is a valid match. - * @returns {boolean} - */ - F.arr.any = function (array, where) { - if (!F.is.array(array)) return false; - where = F.is.fn(where) ? where : returnTrue; - for (var i = 0, len = array.length; i < len; i++) { - if (where(array[i], i)) return true; - } - return false; - }; - - /** - * Checks if the supplied value exists in the array. - * @memberof FooTable.arr - * @function contains - * @param {Array} array - The array to check. - * @param {*} value - The value to check for. - * @returns {boolean} - */ - F.arr.contains = function(array, value){ - if (!F.is.array(array) || F.is.undef(value)) return false; - for (var i = 0, len = array.length; i < len; i++) { - if (array[i] == value) return true; - } - return false; - }; - - /** - * Get the first item in the supplied array that optionally matches the supplied where function. If no item is found null is returned. - * @memberof FooTable.arr - * @function first - * @param {Array} array - The array to get the item from. - * @param {function} [where] - [Optional] This function must return a boolean value, true indicates that the current item can be returned. - * @returns {(*|null)} - */ - F.arr.first = function (array, where) { - if (!F.is.array(array)) return null; - where = F.is.fn(where) ? where : returnTrue; - for (var i = 0, len = array.length; i < len; i++) { - if (where(array[i], i)) return array[i]; - } - return null; - }; - - /** - * Creates a new array from the results of the supplied getter function. If no items are found an empty array is returned, to exclude an item from the results return null. - * @memberof FooTable.arr - * @function map - * @param {Array} array - The array to iterate. - * @param {function} getter - This function must return either a new value or null. - * The first argument is the result being returned at this point in the iteration. The second argument is the current item being iterated. - * @returns {(*|null)} - */ - F.arr.map = function (array, getter) { - var result = [], returned = null; - if (!F.is.array(array) || !F.is.fn(getter)) return result; - for (var i = 0, len = array.length; i < len; i++) { - if ((returned = getter(array[i], i)) != null) result.push(returned); - } - return result; - }; - - /** - * Removes items from the array matching the supplied where function. All removed items are returned in a new array. - * @memberof FooTable.arr - * @function remove - * @param {Array} array - The array to iterate and remove items from. - * @param {function} where - This function must return a boolean value, true includes the item in the result array. - * @returns {*} - */ - F.arr.remove = function (array, where) { - var remove = [], removed = []; - if (!F.is.array(array) || !F.is.fn(where)) return removed; - var i = 0, len = array.length; - for (; i < len; i++) { - if (where(array[i], i, removed)){ - remove.push(i); - removed.push(array[i]); - } - } - // sort the indexes to be removed from largest to smallest - remove.sort(function(a, b){ return b - a; }); - i = 0; len = remove.length; - for(; i < len; i++){ - var index = remove[i] - i; - array.splice(index, 1); - } - return removed; - }; - - /** - * Deletes a single item from the array. The item if removed is returned. - * @memberof FooTable.arr - * @function delete - * @param {Array} array - The array to iterate and delete the item from. - * @param {*} item - The item to find and delete. - * @returns {(*|null)} - */ - F.arr.delete = function(array, item){ - var remove = -1, removed = null; - if (!F.is.array(array) || F.is.undef(item)) return removed; - var i = 0, len = array.length; - for (; i < len; i++) { - if (array[i] == item){ - remove = i; - removed = array[i]; - break; - } - } - if (remove != -1) array.splice(remove, 1); - return removed; - }; - - /** - * Replaces a single item in the array with a new one. - * @memberof FooTable.arr - * @function replace - * @param {Array} array - The array to iterate and replace the item in. - * @param {*} oldItem - The item to be replaced. - * @param {*} newItem - The item to be inserted. - */ - F.arr.replace = function(array, oldItem, newItem){ - var index = array.indexOf(oldItem); - if (index !== -1) array[index] = newItem; - }; - -})(FooTable); -(function (F) { - - /** - * This namespace contains commonly used 'is' type methods that return boolean values. - * @namespace FooTable.is - */ - F.is = {}; - - /** - * Checks if the type of the value is the same as that supplied. - * @memberof FooTable.is - * @function type - * @param {*} value - The value to check the type of. - * @param {string} type - The type to check for. - * @returns {boolean} - */ - F.is.type = function (value, type) { - return typeof value === type; - }; - - /** - * Checks if the value is defined. - * @memberof FooTable.is - * @function defined - * @param {*} value - The value to check is defined. - * @returns {boolean} - */ - F.is.defined = function (value) { - return typeof value !== 'undefined'; - }; - - /** - * Checks if the value is undefined. - * @memberof FooTable.is - * @function undef - * @param {*} value - The value to check is undefined. - * @returns {boolean} - */ - F.is.undef = function (value) { - return typeof value === 'undefined'; - }; - - /** - * Checks if the value is an array. - * @memberof FooTable.is - * @function array - * @param {*} value - The value to check. - * @returns {boolean} - */ - F.is.array = function (value) { - return '[object Array]' === Object.prototype.toString.call(value); - }; - - /** - * Checks if the value is a date. - * @memberof FooTable.is - * @function date - * @param {*} value - The value to check. - * @returns {boolean} - */ - F.is.date = function (value) { - return '[object Date]' === Object.prototype.toString.call(value) && !isNaN(value.getTime()); - }; - - /** - * Checks if the value is a boolean. - * @memberof FooTable.is - * @function boolean - * @param {*} value - The value to check. - * @returns {boolean} - */ - F.is.boolean = function (value) { - return '[object Boolean]' === Object.prototype.toString.call(value); - }; - - /** - * Checks if the value is a string. - * @memberof FooTable.is - * @function string - * @param {*} value - The value to check. - * @returns {boolean} - */ - F.is.string = function (value) { - return '[object String]' === Object.prototype.toString.call(value); - }; - - /** - * Checks if the value is a number. - * @memberof FooTable.is - * @function number - * @param {*} value - The value to check. - * @returns {boolean} - */ - F.is.number = function (value) { - return '[object Number]' === Object.prototype.toString.call(value) && !isNaN(value); - }; - - /** - * Checks if the value is a function. - * @memberof FooTable.is - * @function fn - * @param {*} value - The value to check. - * @returns {boolean} - */ - F.is.fn = function (value) { - return (F.is.defined(window) && value === window.alert) || '[object Function]' === Object.prototype.toString.call(value); - }; - - /** - * Checks if the value is an error. - * @memberof FooTable.is - * @function error - * @param {*} value - The value to check. - * @returns {boolean} - */ - F.is.error = function (value) { - return '[object Error]' === Object.prototype.toString.call(value); - }; - - /** - * Checks if the value is an object. - * @memberof FooTable.is - * @function object - * @param {*} value - The value to check. - * @returns {boolean} - */ - F.is.object = function (value) { - return '[object Object]' === Object.prototype.toString.call(value); - }; - - /** - * Checks if the value is a hash. - * @memberof FooTable.is - * @function hash - * @param {*} value - The value to check. - * @returns {boolean} - */ - F.is.hash = function (value) { - return F.is.object(value) && value.constructor === Object && !value.nodeType && !value.setInterval; - }; - - /** - * Checks if the supplied object is an HTMLElement - * @memberof FooTable.is - * @function element - * @param {object} obj - The object to check. - * @returns {boolean} - */ - F.is.element = function (obj) { - return typeof HTMLElement === 'object' - ? obj instanceof HTMLElement - : obj && typeof obj === 'object' && obj !== null && obj.nodeType === 1 && typeof obj.nodeName === 'string'; - }; - - /** - * This is a simple check to determine if an object is a jQuery promise object. It simply checks the object has a "then" and "promise" function defined. - * The promise object is created as an object literal inside of jQuery.Deferred. - * It has no prototype, nor any other truly unique properties that could be used to distinguish it. - * This method should be a little more accurate than the internal jQuery one that simply checks for a "promise" method. - * @memberof FooTable.is - * @function promise - * @param {object} obj - The object to check. - * @returns {boolean} - */ - F.is.promise = function(obj){ - return F.is.object(obj) && F.is.fn(obj.then) && F.is.fn(obj.promise); - }; - - /** - * Checks if the supplied object is an instance of a jQuery object. - * @memberof FooTable.is - * @function jq - * @param {object} obj - The object to check. - * @returns {boolean} - */ - F.is.jq = function(obj){ - return F.is.defined(window.jQuery) && obj instanceof jQuery && obj.length > 0; - }; - - /** - * Checks if the supplied object is a moment.js date object. - * @memberof FooTable.is - * @function moment - * @param {object} obj - The object to check. - * @returns {boolean} - */ - F.is.moment = function(obj){ - return F.is.defined(window.moment) && F.is.object(obj) && F.is.boolean(obj._isAMomentObject) - }; - - /** - * Checks if the supplied value is an object and if it is empty. - * @memberof FooTable.is - * @function emptyObject - * @param {*} value - The value to check. - * @returns {boolean} - */ - F.is.emptyObject = function(value){ - if (!F.is.hash(value)) return false; - for(var prop in value) { - if(value.hasOwnProperty(prop)) - return false; - } - return true; - }; - - /** - * Checks if the supplied value is an array and if it is empty. - * @memberof FooTable.is - * @function emptyArray - * @param {*} value - The value to check. - * @returns {boolean} - */ - F.is.emptyArray = function(value){ - return F.is.array(value) ? value.length === 0 : true; - }; - - /** - * Checks if the supplied value is a string and if it is empty. - * @memberof FooTable.is - * @function emptyString - * @param {*} value - The value to check. - * @returns {boolean} - */ - F.is.emptyString = function(value){ - return F.is.string(value) ? value.length === 0 : true; - }; - - /** - * Whether or not we are on a mobile device. - */ - F.is.mobile = (function(a){ - return (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a) - ||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))); - })(navigator.userAgent||navigator.vendor||window.opera); - -})(FooTable); -(function (F) { - /** - * This namespace contains commonly used string utility methods. - * @namespace FooTable.str - */ - F.str = {}; - - /** - * Checks if the supplied string contains the given substring. - * @memberof FooTable.str - * @function contains - * @param {string} str - The string to check. - * @param {string} contains - The string to check for. - * @param {boolean} [ignoreCase] - Whether or not to ignore casing when performing the check. - * @returns {boolean} - */ - F.str.contains = function (str, contains, ignoreCase) { - return !F.is.emptyString(str) - && !F.is.emptyString(contains) && contains.length <= str.length - && (ignoreCase ? str.toUpperCase().indexOf(contains.toUpperCase()) : str.indexOf(contains)) !== -1; - }; - - /** - * Checks if the supplied string contains the given word. - * @memberof FooTable.str - * @function containsWord - * @param {string} str - The string to check. - * @param {string} word - The word to check for. - * @param {boolean} [ignoreCase] - Whether or not to ignore casing when performing the check. - * @returns {boolean} - */ - F.str.containsWord = function(str, word, ignoreCase){ - if (F.is.emptyString(str) || F.is.emptyString(word) || str.length < word.length) - return false; - var parts = str.split(/\W/); - for (var i = 0, len = parts.length; i < len; i++){ - if (ignoreCase ? parts[i].toUpperCase() == word.toUpperCase() : parts[i] == word) return true; - } - return false; - }; - - /** - * Returns the remainder of a string split on the first index of the given substring. - * @memberof FooTable.str - * @function from - * @param {string} str - The string to split. - * @param {string} from - The substring to split on. - * @returns {string} - */ - F.str.from = function (str, from) { - return this.contains(str, from) ? str.substring(str.indexOf(from) + 1) : str; - }; - - /** - * Checks if a string starts with the supplied prefix. - * @memberof FooTable.str - * @function startsWith - * @param {string} str - The string to check. - * @param {string} prefix - The prefix to check for. - * @returns {boolean} - */ - F.str.startsWith = function (str, prefix) { - return str.slice(0, prefix.length) == prefix; - }; - - /** - * Takes the supplied string and converts it to camel case. - * @memberof FooTable.str - * @function toCamelCase - * @param {string} str - The string to camel case. - * @returns {string} - */ - F.str.toCamelCase = function (str) { - if (str.toUpperCase() === str) return str.toLowerCase(); - return str.replace(/^([A-Z])|[-\s_](\w)/g, function (match, p1, p2) { - if (p2) return p2.toUpperCase(); - return p1.toLowerCase(); - }); - }; - - /** - * Generates a random string 9 characters long using the optional prefix if supplied. - * @memberof FooTable.str - * @function random - * @param {string} [prefix] - The prefix to append to the 9 random characters. - * @returns {string} - */ - F.str.random = function(prefix){ - prefix = F.is.emptyString(prefix) ? '' : prefix; - return prefix + Math.random().toString(36).substr(2, 9); - }; - - /** - * Escapes a string for use in a regular expression. - * @param {string} str - The string to escape. - * @returns {string} - */ - F.str.escapeRegExp = function(str){ - return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); - }; - -})(FooTable); -(function (F) { - "use strict"; - - if (!Object.create) { - Object.create = (function () { - var Object = function () {}; - return function (prototype) { - if (arguments.length > 1) - throw Error('Second argument not supported'); - - if (!F.is.object(prototype)) - throw TypeError('Argument must be an object'); - - Object.prototype = prototype; - var result = new Object(); - Object.prototype = null; - return result; - }; - })(); - } - - /** - * This base implementation does nothing except provide access to the {@link FooTable.Class#extend} method. - * @constructs FooTable.Class - * @classdesc This class is based off of John Resig's [Simple JavaScript Inheritance]{@link http://ejohn.org/blog/simple-javascript-inheritance} but it has been updated to be ES 5.1 - * compatible by implementing an [Object.create polyfill]{@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/create#Polyfill} - * for older browsers. - * @see {@link http://ejohn.org/blog/simple-javascript-inheritance} - * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/create#Polyfill} - * @returns {FooTable.Class} - */ - function Class() {} - - var __extendable__ = /xyz/.test(function () {xyz;}) ? /\b_super\b/ : /.*/; - - // this._super() within the context of the new function is a pointer to the original function - // except if the hook param is specified then the this._super variable is the result of the original function - Class.__extend__ = function(proto, name, func, original){ - // to all who venture here, here be dragons! - proto[name] = F.is.fn(original) && __extendable__.test(func) ? - (function (name, fn) { - return function () { - var tmp, ret; - tmp = this._super; - this._super = original; - ret = fn.apply(this, arguments); - this._super = tmp; - return ret; - }; - })(name, func) : func; - }; - - /** - * Creates a new class that inherits from this class which in turn allows itself to be extended or if a name and function is supplied extends only that specific function on the class. - * @param {(object|string)} arg1 - An object containing any new methods/members to implement or the name of the method to extend. - * @param {function} arg2 - If the first argument is a method name then this is the new function to replace it with. - * @returns {FooTable.Class} A new class that inherits from the base class. - * @example The below shows an example of how to implement inheritance using this method. - * var Person = FooTable.Class.extend({ - * construct: function(isDancing){ - * this.dancing = isDancing; - * }, - * dance: function(){ - * return this.dancing; - * } - * }); - * - * var Ninja = Person.extend({ - * construct: function(){ - * this._super( false ); - * }, - * dance: function(){ - * // Call the inherited version of dance() - * return this._super(); - * }, - * swingSword: function(){ - * return true; - * } - * }); - * - * var p = new Person(true); - * p.dance(); // => true - * - * var n = new Ninja(); - * n.dance(); // => false - * n.swingSword(); // => true - * - * // Should all be true - * p instanceof Person && p instanceof FooTable.Class && - * n instanceof Ninja && n instanceof Person && n instanceof FooTable.Class - */ - Class.extend = function (arg1 , arg2) { - var args = Array.prototype.slice.call(arguments); - arg1 = args.shift(); - arg2 = args.shift(); - - function __extend__(proto, name, func, original){ - // to all who venture here, here be dragons! - proto[name] = F.is.fn(original) && __extendable__.test(func) ? - (function (name, fn, ofn) { - return function () { - var tmp, ret; - tmp = this._super; - this._super = ofn; - ret = fn.apply(this, arguments); - this._super = tmp; - return ret; - }; - })(name, func, original) : func; - } - - if (F.is.hash(arg1)){ - var proto = Object.create(this.prototype), - _super = this.prototype; - for (var name in arg1) { - if (name === '__ctor__') continue; - __extend__(proto, name, arg1[name], _super[name]); - } - var obj = F.is.fn(proto.__ctor__) ? proto.__ctor__ : function () { - if (!F.is.fn(this.construct)) - throw new SyntaxError('FooTable class objects must be constructed with the "new" keyword.'); - this.construct.apply(this, arguments); - }; - proto.construct = F.is.fn(proto.construct) ? proto.construct : function(){}; - obj.prototype = proto; - proto.constructor = obj; - obj.extend = Class.extend; - return obj; - } else if (F.is.string(arg1) && F.is.fn(arg2)) { - __extend__(this.prototype, arg1, arg2, this.prototype[arg1]); - } - }; - - F.Class = Class; - - F.ClassFactory = F.Class.extend(/** @lends FooTable.ClassFactory */{ - /** - * This is a simple factory for {@link FooTable.Class} objects allowing them to be registered using a friendly name - * and then new instances can be created using this friendly name. - * @constructs - * @extends FooTable.Class - * @returns {FooTable.ClassFactory} - * @this FooTable.ClassFactory - */ - construct: function(){ - /** - * An object containing all registered classes. - * @type {{}} - */ - this.registered = {}; - }, - /** - * Checks if the factory contains a class registered using the supplied name. - * @instance - * @param {string} name - The name of the class to check. - * @returns {boolean} - * @this FooTable.ClassFactory - */ - contains: function(name){ - return F.is.defined(this.registered[name]); - }, - /** - * Gets an array of all registered names. - * @instance - * @returns {Array.} - * @this FooTable.ClassFactory - */ - names: function(){ - var names = [], name; - for (name in this.registered){ - if (!this.registered.hasOwnProperty(name)) continue; - names.push(name); - } - return names; - }, - /** - * Registers a class object using the supplied friendly name and priority. The priority is only taken into account when loading all registered classes - * using the {@link FooTable.ClassFactory#load} method. - * @instance - * @param {string} name - The friendly name of the class. - * @param {function} klass - The class to register. - * @param {number} priority - This determines the order that the class is created when using the {@link FooTable.ClassFactory#load} method, higher values are loaded first. - * @this FooTable.ClassFactory - */ - register: function(name, klass, priority){ - if (!F.is.string(name) || !F.is.fn(klass)) return; - var current = this.registered[name]; - this.registered[name] = { - name: name, - klass: klass, - priority: F.is.number(priority) ? priority : (F.is.defined(current) ? current.priority : 0) - }; - }, - /** - * Creates new instances of all registered classes using there priority and the supplied arguments to return them in an array. - * @instance - * @param {*} arg1 - The first argument to supply when creating new instances of all registered classes. - * @param {*} [argN...] - Any number of additional arguments to supply when creating new instances of all registered classes. - * @returns {Array.} - * @this FooTable.ClassFactory - */ - load: function(arg1, argN){ - var self = this, args = Array.prototype.slice.call(arguments), reg = [], loaded = []; - for (var name in self.registered){ - if (!self.registered.hasOwnProperty(name)) continue; - reg.push(self.registered[name]); - } - reg.sort(function(a, b){ return b.priority - a.priority; }); - F.arr.each(reg, function(r){ - if (F.is.fn(r.klass)){ - loaded.push(self._make(r.klass, args)); - } - }); - return loaded; - }, - /** - * Create a new instance of a single class using the supplied name and arguments. - * @instance - * @param {string} name - The name of the class to create. - * @param {*} arg1 - The first argument to supply to the new instance. - * @param {*} [argN...] - Any number of additional arguments to supply to the new instance. - * @returns {FooTable.Class} - * @this FooTable.ClassFactory - */ - make: function(name, arg1, argN){ - var self = this, args = Array.prototype.slice.call(arguments), reg; - name = args.shift(); - reg = self.registered[name]; - if (F.is.fn(reg.klass)){ - return self._make(reg.klass, args); - } - return null; - }, - /** - * This in effect lets us use the "apply" method on a function using the "new" keyword. - * @instance - * @private - * @param {function} klass - * @param args - * @returns {FooTable.Class} - * @this FooTable.ClassFactory - */ - _make: function(klass, args){ - function Class() { - return klass.apply(this, args); - } - Class.prototype = klass.prototype; - return new Class(); - } - }); - -})(FooTable); -(function($, F){ - - /** - * Converts the supplied cssText string into JSON object. - * @param {string} cssText - The cssText to convert to a JSON object. - * @returns {object} - */ - F.css2json = function(cssText){ - if (F.is.emptyString(cssText)) return {}; - var json = {}, props = cssText.split(';'), pair, key, value; - for (var i = 0, i_len = props.length; i < i_len; i++){ - pair = props[i].split(':'); - key = F.str.toCamelCase($.trim(pair[0])); - value = $.trim(pair[1]); - json[key] = value; - } - return json; - }; - - /** - * Attempts to retrieve a function pointer using the given name. - * @protected - * @param {string} functionName - The name of the function to fetch a pointer to. - * @returns {(function|object|null)} - */ - F.getFnPointer = function(functionName){ - if (F.is.emptyString(functionName)) return null; - if (F.is.fn(window[functionName])) return window[functionName]; - return null; - }; - - /** - * Checks the value for function properties such as the {@link FooTable.Column#formatter} option which could also be specified using just the name - * and attempts to return the correct function pointer or null if none was found matching the value. - * @param {FooTable.Class} self - The class to use as the 'this' keyword within the context of the function. - * @param {(function|string)} value - The actual function or the name of the function for the property. - * @param {function} [def] - A default function to return if none is found. - * @returns {(function|null)} - */ - F.checkFnValue = function(self, value, def){ - def = F.is.fn(def) ? def : null; - function wrap(t, fn, d){ - if (!F.is.fn(fn)) return d; - return function(){ - return fn.apply(t, arguments); - }; - } - return F.is.fn(value) ? wrap(self, value, def) : (F.is.type(value, 'string') ? wrap(self, F.getFnPointer(value), def) : def); - }; - -})(jQuery, FooTable); -(function($, F){ - - F.Cell = F.Class.extend(/** @lends FooTable.Cell */{ - /** - * The cell class containing all the properties for cells. - * @constructs - * @extends FooTable.Class - * @param {FooTable.Table} table - The root {@link FooTable.Table} this cell belongs to. - * @param {FooTable.Row} row - The parent {@link FooTable.Row} this cell belongs to. - * @param {FooTable.Column} column - The {@link FooTable.Column} this cell falls under. - * @param {(*|HTMLElement|jQuery)} valueOrElement - Either the value or the element for the cell. - * @returns {FooTable.Cell} - * @this FooTable.Cell - */ - construct: function (table, row, column, valueOrElement) { - /** - * The root {@link FooTable.Table} for the cell. - * @instance - * @readonly - * @type {FooTable.Table} - */ - this.ft = table; - /** - * The parent {@link FooTable.Row} for the cell. - * @instance - * @readonly - * @type {FooTable.Row} - */ - this.row = row; - /** - * The {@link FooTable.Column} this cell falls under. - * @instance - * @readonly - * @type {FooTable.Column} - */ - this.column = column; - this.created = false; - this.define(valueOrElement); - }, - /** - * This is supplied either the value or the cell element/jQuery object if it exists. - * If supplied the element we need set the $el property and parse the value from it. - * @instance - * @protected - * @param {(*|jQuery)} valueOrElement - The value or element to define the cell. - * @this FooTable.Cell - */ - define: function(valueOrElement){ - /** - * The jQuery table cell object this instance wraps. - * @instance - * @type {jQuery} - */ - this.$el = F.is.element(valueOrElement) || F.is.jq(valueOrElement) ? $(valueOrElement) : null; - /** - * The jQuery row object that represents this cell in the details table. - * @type {jQuery} - */ - this.$detail = null; - - var hasOptions = F.is.hash(valueOrElement) && F.is.hash(valueOrElement.options) && F.is.defined(valueOrElement.value); - - /** - * The value of the cell. - * @instance - * @type {*} - */ - this.value = this.column.parser.call(this.column, F.is.jq(this.$el) ? this.$el : (hasOptions ? valueOrElement.value : valueOrElement), this.ft.o); - - /** - * Contains any options for the cell. These are the options supplied through the plugin constructor as part of the row object itself. - * @type {object} - */ - this.o = $.extend(true, { - classes: null, - style: null - }, hasOptions ? valueOrElement.options : {}); - /** - * An array of CSS classes for the cell. - * @instance - * @protected - * @type {Array.} - */ - this.classes = F.is.jq(this.$el) && this.$el.attr('class') ? this.$el.attr('class').match(/\S+/g) : (F.is.array(this.o.classes) ? this.o.classes : (F.is.string(this.o.classes) ? this.o.classes.match(/\S+/g) : [])); - /** - * The inline styles for the cell. - * @instance - * @protected - * @type {object} - */ - this.style = F.is.jq(this.$el) && this.$el.attr('style') ? F.css2json(this.$el.attr('style')) : (F.is.hash(this.o.style) ? this.o.style : (F.is.string(this.o.style) ? F.css2json(this.o.style) : {})); - }, - /** - * After the cell has been defined this ensures that the $el and #detail properties are jQuery objects by either creating or updating them. - * @instance - * @protected - * @this FooTable.Cell - */ - $create: function(){ - if (this.created) return; - (this.$el = F.is.jq(this.$el) ? this.$el : $('')) - .data('value', this.value) - .contents().detach().end() - .append(this.format(this.value)); - - this._setClasses(this.$el); - this._setStyle(this.$el); - - this.$detail = $('').addClass(this.row.classes.join(' ')) - .data('__FooTableCell__', this) - .append($('')) - .append($('')); - - this.created = true; - }, - /** - * Collapses this cell and displays it in the details row. - * @instance - * @protected - */ - collapse: function(){ - if (!this.created) return; - this.$detail.children('th').html(this.column.title); - this.$detail.children('td').first() - .attr('class', this.$el.attr('class')) - .attr('style', this.$el.attr('style')) - .css('display', 'table-cell') - .append(this.$el.contents().detach()); - - if (!F.is.jq(this.$detail.parent())) - this.$detail.appendTo(this.row.$details.find('.footable-details > tbody')); - }, - /** - * Restores this cell from a detail row back into the normal row. - * @instance - * @protected - */ - restore: function(){ - if (!this.created) return; - if (F.is.jq(this.$detail.parent())){ - var $cell = this.$detail.children('td').first(); - this.$el - .attr('class', $cell.attr('class')) - .attr('style', $cell.attr('style')) - .css('display', (this.column.hidden || !this.column.visible) ? 'none' : 'table-cell') - .append($cell.contents().detach()); - } - this.$detail.detach(); - }, - /** - * Helper method to call this cell's column parser function supplying the required parameters. - * @instance - * @protected - * @returns {*} - * @see FooTable.Column#parser - * @this FooTable.Cell - */ - parse: function(){ - return this.column.parser.call(this.column, this.$el, this.ft.o); - }, - /** - * Helper method to call this cell's column formatter function using the supplied value and any additional required parameters. - * @instance - * @protected - * @param {*} value - The value to format. - * @returns {(string|HTMLElement|jQuery)} - * @see FooTable.Column#formatter - * @this FooTable.Cell - */ - format: function(value){ - return this.column.formatter.call(this.column, value, this.ft.o); - }, - /** - * Allows easy access to getting or setting the cell's value. If the value is set all associated properties are also updated along with the actual element. - * Using this method also allows us to supply an object containing options and the value for the cell. - * @instance - * @param {*} [value] - The value to set for the cell. If not supplied the current value of the cell is returned. - * @param {boolean} [redraw=true] - Whether or not to redraw the row once the value has been set. - * @returns {(*|undefined)} - * @this FooTable.Cell - */ - val: function(value, redraw){ - if (F.is.undef(value)){ - // get - return this.value; - } - // set - var self = this, hasOptions = F.is.hash(value) && F.is.hash(value.options) && F.is.defined(value.value); - this.o = $.extend(true, { - classes: self.classes, - style: self.style - }, hasOptions ? value.options : {}); - - this.value = hasOptions ? value.value : value; - this.classes = F.is.array(this.o.classes) ? this.o.classes : (F.is.string(this.o.classes) ? this.o.classes.match(/\S+/g) : []); - this.style = F.is.hash(this.o.style) ? this.o.style : (F.is.string(this.o.style) ? F.css2json(this.o.style) : {}); - - if (this.created){ - this.$el.data('value', this.value).empty(); - - var $detail = this.$detail.children('td').first().empty(), - $target = F.is.jq(this.$detail.parent()) ? $detail : this.$el; - - $target.append(this.format(this.value)); - - this._setClasses($target); - this._setStyle($target); - - if (F.is.boolean(redraw) ? redraw : true) this.row.draw(); - } - }, - _setClasses: function($el){ - var hasColClasses = !F.is.emptyArray(this.column.classes), - hasClasses = !F.is.emptyArray(this.classes), - classes = null; - $el.removeAttr('class'); - if (!hasColClasses && !hasClasses) return; - if (hasColClasses && hasClasses){ - classes = this.classes.concat(this.column.classes).join(' '); - } else if (hasColClasses) { - classes = this.column.classes.join(' '); - } else if (hasClasses){ - classes = this.classes.join(' '); - } - if (!F.is.emptyString(classes)){ - $el.addClass(classes); - } - }, - _setStyle: function($el){ - var hasColStyle = !F.is.emptyObject(this.column.style), - hasStyle = !F.is.emptyObject(this.style), - style = null; - $el.removeAttr('style'); - if (!hasColStyle && !hasStyle) return; - if (hasColStyle && hasStyle){ - style = $.extend({}, this.column.style, this.style); - } else if (hasColStyle) { - style = this.column.style; - } else if (hasStyle){ - style = this.style; - } - if (F.is.hash(style)){ - $el.css(style); - } - } - }); - -})(jQuery, FooTable); -(function($, F){ - - F.Column = F.Class.extend(/** @lends FooTable.Column */{ - /** - * The column class containing all the properties for columns. All members marked as "readonly" should not be used when defining {@link FooTable.Defaults#columns}. - * @constructs - * @extends FooTable.Class - * @param {FooTable.Table} instance - The parent {@link FooTable.Table} this component belongs to. - * @param {object} definition - An object containing all the properties to set for the column. - * @param {string} [type] - The type of column, "text" by default. - * @returns {FooTable.Column} - * @this FooTable.Column - */ - construct: function(instance, definition, type){ - /** - * The root {@link FooTable.Table} for the column. - * @instance - * @readonly - * @type {FooTable.Table} - */ - this.ft = instance; - /** - * The type of data displayed by the column. - * @instance - * @readonly - * @type {string} - */ - this.type = F.is.emptyString(type) ? 'text' : type; - /** - * Whether or not the column was parsed from a standard table row containing data instead of from an actual header row. - * @instance - * @readonly - * @type {boolean} - */ - this.virtual = F.is.boolean(definition.virtual) ? definition.virtual : false; - /** - * The jQuery cell object for the column header. - * @instance - * @readonly - * @type {jQuery} - */ - this.$el = F.is.jq(definition.$el) ? definition.$el : null; - /** - * The index of the column in the table. This is set by the plugin during initialization. - * @instance - * @readonly - * @type {number} - * @default -1 - */ - this.index = F.is.number(definition.index) ? definition.index : -1; - this.define(definition); - this.$create(); - }, - /** - * This is supplied the column definition in the form of a simple object created by merging options supplied via the plugin constructor with those parsed from the DOM. - * @instance - * @protected - * @param {object} definition - The object containing the column definition. - * @this FooTable.Column - */ - define: function(definition){ - /** - * Whether or not this column is hidden from view and appears in the details row. - * @type {boolean} - * @default false - */ - this.hidden = F.is.boolean(definition.hidden) ? definition.hidden : false; - /** - * Whether or not this column is completely hidden from view and will not appear in the details row. - * @type {boolean} - * @default true - */ - this.visible = F.is.boolean(definition.visible) ? definition.visible : true; - - /** - * The name of the column. This name must correspond to the property name of the JSON row data. - * @type {string} - * @default null - */ - this.name = F.is.string(definition.name) ? definition.name : null; - if (this.name == null) this.name = 'col'+(definition.index+1); - /** - * The title to display in the column header, this can be HTML. - * @type {string} - * @default null - */ - this.title = F.is.string(definition.title) ? definition.title : null; - if (!this.virtual && this.title == null && F.is.jq(this.$el)) this.title = this.$el.html(); - if (this.title == null) this.title = 'Column '+(definition.index+1); - /** - * The styles to apply to all cells in this column. - * @type {object} - */ - this.style = F.is.hash(definition.style) ? definition.style : (F.is.string(definition.style) ? F.css2json(definition.style) : {}); - /** - * The classes to apply to all cells in this column. - * @type {Array.} - */ - this.classes = F.is.array(definition.classes) ? definition.classes : (F.is.string(definition.classes) ? definition.classes.match(/\S+/g) : []); - - // override any default functions ensuring when they are executed "this" within the context of the function points to the instance of this object. - this.parser = F.checkFnValue(this, definition.parser, this.parser); - this.formatter = F.checkFnValue(this, definition.formatter, this.formatter); - }, - /** - * 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 : $('')).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.Column#format} function - * to generate the cell contents. - * @instance - * @protected - * @param {(*|jQuery)} valueOrElement - The value or jQuery cell object. - * @returns {string} - * @this FooTable.Column - */ - parser: function(valueOrElement){ - if (F.is.element(valueOrElement) || F.is.jq(valueOrElement)) return $(valueOrElement).data('value') || $(valueOrElement).text(); // use jQuery to get the value - if (F.is.defined(valueOrElement) && valueOrElement != null) return valueOrElement+''; // use the native toString of the value - return null; // otherwise we have no value so return null - }, - /** - * This is supplied the value retrieved from the {@link FooTable.Column#parse} function and must return a string, HTMLElement or jQuery object. - * The return value from this function is what is displayed in the cell in the table. - * @instance - * @protected - * @param {string} value - The value to format. - * @returns {(string|HTMLElement|jQuery)} - * @this FooTable.Column - */ - formatter: function(value){ - return value == null ? '' : value; - }, - /** - * Creates a cell for this column from the supplied {@link FooTable.Row} object. This allows different column types to return different types of cells. - * @instance - * @protected - * @param {FooTable.Row} row - The row to create the cell from. - * @returns {FooTable.Cell} - * @this FooTable.Column - */ - createCell: function(row){ - var element = F.is.jq(row.$el) ? row.$el.children('td,th').get(this.index) : null, - data = F.is.hash(row.value) ? row.value[this.name] : null; - return new F.Cell(this.ft, row, this, element || data); - } - }); - - F.columns = new F.ClassFactory(); - - F.columns.register('text', F.Column); - -})(jQuery, FooTable); -(function ($, F) { - /** - * Contains all the available options for the FooTable plugin. - * @name FooTable.Defaults - * @function - * @constructor - * @returns {FooTable.Defaults} - */ - F.Defaults = function () { - /** - * Whether or not events raised using the {@link FooTable.Table#raise} method are propagated up the DOM. By default this is set to false and all events bubble up the DOM as per usual - * however the reason for this option is if we have nested tables. If false the parent table would receive all the events raised by it's children and any handlers bound to both the - * parent and child would be triggered which is not the desired behavior. - * @type {boolean} - * @default false - */ - this.stopPropagation = false; - /** - * An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s). - * @type {object.} - * @default NULL - * @example This example shows how to pass an object containing the events and handlers. - * "on": { - * "click": function(e){ - * // bind a custom click event to do something whenever the table is clicked - * }, - * "init.ft.table": function(e, ft){ - * // bind to the FooTable initialize event to do something - * } - * } - */ - this.on = null; - }; - - /** - * Contains all the default options for the plugin. - * @type {FooTable.Defaults} - */ - F.defaults = new F.Defaults(); - -})(jQuery, FooTable); -(function($, F){ - - F.Row = F.Class.extend(/** @lends FooTable.Row */{ - /** - * The row class containing all the properties for a row and its' cells. - * @constructs - * @extends FooTable.Class - * @param {FooTable.Table} table - The parent {@link FooTable.Table} this component belongs to. - * @param {Array.} columns - The array of {@link FooTable.Column} for this row. - * @param {(*|HTMLElement|jQuery)} dataOrElement - Either the data for the row (create) or the element (parse) for the row. - * @returns {FooTable.Row} - */ - construct: function (table, columns, dataOrElement) { - /** - * The {@link FooTable.Table} for the row. - * @type {FooTable.Table} - */ - this.ft = table; - /** - * The array of {@link FooTable.Column} for this row. - * @type {Array.} - */ - this.columns = columns; - - this.created = false; - this.define(dataOrElement); - this.val(); - }, - /** - * This is supplied either the object containing the values for the row or the row element/jQuery object if it exists. - * If supplied the element we need to set the $el property and parse the cells from it using the column index. - * If we have an object we parse the cells from it using the column name. - * @param {(object|jQuery)} dataOrElement - The row object or element to define the row. - */ - define: function(dataOrElement){ - /** - * The jQuery table row object this instance wraps. - * @instance - * @protected - * @type {jQuery} - */ - this.$el = F.is.element(dataOrElement) || F.is.jq(dataOrElement) ? $(dataOrElement) : null; - /** - * The jQuery toggle element for the row. - * @instance - * @protected - * @type {jQuery} - */ - this.$toggle = $('', {'class': 'footable-toggle fooicon fooicon-plus'}); - - var isObj = F.is.hash(dataOrElement), - hasOptions = isObj && F.is.hash(dataOrElement.options) && F.is.hash(dataOrElement.value); - - /** - * The value of the row. - * @instance - * @protected - * @type {Object} - */ - this.value = isObj ? (hasOptions ? dataOrElement.value : dataOrElement) : null; - - /** - * Contains any options for the row. - * @type {object} - */ - this.o = $.extend(true, { - expanded: false, - classes: null, - style: null - }, hasOptions ? dataOrElement.options : {}); - - /** - * Whether or not this row is expanded and will display it's detail row when there are any hidden columns. - * @instance - * @protected - * @type {boolean} - */ - this.expanded = F.is.jq(this.$el) ? (this.$el.data('expanded') || this.o.expanded) : this.o.expanded; - /** - * An array of CSS classes for the row. - * @instance - * @protected - * @type {Array.} - */ - this.classes = F.is.jq(this.$el) && this.$el.attr('class') ? this.$el.attr('class').match(/\S+/g) : (F.is.array(this.o.classes) ? this.o.classes : (F.is.string(this.o.classes) ? this.o.classes.match(/\S+/g) : [])); - /** - * The inline styles for the row. - * @instance - * @protected - * @type {object} - */ - this.style = F.is.jq(this.$el) && this.$el.attr('style') ? F.css2json(this.$el.attr('style')) : (F.is.hash(this.o.style) ? this.o.style : (F.is.string(this.o.style) ? F.css2json(this.o.style) : {})); - - /** - * The cells array. This is populated before the call to the {@link FooTable.Row#$create} method. - * @instance - * @type {Array.} - */ - this.cells = this.createCells(); - }, - /** - * After the row 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.Row - */ - $create: function(){ - if (this.created) return; - (this.$el = F.is.jq(this.$el) ? this.$el : $('')) - .data('__FooTableRow__', this); - - this._setClasses(this.$el); - this._setStyle(this.$el); - - if (this.ft.rows.toggleColumn == 'last') this.$toggle.addClass('last-column'); - - this.$details = $('', { 'class': 'footable-detail-row' }) - .append($('', { colspan: this.ft.columns.visibleColspan }) - .append($('', { 'class': 'footable-details ' + this.ft.classes.join(' ') }) - .append(''))); - - var self = this; - F.arr.each(self.cells, function(cell){ - if (!cell.created) cell.$create(); - self.$el.append(cell.$el); - }); - self.$el.off('click.ft.row').on('click.ft.row', { self: self }, self._onToggle); - this.created = true; - }, - /** - * This is called during the construct method and uses the current column definitions to create an array of {@link FooTable.Cell} objects for the row. - * @instance - * @protected - * @returns {Array.} - * @this FooTable.Row - */ - createCells: function(){ - var self = this; - return F.arr.map(self.columns, function(col){ - return col.createCell(self); - }); - }, - /** - * Allows easy access to getting or setting the row's data. If the data is set all associated properties are also updated along with the actual element. - * Using this method also allows us to supply an object containing options and the data for the row at the same time. - * @instance - * @param {object} [data] - The data to set for the row. If not supplied the current value of the row is returned. - * @returns {(*|undefined)} - */ - val: function(data){ - var self = this; - if (!F.is.hash(data)){ - // get - check the value property and build it from the cells if required. - if (!F.is.hash(this.value) || F.is.emptyObject(this.value)){ - this.value = {}; - F.arr.each(this.cells, function(cell){ - self.value[cell.column.name] = cell.val(); - }); - } - return this.value; - } - // set - this.collapse(false); - var isObj = F.is.hash(data), - hasOptions = isObj && F.is.hash(data.options) && F.is.hash(data.value); - - this.o = $.extend(true, { - expanded: self.expanded, - classes: self.classes, - style: self.style - }, hasOptions ? data.options : {}); - - this.expanded = this.o.expanded; - this.classes = F.is.array(this.o.classes) ? this.o.classes : (F.is.string(this.o.classes) ? this.o.classes.match(/\S+/g) : []); - this.style = F.is.hash(this.o.style) ? this.o.style : (F.is.string(this.o.style) ? F.css2json(this.o.style) : {}); - this.value = isObj ? (hasOptions ? data.value : data) : null; - - F.arr.each(this.cells, function(cell){ - if (F.is.defined(self.value[cell.column.name])) cell.val(self.value[cell.column.name], false); - }); - - if (this.created){ - this._setClasses(this.$el); - this._setStyle(this.$el); - this.draw(); - } - }, - _setClasses: function($el){ - var hasClasses = !F.is.emptyArray(this.classes), - classes = null; - $el.removeAttr('class'); - if (!hasClasses) return; - else classes = this.classes.join(' '); - if (!F.is.emptyString(classes)){ - $el.addClass(classes); - } - }, - _setStyle: function($el){ - var hasStyle = !F.is.emptyObject(this.style), - style = null; - $el.removeAttr('style'); - if (!hasStyle) return; - else style = this.style; - if (F.is.hash(style)){ - $el.css(style); - } - }, - /** - * Sets the current row to an expanded state displaying any hidden columns in a detail row just below it. - * @instance - * @this FooTable.Row - */ - expand: function(){ - if (!this.created) return; - this.__hidden__ = F.arr.map(this.cells, function(cell){ - return cell.column.hidden && cell.column.visible ? cell : null; - }); - - if (this.__hidden__.length > 0){ - this.$details.insertAfter(this.$el) - .children('td').first() - .attr('colspan', this.ft.columns.visibleColspan); - - F.arr.each(this.__hidden__, function(cell){ - cell.collapse(); - }); - } - this.$el.attr('data-expanded', true); - this.$toggle.removeClass('fooicon-plus').addClass('fooicon-minus'); - this.expanded = true; - }, - /** - * Sets the current row to a collapsed state removing the detail row if it exists. - * @instance - * @this FooTable.Row - */ - collapse: function(setExpanded){ - if (!this.created) return; - F.arr.each(this.__hidden__, function(cell){ - cell.restore(); - }); - this.$details.detach(); - this.$el.removeAttr('data-expanded'); - this.$toggle.removeClass('fooicon-minus').addClass('fooicon-plus'); - if (F.is.boolean(setExpanded) ? setExpanded : true) this.expanded = false; - }, - /** - * Prior to drawing this moves the details contents back to there original cells and detaches the toggle element from the row. - * @instance - * @this FooTable.Row - */ - predraw: function(){ - if (this.created){ - if (this.expanded){ - this.collapse(false); - } - this.$toggle.detach(); - this.$el.detach(); - } - }, - /** - * Draws the current row and cells. - * @instance - * @this FooTable.Row - */ - draw: function($parent){ - if (!this.created) this.$create(); - if (F.is.jq($parent)) $parent.append(this.$el); - var self = this; - F.arr.each(self.cells, function(cell){ - cell.$el.css('display', (cell.column.hidden || !cell.column.visible ? 'none' : 'table-cell')); - if (self.ft.rows.showToggle && self.ft.columns.hasHidden){ - if ((self.ft.rows.toggleColumn == 'first' && cell.column.index == self.ft.columns.firstVisibleIndex) - || (self.ft.rows.toggleColumn == 'last' && cell.column.index == self.ft.columns.lastVisibleIndex)) { - cell.$el.prepend(self.$toggle); - } - } - }); - if (this.expanded){ - this.expand(); - } - }, - /** - * Toggles the row between it's expanded and collapsed state if there are hidden columns. - * @instance - * @this FooTable.Row - */ - toggle: function(){ - if (this.created && this.ft.columns.hasHidden){ - if (this.expanded) this.collapse(); - else this.expand(); - } - }, - /** - * Handles the toggle click event for rows. - * @instance - * @param {jQuery.Event} e - The jQuery.Event object for the click event. - * @private - * @this jQuery - */ - _onToggle: function (e) { - var self = e.data.self; - // only execute the toggle if the event.target is one of the approved initiators - if ($(e.target).is('tr,td,.footable-toggle')){ - self.toggle(); - } - } - }); - -})(jQuery, FooTable); -(function ($, F) { - - /** - * An array of all currently loaded instances of the plugin. - * @protected - * @readonly - * @type {Array.} - */ - F.instances = []; - - F.Table = F.Class.extend(/** @lends FooTable.Table */{ - /** - * This class is the core of the plugin and drives the logic of all components. - * @constructs - * @this FooTable.Table - * @extends FooTable.Class - * @param {(HTMLTableElement|jQuery)} element - The element or jQuery table object to bind the plugin to. - * @param {object} options - The options to initialize the plugin with. - * @param {function} [ready] - A callback function to execute once the plugin is initialized. - * @returns {FooTable.Table} - */ - construct: function (element, options, ready) { - //BEGIN MEMBERS - /** - * The timeout ID for the resize event. - * @instance - * @private - * @type {?number} - */ - this._resizeTimeout = null; - /** - * The ID of the FooTable instance. - * @instance - * @type {number} - */ - this.id = F.instances.push(this); - /** - * Whether or not the plugin and all components and add-ons are fully initialized. - * @instance - * @type {boolean} - */ - this.initialized = false; - /** - * The jQuery table object the plugin is bound to. - * @instance - * @type {jQuery} - */ - this.$el = (F.is.jq(element) ? element : $(element)).first(); // ensure one table, one instance - /** - * The options for the plugin. This is a merge of user defined options and the default options. - * @instance - * @type {object} - */ - this.o = $.extend(true, {}, F.defaults, options); - /** - * An array of all CSS classes on the table that do not start with "footable". - * @instance - * @protected - * @type {Array.} - */ - this.classes = []; - /** - * The breakpoints component for this instance of the plugin. - * @instance - * @type {FooTable.Breakpoints} - */ - this.breakpoints = F.components.internal.make('breakpoints', this); - /** - * The columns component for this instance of the plugin. - * @instance - * @type {FooTable.Columns} - */ - this.columns = F.components.internal.make('columns', this); - /** - * The rows component for this instance of the plugin. - * @instance - * @type {FooTable.Rows} - */ - this.rows = F.components.internal.make('rows', this); - /** - * All components for this instance of the plugin. These are executed in the order they appear in the array for the initialize phase and in reverse order for the destroy phase of the plugin. - * @instance - * @protected - * @type {object} - * @prop {Array.} internal - The internal components for the plugin. These are executed either before all other components in the initialize phase or after them in the destroy phase of the plugin. - * @prop {Array.} core - The core components for the plugin. These are executed either after the internal components in the initialize phase or before them in the destroy phase of the plugin. - * @prop {Array.} custom - The custom components for the plugin. These are executed either after the core components in the initialize phase or before them in the destroy phase of the plugin. - */ - this.components = { - internal: [this.breakpoints, this.columns, this.rows], - core: F.components.core.load(this), - custom: F.components.load(this) - }; - - //END MEMBERS - var self = this; - self._preinit().then(function(){ - return self._init().then(function(){ - if (F.is.fn(ready)) ready.call(self, self); - }); - }, function (err) { - if (F.is.error(err)){ - console.error('FooTable: unhandled error thrown during initialization.', err); - } - }); - }, - /** - * The preinit method is called prior to the plugins actual initialization and provides itself and it's components an opportunity to parse any additional option values. - * @instance - * @private - * @returns {jQuery.Promise} - * @fires FooTable.Table#"preinit.ft.table" - */ - _preinit: function(){ - var self = this; - /** - * The preinit.ft.table event is raised before any components. - * Calling preventDefault on this event will disable the entire plugin. - * @event FooTable.Table#"preinit.ft.table" - * @param {jQuery.Event} e - The jQuery.Event object for the event. - * @param {FooTable.Table} ft - The instance of the plugin raising the event. - */ - return this.raise('preinit.ft.table').then(function(){ - var classes = self.$el.attr('class').match(/\S+/g), - data = self.$el.data() || {}; - - self.o.ajax = F.checkFnValue(self, data.ajax, self.o.ajax); - self.o.stopPropagation = F.is.boolean(data.stopPropagation) - ? data.stopPropagation - : self.o.stopPropagation; - - for (var i = 0, len = classes.length; i < len; i++){ - if (!F.str.startsWith(classes[i], 'footable')) self.classes.push(classes[i]); - } - var $loader = $('
', { 'class': 'footable-loader' }).append($('', {'class': 'fooicon fooicon-loader'})); - self.$el.hide().after($loader); - return self.execute(false, false, 'preinit', data).always(function(){ - self.$el.show(); - $loader.remove(); - }); - }); - }, - /** - * Initializes this instance of the plugin and calls the callback function if one is supplied once complete. - * @this FooTable.Table - * @instance - * @private - * @return {jQuery.Promise} - * @fires FooTable.Table#"init.ft.table" - */ - _init: function(){ - var self = this; - /** - * The init.ft.table event is raised before any components are initialized. - * Calling preventDefault on this event will disable the entire plugin. - * @event FooTable.Table#"init.ft.table" - * @param {jQuery.Event} e - The jQuery.Event object for the event. - * @param {FooTable.Table} ft - The instance of the plugin raising the event. - */ - return self.raise('init.ft.table').then(function(){ - var $thead = self.$el.children('thead'), - $tbody = self.$el.children('tbody'), - $tfoot = self.$el.children('tfoot'); - self.$el.addClass('footable footable-' + self.id); - if (F.is.hash(self.o.on)) self.$el.on(self.o.on); - if ($tfoot.length == 0) self.$el.append($tfoot = $('
')); - if ($tbody.length == 0) self.$el.append(''); - if ($thead.length == 0) self.$el.prepend($thead = $('')); - return self.execute(false, true, 'init').then(function(){ - self.$el.data('__FooTable__', self); - if ($tfoot.children('tr').length == 0) $tfoot.remove(); - if ($thead.children('tr').length == 0) $thead.remove(); - return self.draw().then(function(){ - $(window).off('resize.ft'+self.id, self._onWindowResize) - .on('resize.ft'+self.id, { self: self }, self._onWindowResize); - self.initialized = true; - }); - }); - }); - }, - /** - * Destroys this plugin removing it from the table. - * @this FooTable.Table - * @instance - * @fires FooTable.Table#"destroy.ft.table" - */ - destroy: function () { - var self = this; - /** - * The destroy.ft.table event is called before all core components. - * Calling preventDefault on this event will prevent the entire plugin from being destroyed. - * @event FooTable.Table#"destroy.ft.table" - * @param {jQuery.Event} e - The jQuery.Event object for the event. - * @param {FooTable.Table} ft - The instance of the plugin raising the event. - */ - return self.raise('destroy.ft.table').then(function(){ - return self.execute(true, true, 'destroy').then(function () { - self.$el.removeData('__FooTable__'); - if (F.is.hash(self.o.on)) self.$el.off(self.o.on); - self.initialized = false; - }); - },function(err){ - if (F.is.error(err)){ - console.error('FooTable: unhandled error thrown while destroying the plugin.', err); - } - }); - }, - /** - * Raises an event on this instance supplying the args array as additional parameters to the handlers. - * @this FooTable.Table - * @instance - * @param {string} eventName - The name of the event to raise, this can include namespaces. - * @param {Array} [args] - An array containing additional parameters to be passed to any bound handlers. - * @returns {jQuery.Event} - */ - raise: function(eventName, args){ - var self = this, - debug = F.__debug__ && (F.is.emptyArray(F.__debug_options__.events) || F.arr.any(F.__debug_options__.events, function(name){ return F.str.contains(eventName, name); })); - args = args || []; - args.unshift(this); - return $.Deferred(function(d){ - var evt = $.Event(eventName); - if (self.o.stopPropagation == true){ - self.$el.one(eventName, function (e) {e.stopPropagation();}); - } - if (debug) console.log('FooTable:'+eventName+': ', args); - self.$el.trigger(evt, args); - if (evt.isDefaultPrevented()){ - if (debug) console.log('FooTable: default prevented for the "'+eventName+'" event.'); - d.reject(evt); - } else d.resolve(evt); - }); - }, - /** - * Attempts to retrieve the instance of the supplied component type for this instance. - * @this FooTable.Table - * @instance - * @param {object} type - The content type to retrieve for this instance. - * @returns {(*|null)} - */ - use: function(type){ - var components = this.components.internal.concat(this.components.core, this.components.custom); - for (var i = 0, len = components.length; i < len; i++){ - if (components[i] instanceof type) return components[i]; - } - return null; - }, - /** - * Performs the drawing of the table. - * @this FooTable.Table - * @instance - * @protected - * @returns {jQuery.Promise} - * @fires FooTable.Table#"predraw.ft.table" - * @fires FooTable.Table#"draw.ft.table" - * @fires FooTable.Table#"postdraw.ft.table" - */ - draw: function () { - var self = this; - // when drawing the order that the components are executed is important so chain the methods but use promises to retain async safety. - return self.execute(false, true, 'predraw').then(function(){ - /** - * The predraw.ft.table event is raised after all core components and add-ons have executed there predraw functions but before they execute there draw functions. - * @event FooTable.Table#"predraw.ft.table" - * @param {jQuery.Event} e - The jQuery.Event object for the event. - * @param {FooTable.Table} ft - The instance of the plugin raising the event. - */ - return self.raise('predraw.ft.table').then(function(){ - return self.execute(false, true, 'draw').then(function(){ - /** - * The draw.ft.table event is raised after all core components and add-ons have executed there draw functions. - * @event FooTable.Table#"draw.ft.table" - * @param {jQuery.Event} e - The jQuery.Event object for the event. - * @param {FooTable.Table} ft - The instance of the plugin raising the event. - */ - return self.raise('draw.ft.table').then(function(){ - return self.execute(false, true, 'postdraw').then(function(){ - /** - * The postdraw.ft.table event is raised after all core components and add-ons have executed there postdraw functions. - * @event FooTable.Table#"postdraw.ft.table" - * @param {jQuery.Event} e - The jQuery.Event object for the event. - * @param {FooTable.Table} ft - The instance of the plugin raising the event. - */ - self.raise('postdraw.ft.table'); - }); - }); - }); - }); - }, function(err){ - if (F.is.error(err)){ - console.error('FooTable: unhandled error thrown during a draw operation.', err); - } - }); - }, - /** - * Executes the specified method with the optional number of parameters on all components and waits for the promise from each to be resolved before executing the next. - * @this FooTable.Table - * @instance - * @protected - * @param {boolean} reverse - Whether or not to execute the component methods in the reverse order to what they were registered in. - * @param {boolean} enabled - Whether or not to execute the method on enabled components only. - * @param {string} methodName - The name of the method to execute. - * @param {*} [param1] - The first parameter for the method. - * @param {...*} [paramN] - Any number of additional parameters for the method. - * @returns {jQuery.Promise} - */ - execute: function(reverse, enabled, methodName, param1, paramN){ - var self = this, args = Array.prototype.slice.call(arguments); - reverse = args.shift(); - enabled = args.shift(); - var internal = self.components.internal.slice(0), - core = enabled ? F.arr.get(self.components.core, function(c){ return c.enabled; }) : self.components.core.slice(0), - custom = enabled ? F.arr.get(self.components.custom, function(c){ return c.enabled; }) : self.components.custom.slice(0); - - args.unshift(reverse ? custom.reverse() : internal); - return self._execute.apply(self, args).then(function(){ - args.shift(); - args.unshift(reverse ? core.reverse() : core); - return self._execute.apply(self, args).then(function(){ - args.shift(); - args.unshift(reverse ? internal.reverse() : custom); - return self._execute.apply(self, args); - }); - }, function(err){ - if (F.is.error(err)){ - console.error('FooTable: unhandled error thrown while executing "'+methodName+'".', err); - } - }); - }, - /** - * Executes the specified method with the optional number of parameters on all supplied components waiting for the result of each before executing the next. - * @this FooTable.Table - * @instance - * @private - * @param {Array.} components - The components to call the method on. - * @param {string} methodName - The name of the method to execute - * @param {*} [param1] - The first parameter for the method. - * @param {...*} [paramN] - Any additional parameters for the method. - * @returns {jQuery.Promise} - */ - _execute: function(components, methodName, param1, paramN){ - if (!components || !components.length) return $.when(); - var self = this, args = Array.prototype.slice.call(arguments), - component; - components = args.shift(); - methodName = args.shift(); - component = components.shift(); - - if (!F.is.fn(component[methodName])) - return self._execute.apply(self, [components, methodName].concat(args)); - - return $.Deferred(function(d){ - try { - var result = component[methodName].apply(component, args); - if (F.is.promise(result)){ - return result.then(d.resolve, d.reject); - } else { - d.resolve(result); - } - } catch (err) { - d.reject(err); - } - }).then(function(){ - return self._execute.apply(self, [components, methodName].concat(args)); - }); - }, - /** - * Listens to the window resize event and performs a check to see if the breakpoint has changed. - * @this window - * @instance - * @private - * @fires FooTable.Table#"resize.ft.table" - */ - _onWindowResize: function (e) { - var self = e.data.self; - if (self._resizeTimeout != null) { clearTimeout(self._resizeTimeout); } - self._resizeTimeout = setTimeout(function () { - self._resizeTimeout = null; - /** - * The resize event is raised a short time after window resize operations cease. - * @event FooTable.Table#"resize.ft.table" - * @param {jQuery.Event} e - The jQuery.Event object for the event. - * @param {FooTable.Table} ft - The instance of the plugin raising the event. - */ - self.raise('resize.ft.table').then(function(){ - self.breakpoints.check(); - }); - }, 300); - } - }); - -})(jQuery, FooTable); -(function($, F){ - - if (F.is.undef(window.moment)){ - // The DateColumn requires moment.js to parse and format date values. Goto http://momentjs.com/ to get it. - return; - } - - F.DateColumn = F.Column.extend(/** @lends FooTable.DateColumn */{ - /** - * The date column class is used to handle date values. This column is dependent on [moment.js]{@link http://momentjs.com/} to provide date parsing and formatting functionality. - * @constructs - * @extends FooTable.Column - * @param {FooTable.Table} instance - The parent {@link FooTable.Table} this column belongs to. - * @param {object} definition - An object containing all the properties to set for the column. - * @returns {FooTable.DateColumn} - */ - construct: function(instance, definition){ - this._super(instance, definition, 'date'); - /** - * The format string to use when parsing and formatting dates. - * @instance - * @type {string} - */ - this.formatString = F.is.string(definition.formatString) ? definition.formatString : 'MM-DD-YYYY'; - }, - /** - * 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.DateColumn#format} function - * to generate the cell contents. - * @instance - * @protected - * @param {(*|jQuery)} valueOrElement - The value or jQuery cell object. - * @returns {(moment|null)} - * @this FooTable.DateColumn - */ - parser: function(valueOrElement){ - if (F.is.element(valueOrElement) || F.is.jq(valueOrElement)){ - valueOrElement = $(valueOrElement).data('value') || $(valueOrElement).text(); - if (F.is.string(valueOrElement)) valueOrElement = isNaN(valueOrElement) ? valueOrElement : +valueOrElement; - } - if (F.is.date(valueOrElement)) return moment(valueOrElement); - if (F.is.object(valueOrElement) && F.is.boolean(valueOrElement._isAMomentObject)) return valueOrElement; - if (F.is.string(valueOrElement)){ - // if it looks like a number convert it and do nothing else otherwise create a new moment using the string value and formatString - if (isNaN(valueOrElement)){ - return moment(valueOrElement, this.formatString); - } else { - valueOrElement = +valueOrElement; - } - } - if (F.is.number(valueOrElement)){ - return moment(valueOrElement); - } - return null; - }, - /** - * This is supplied the value retrieved from the {@link FooTable.DateColumn#parser} function and must return a string, HTMLElement or jQuery object. - * The return value from this function is what is displayed in the cell in the table. - * @instance - * @protected - * @param {*} value - The value to format. - * @returns {(string|HTMLElement|jQuery)} - * @this FooTable.DateColumn - */ - formatter: function(value){ - return F.is.object(value) && F.is.boolean(value._isAMomentObject) ? value.format(this.formatString) : ''; - }, - /** - * This is supplied either the cell value or jQuery object to parse. A string value must be returned from this method and will be used during filtering operations. - * @param {(*|jQuery)} valueOrElement - The value or jQuery cell object. - * @returns {string} - * @this FooTable.DateColumn - */ - 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)) valueOrElement = $(valueOrElement).data('filterValue') || $(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)) valueOrElement = valueOrElement.options.filterValue; - if (F.is.defined(valueOrElement.value)) valueOrElement = valueOrElement.value; - } - // if the value is a moment object just return the formatted value - if (F.is.object(valueOrElement) && F.is.boolean(valueOrElement._isAMomentObject)) return valueOrElement.format(this.formatString); - // if its a string - if (F.is.string(valueOrElement)){ - // if its not a number return it - if (isNaN(valueOrElement)){ - return valueOrElement; - } else { // otherwise convert it and carry on - valueOrElement = +valueOrElement; - } - } - // if the value is a number or date convert to a moment object and return the formatted result. - if (F.is.number(valueOrElement) || F.is.date(valueOrElement)){ - return moment(valueOrElement).format(this.formatString); - } - // try use the native toString of the value if its not undefined or null - if (F.is.defined(valueOrElement) && valueOrElement != null) return valueOrElement+''; - return ''; // otherwise we have no value so return an empty string - } - }); - - F.columns.register('date', F.DateColumn); - -})(jQuery, FooTable); -(function($, F){ - - F.HTMLColumn = F.Column.extend(/** @lends FooTable.HTMLColumn */{ - /** - * The HTML column class is used to handle any raw HTML columns. - * @constructs - * @extends FooTable.Column - * @param {FooTable.Table} instance - The parent {@link FooTable.Table} this column belongs to. - * @param {object} definition - An object containing all the properties to set for the column. - * @returns {FooTable.HTMLColumn} - */ - construct: function(instance, definition){ - this._super(instance, definition, 'html'); - }, - /** - * 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.HTMLColumn#format} function - * to generate the cell contents. - * @instance - * @protected - * @param {(*|jQuery)} valueOrElement - The value or jQuery cell object. - * @returns {(number|null)} - * @this FooTable.HTMLColumn - */ - 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; - } - }); - - F.columns.register('html', F.HTMLColumn); - -})(jQuery, FooTable); -(function($, F){ - - F.NumberColumn = F.Column.extend(/** @lends FooTable.NumberColumn */{ - /** - * The number column class is used to handle simple number columns. - * @constructs - * @extends FooTable.Column - * @param {FooTable.Table} instance - The parent {@link FooTable.Table} this column belongs to. - * @param {object} definition - An object containing all the properties to set for the column. - * @returns {FooTable.NumberColumn} - */ - construct: function(instance, definition){ - this._super(instance, definition, 'number'); - this.decimalSeparator = F.is.string(definition.decimalSeparator) ? definition.decimalSeparator : '.'; - this.thousandSeparator = F.is.string(definition.thousandSeparator) ? definition.thousandSeparator : '.'; - this.decimalSeparatorRegex = new RegExp(F.str.escapeRegExp(this.decimalSeparator), 'g'); - this.thousandSeparatorRegex = new RegExp(F.str.escapeRegExp(this.thousandSeparator), 'g'); - this.cleanRegex = new RegExp('[^0-9' + F.str.escapeRegExp(this.decimalSeparator) + ']', 'g'); - }, - /** - * 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.Column#formatter} function - * to generate the cell contents. - * @instance - * @protected - * @param {(*|jQuery)} valueOrElement - The value or jQuery cell object. - * @returns {(number|null)} - * @this FooTable.NumberColumn - */ - parser: function(valueOrElement){ - if (F.is.element(valueOrElement) || F.is.jq(valueOrElement)){ - valueOrElement = $(valueOrElement).data('value') || $(valueOrElement).text().replace(this.cleanRegex, ''); - } - if (F.is.string(valueOrElement)){ - valueOrElement = valueOrElement.replace(this.thousandSeparatorRegex, '').replace(this.decimalSeparatorRegex, '.'); - valueOrElement = parseFloat(valueOrElement); - } - if (F.is.number(valueOrElement)) return valueOrElement; - return null; - }, - /** - * This is supplied the value retrieved from the {@link FooTable.NumberColumn#parse} function and must return a string, HTMLElement or jQuery object. - * The return value from this function is what is displayed in the cell in the table. - * @instance - * @protected - * @param {number} value - The value to format. - * @returns {(string|HTMLElement|jQuery)} - * @this FooTable.NumberColumn - */ - formatter: function(value){ - if (value == null) return ''; - var s = (value + '').split('.'); - if (s.length == 2 && s[0].length > 3) { - s[0] = s[0].replace(/\B(?=(?:\d{3})+(?!\d))/g, this.thousandSeparator); - } - return s.join(this.decimalSeparator); - } - }); - - F.columns.register('number', F.NumberColumn); - -})(jQuery, FooTable); -(function ($, F) { - - F.Component = F.Class.extend(/** @lends FooTable.Component */{ - /** - * The base class for all FooTable components. - * @constructs - * @extends FooTable.Class - * @param {FooTable.Table} instance - The parent {@link FooTable.Table} object for the component. - * @param {boolean} enabled - Whether or not the component is enabled. - * @throws {TypeError} The instance parameter must be an instance of {@link FooTable.Table}. - * @returns {FooTable.Component} - */ - construct: function (instance, enabled) { - if (!(instance instanceof F.Table)) - throw new TypeError('The instance parameter must be an instance of FooTable.Table.'); - - /** - * The parent {@link FooTable.Table} for the component. - * @type {FooTable.Table} - */ - this.ft = instance; - /** - * Whether or not this component is enabled. Disabled components only have there preinit method called allowing for this value to be overridden. - * @type {boolean} - */ - this.enabled = F.is.boolean(enabled) ? enabled : false; - }, - /** - * The preinit method is called during the parent {@link FooTable.Table} constructor call. - * @param {object} data - The jQuery.data() object of the root table. - * @instance - * @protected - * @function - */ - preinit: null, - /** - * The init method is called during the parent {@link FooTable.Table} constructor call. - * @instance - * @protected - * @function - */ - init: null, - /** - * This method is called from the {@link FooTable.Table#destroy} method. - * @instance - * @protected - */ - destroy: null, - /** - * This method is called from the {@link FooTable.Table#draw} method. - * @instance - * @protected - * @function - */ - predraw: null, - /** - * This method is called from the {@link FooTable.Table#draw} method. - * @instance - * @protected - * @function - */ - draw: null, - /** - * This method is called from the {@link FooTable.Table#draw} method. - * @instance - * @protected - * @function - */ - postdraw: null - }); - - F.components = new F.ClassFactory(); - F.components.core = new F.ClassFactory(); - F.components.internal = new F.ClassFactory(); - -})(jQuery, FooTable); -(function($, F){ - - F.Breakpoint = F.Class.extend(/** @lends FooTable.Breakpoint */{ - /** - * The breakpoint class containing the name and maximum width for the breakpoint. - * @constructs - * @extends FooTable.Class - * @param {string} name - The name of the breakpoint. Must contain no spaces or special characters. - * @param {number} width - The width of the breakpoint in pixels. - * @returns {FooTable.Breakpoint} - */ - construct: function(name, width){ - /** - * The name of the breakpoint. - * @type {string} - */ - this.name = name; - /** - * The maximum width of the breakpoint in pixels. - * @type {number} - */ - this.width = width; - } - }); - -})(jQuery, FooTable); -(function($, F){ - F.Breakpoints = F.Component.extend(/** @lends FooTable.Breakpoints */{ - /** - * Contains the logic to calculate and apply breakpoints for the plugin. - * @constructs - * @extends FooTable.Component - * @param {FooTable.Table} table - The parent {@link FooTable.Table} this component belongs to. - * @returns {FooTable.Breakpoints} - */ - construct: function(table){ - // call the base class constructor - this._super(table, true); - - /* PROTECTED */ - /** - * This provides a shortcut to the {@link FooTable.Table#options} object. - * @protected - * @type {FooTable.Table#options} - */ - this.o = table.o; - - /* PUBLIC */ - /** - * The current breakpoint. - * @type {FooTable.Breakpoint} - */ - this.current = null; - /** - * An array of {@link FooTable.Breakpoint} objects created from parsing the options. - * @type {Array.} - */ - this.array = []; - /** - * Whether or not breakpoints cascade. When set to true all breakpoints larger than the current will be hidden along with it. - * @type {boolean} - */ - this.cascade = this.o.cascade; - /** - * Whether or not to calculate breakpoints on the width of the parent element rather than the viewport. - * @type {boolean} - */ - this.useParentWidth = this.o.useParentWidth; - /** - * This value is updated each time the current breakpoint changes and contains a space delimited string of the names of the current breakpoint and all those smaller than it. - * @type {string} - */ - this.hidden = null; - - /* PRIVATE */ - /** - * This value is set once when the {@link FooTable.Breakpoints#array} is generated and contains a space delimited string of all the breakpoint class names. - * @type {string} - * @private - */ - this._classNames = ''; - - // check if a function was supplied to override the default getWidth - this.getWidth = F.checkFnValue(this, this.o.getWidth, this.getWidth); - }, - - /* PROTECTED */ - /** - * Checks the supplied data and options for the breakpoints component. - * @instance - * @protected - * @param {object} data - The jQuery data object from the parent table. - * @fires FooTable.Breakpoints#"preinit.ft.breakpoints" - */ - preinit: function(data){ - var self = this; - /** - * The preinit.ft.breakpoints event is raised before any UI is created and provides the tables jQuery data object for additional options parsing. - * Calling preventDefault on this event will disable the entire plugin. - * @event FooTable.Breakpoints#"preinit.ft.breakpoints" - * @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. - */ - return this.ft.raise('preinit.ft.breakpoints', [data]).then(function(){ - self.cascade = F.is.boolean(data.cascade) ? data.cascade : self.cascade; - self.o.breakpoints = F.is.hash(data.breakpoints) ? data.breakpoints : self.o.breakpoints; - self.getWidth = F.checkFnValue(self, data.getWidth, self.getWidth); - if (self.o.breakpoints == null) self.o.breakpoints = { "xs": 480, "sm": 768, "md": 992, "lg": 1200 }; - // Create a nice friendly array to work with out of the breakpoints object. - for (var name in self.o.breakpoints) { - if (!self.o.breakpoints.hasOwnProperty(name)) continue; - self.array.push(new F.Breakpoint(name, self.o.breakpoints[name])); - self._classNames += 'breakpoint-' + name + ' '; - } - // Sort the breakpoints so the largest is checked first - self.array.sort(function (a, b) { - return b.width - a.width; - }); - }); - }, - /** - * Initializes the class parsing the options into a sorted array of {@link FooTable.Breakpoint} objects. - * @instance - * @protected - * @fires FooTable.Breakpoints#"init.ft.breakpoints" - */ - init: function(){ - var self = this; - /** - * The init.ft.breakpoints event is raised before any UI is generated. - * Calling preventDefault on this event will disable the entire plugin. - * @event FooTable.Breakpoints#"init.ft.breakpoints" - * @param {jQuery.Event} e - The jQuery.Event object for the event. - * @param {FooTable.Table} ft - The instance of the plugin raising the event. - */ - return this.ft.raise('init.ft.breakpoints').then(function(){ - self.current = self.get(); - }); - }, - /** - * Whenever the table is drawn this ensures the correct breakpoint class is applied to the table. - * @instance - * @protected - */ - draw: function(){ - this.ft.$el.removeClass(this._classNames).addClass('breakpoint-' + this.current.name); - }, - - /* PUBLIC */ - /** - * Calculates the current breakpoint from the {@link FooTable.Breakpoints#array} and sets the {@link FooTable.Breakpoints#current} property. - * @instance - * @returns {FooTable.Breakpoint} - */ - calculate: function(){ - var self = this, current = null, hidden = [], breakpoint, prev = null, width = self.getWidth(); - for (var i = 0, len = self.array.length; i < len; i++) { - breakpoint = self.array[i]; - // if the width is smaller than the smallest breakpoint set the smallest as the current. - // if the width is larger than the largest breakpoint set the largest as the current. - // otherwise if the width is somewhere in between check all breakpoints testing if the width - // is greater than the current but smaller than the previous. - if ((!current && i == len -1) - || (width >= breakpoint.width && (prev instanceof F.Breakpoint ? width <= prev.width : true))) { - current = breakpoint; - } - if (!current) hidden.push(breakpoint.name); - prev = breakpoint; - } - hidden.push(current.name); - self.hidden = hidden.join(' '); - return current; - }, - /** - * Supplied a columns breakpoints this returns a boolean value indicating whether or not the column is visible. - * @param {string} breakpoints - A space separated string of breakpoint names. - * @returns {boolean} - */ - visible: function(breakpoints){ - if (F.is.emptyString(breakpoints)) return true; - if (breakpoints === 'all') return false; - var parts = breakpoints.split(' '), i = 0, len = parts.length; - for (; i < len; i++){ - if (this.cascade ? F.str.containsWord(this.hidden, parts[i]) : parts[i] == this.current.name) return false; - } - return true; - }, - /** - * Performs a check between the current breakpoint and the previous breakpoint and performs a redraw if they differ. - * @instance - * @fires FooTable.Breakpoints#"before.ft.breakpoints" - * @fires FooTable.Breakpoints#"after.ft.breakpoints" - */ - check: function(){ - var self = this, bp = self.get(); - if (!(bp instanceof F.Breakpoint) - || bp == self.current) - return; - - /** - * The before.ft.breakpoints event is raised if the breakpoint has changed but before the UI is redrawn and is supplied both the current breakpoint - * and the next "new" one that is about to be applied. - * Calling preventDefault on this event will prevent the next breakpoint from being applied. - * @event FooTable.Breakpoints#"before.ft.breakpoints" - * @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.Breakpoint} current - The current breakpoint. - * @param {FooTable.Breakpoint} next - The breakpoint that is about to be applied. - */ - self.ft.raise('before.ft.breakpoints', [self.current, bp]).then(function(){ - var previous = self.current; - self.current = bp; - return self.ft.draw().then(function(){ - /** - * The after.ft.breakpoints event is raised after the breakpoint has changed and the UI is redrawn and is supplied both the "new" current breakpoint - * and the previous one that was replaced. - * @event FooTable.Breakpoints#"after.ft.breakpoints" - * @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.Breakpoint} current - The current breakpoint. - * @param {FooTable.Breakpoint} previous - The breakpoint that was just replaced. - */ - self.ft.raise('after.ft.breakpoints', [self.current, previous]); - }); - }); - }, - /** - * Attempts to return a {@link FooTable.Breakpoint} instance when passed a {@link FooTable.Breakpoint}, - * the {@link FooTable.Breakpoint#name} string or if nothing is supplied the current breakpoint. - * @instance - * @param {(FooTable.Breakpoint|string|number)} [breakpoint] - The breakpoint to retrieve. - * @returns {FooTable.Breakpoint} - */ - get: function(breakpoint){ - if (F.is.undef(breakpoint)) return this.calculate(); - if (breakpoint instanceof F.Breakpoint) return breakpoint; - if (F.is.string(breakpoint)) return F.arr.first(this.array, function (bp) { return bp.name == breakpoint; }); - if (F.is.number(breakpoint)) return breakpoint >= 0 && breakpoint < this.array.length ? this.array[breakpoint] : null; - return null; - }, - /** - * Gets the width used to determine breakpoints whether it be from the viewport, parent or a custom function. - * @instance - * @returns {number} - */ - getWidth: function(){ - if (F.is.fn(this.o.getWidth)) return this.o.getWidth(this.ft); - if (this.useParentWidth == true) return this.getParentWidth(); - return this.getViewportWidth(); - }, - /** - * Gets the tables direct parents width. - * @instance - * @returns {number} - */ - getParentWidth: function(){ - return this.ft.$el.parent().width(); - }, - /** - * Gets the current viewport width. - * @instance - * @returns {number} - */ - getViewportWidth: function(){ - var ratio = F.is.defined(window.devicePixelRatio) && F.is.mobile ? window.devicePixelRatio : 1; - return Math.max(document.documentElement.clientWidth, window.innerWidth, 0) / ratio; - } - }); - - F.components.internal.register('breakpoints', F.Breakpoints, 10); - -})(jQuery, FooTable); -(function(F){ - /** - * A space delimited string of breakpoint names that specify when the column will be hidden. You can also specify "all" to make a column permanently display in an expandable detail row. - * @type {string} - * @default null - * @example - * breakpoints: "md" - */ - F.Column.prototype.breakpoints = null; - - F.Column.prototype.__breakpoints_define__ = function(definition){ - this.breakpoints = F.is.emptyString(definition.breakpoints) ? null : definition.breakpoints; - }; - - F.Column.extend('define', function(definition){ - this._super(definition); - this.__breakpoints_define__(definition); - }); -})(FooTable); -(function(F){ - /** - * An object containing the breakpoints for the plugin. - * @type {object.} - * @default { "xs": 480, "sm": 768, "md": 992, "lg": 1200 } - */ - F.Defaults.prototype.breakpoints = null; - - /** - * Whether or not breakpoints cascade. When set to true all breakpoints larger than the current will also be hidden along with it. - * @type {boolean} - * @default false - */ - F.Defaults.prototype.cascade = false; - - /** - * Whether or not to calculate breakpoints on the width of the parent element rather than the viewport. - * @type {boolean} - * @default false - */ - F.Defaults.prototype.useParentWidth = false; - - /** - * A function used to override the default getWidth function with a custom one. - * @type {function} - * @default null - * @example - * getWidth: function(instance){ - * if (instance.o.useParentWidth == true) return instance.$el.parent().width(); - * return instance.breakpoints.getViewportWidth(); - * } - */ - F.Defaults.prototype.getWidth = null; -})(FooTable); -(function($, F){ - F.Columns = F.Component.extend(/** @lends FooTable.Columns */{ - /** - * The columns class contains all the logic for handling columns. - * @constructs - * @extends FooTable.Component - * @param {FooTable.Table} table - The parent {@link FooTable.Table} this component belongs to. - * @returns {FooTable.Columns} - */ - construct: function(table){ - // call the base class constructor - this._super(table, true); - - /* PROTECTED */ - /** - * This provides a shortcut to the {@link FooTable.Table#options} object. - * @protected - * @type {FooTable.Table#options} - */ - this.o = table.o; - - /* PUBLIC */ - /** - * An array of {@link FooTable.Column} objects created from parsing the options and/or DOM. - * @type {Array.} - */ - this.array = []; - /** - * The jQuery header row object. - * @type {jQuery} - */ - this.$header = null; - /** - * Whether or not to display the header row. - * @type {boolean} - */ - this.showHeader = table.o.showHeader; - }, - - /* PROTECTED */ - /** - * This parses the columns from either the tables rows or the supplied options. - * @instance - * @protected - * @param {object} data - The tables jQuery data object. - * @returns {jQuery.Promise} - * @this FooTable.Columns - */ - parse: function(data){ - var self = this; - return $.Deferred(function(d){ - function merge(cols1, cols2){ - var merged = []; - // check if either of the arrays is empty as it can save us having to merge them by index. - if (cols1.length == 0 || cols2.length == 0){ - merged = cols1.concat(cols2); - } else { - // at this point we have two arrays of column definitions, we now need to merge them based on there index properties - // first figure out the highest column index provided so we can loop that many times to merge all columns and provide - // defaults where nothing was specified (fill in the gaps in the array as it were). - var highest = 0; - F.arr.each(cols1.concat(cols2), function(c){ - if (c.index > highest) highest = c.index; - }); - highest++; - for (var i = 0, cols1_c, cols2_c; i < highest; i++){ - cols1_c = {}; - F.arr.each(cols1, function(c){ - if (c.index == i){ - cols1_c = c; - return false; - } - }); - cols2_c = {}; - F.arr.each(cols2, function(c){ - if (c.index == i){ - cols2_c = c; - return false; - } - }); - merged.push($.extend(true, {}, cols1_c, cols2_c)); - } - } - return merged; - } - - var json = [], html = []; - // get the column options from the content - var $header = self.ft.$el.find('tr.footable-header'), $cell, cdata; - if ($header.length == 0) $header = self.ft.$el.find('thead > tr:last:has([data-breakpoints])'); - if ($header.length == 0) $header = self.ft.$el.find('tbody > tr:first:has([data-breakpoints])'); - if ($header.length > 0){ - var virtual = $header.parent().is('tbody') && $header.children().length == $header.children('td').length; - if (!virtual) self.$header = $header.addClass('footable-header'); - $header.children('td,th').each(function(i, cell){ - $cell = $(cell); - cdata = $cell.data(); - cdata.index = i; - cdata.$el = $cell; - cdata.virtual = virtual; - html.push(cdata); - }); - if (virtual) self.showHeader = false; - } - // get the supplied column options - if (F.is.array(self.o.columns)){ - F.arr.each(self.o.columns, function(c, i){ - c.index = i; - json.push(c); - }); - self.parseFinalize(d, merge(json, html)); - } else if (F.is.promise(self.o.columns)){ - self.o.columns.then(function(cols){ - F.arr.each(cols, function(c, i){ - c.index = i; - json.push(c); - }); - self.parseFinalize(d, merge(json, html)); - }, function(xhr){ - d.reject(Error('Columns ajax request error: ' + xhr.status + ' (' + xhr.statusText + ')')); - }); - } else { - self.parseFinalize(d, merge(json, html)); - } - }); - }, - /** - * Used to finalize the parsing of columns it is supplied the parse deferred object which must be resolved with an array of {@link FooTable.Column} objects - * or rejected with an error. - * @instance - * @protected - * @param {jQuery.Deferred} deferred - The deferred object used for parsing. - * @param {Array.} cols - An array of all merged column definitions. - */ - parseFinalize: function(deferred, cols){ - // we now have a merged array of all column definitions supplied to the plugin, time to make the objects. - var self = this, columns = [], column; - F.arr.each(cols, function(def){ - // if we have a column registered using the definition type then create an instance of that column otherwise just create a default text column. - if (column = F.columns.contains(def.type) ? F.columns.make(def.type, self.ft, def) : new F.Column(self.ft, def)) - columns.push(column); - }); - if (F.is.emptyArray(columns)){ - deferred.reject(Error("No columns supplied.")); - } else { - // make sure to sort by the column index as the merge process may have mixed them up - columns.sort(function(a, b){ return a.index - b.index; }); - deferred.resolve(columns); - } - }, - /** - * The columns preinit method is used to parse and check the column options supplied from both static content and through the constructor. - * @instance - * @protected - * @param {object} data - The jQuery data object from the root table element. - * @this FooTable.Columns - */ - preinit: function(data){ - var self = this; - /** - * The preinit.ft.columns event is raised before any UI is created and provides the tables jQuery data object for additional options parsing. - * Calling preventDefault on this event will disable the entire plugin. - * @event FooTable.Columns#"preinit.ft.columns" - * @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. - */ - return self.ft.raise('preinit.ft.columns', [data]).then(function(){ - return self.parse(data).then(function(columns){ - self.array = columns; - self.showHeader = F.is.boolean(data.showHeader) ? data.showHeader : self.showHeader; - }); - }); - }, - /** - * Initializes the columns creating the table header if required. - * @instance - * @protected - * @fires FooTable.Columns#"init.ft.columns" - * @this FooTable.Columns - */ - init: function(){ - var self = this; - /** - * The init.ft.columns event is raised after the header row is created/parsed for column data. - * @event FooTable.Columns#"init.ft.columns" - * @param {jQuery.Event} e - The jQuery.Event object for the event. - * @param {FooTable.Table} instance - The instance of the plugin raising the event. - * @param {Array.} columns - The array of {@link FooTable.Column} objects parsed from the options and/or DOM. - */ - return this.ft.raise('init.ft.columns', [ self.array ]).then(function(){ - self.$create(); - }); - }, - /** - * The predraw method called from within the {@link FooTable.Table#draw} method. - * @instance - * @protected - * @this FooTable.Columns - */ - predraw: function(){ - var self = this, first = true; - self.visibleColspan = 0; - self.firstVisibleIndex = 0; - self.lastVisibleIndex = 0; - self.hasHidden = false; - F.arr.each(self.array, function(col){ - col.hidden = !self.ft.breakpoints.visible(col.breakpoints); - if (!col.hidden && col.visible){ - if (first){ - self.firstVisibleIndex = col.index; - first = false; - } - self.lastVisibleIndex = col.index; - self.visibleColspan++; - } - if (col.hidden) self.hasHidden = true; - }); - }, - /** - * Performs the actual drawing of the columns, hiding or displaying them depending on there breakpoints. - * @instance - * @protected - * @this FooTable.Columns - */ - draw: function(){ - F.arr.each(this.array, function(col){ - col.$el.css('display', (col.hidden || !col.visible ? 'none' : 'table-cell')); - }); - if (!this.showHeader && F.is.jq(this.$header.parent())){ - this.$header.detach(); - } - }, - /** - * Creates the header row for the table from the parsed column definitions. - * @instance - * @protected - * @this FooTable.Columns - */ - $create: function(){ - var self = this; - self.$header = F.is.jq(self.$header) ? self.$header : $('', {'class': 'footable-header'}); - self.$header.children('th,td').detach(); - F.arr.each(self.array, function(col){ - self.$header.append(col.$el); - }); - if (self.showHeader && !F.is.jq(self.$header.parent())){ - self.ft.$el.children('thead').append(self.$header); - } - }, - /** - * Attempts to return a {@link FooTable.Column} instance when passed the {@link FooTable.Column} instance, the {@link FooTable.Column#name} string or the {@link FooTable.Column#index} number. - * If supplied a function this will return an array by iterating all columns passing the index and column itself to the supplied callback as arguments. - * Returning true in the callback will include the column in the result. - * @instance - * @param {(FooTable.Column|string|number|function)} column - The column to retrieve. - * @returns {(Array.|FooTable.Column|null)} The column if one is found otherwise it returns NULL. - * @example - * var column = columns.get('id'); - * if (column instanceof FooTable.Column){ - * // found the "id" column - * } else { - * // no column with a name of "id" exists - * } - * // to get an array of all hidden columns - * var columns = columns.get(function(col){ - * return col.hidden; - * }); - */ - get: function(column){ - if (column instanceof F.Column) return column; - if (F.is.string(column)) return F.arr.first(this.array, function (col) { return col.name == column; }); - if (F.is.number(column)) return F.arr.first(this.array, function (col) { return col.index == column; }); - if (F.is.fn(column)) return F.arr.get(this.array, column); - return null; - }, - /** - * Takes an array of column names, index's or actual {@link FooTable.Column} and ensures that an array of only {@link FooTable.Column} is returned. - * @instance - * @param {(Array.|Array.|Array.)} columns - The array of column names, index's or {@link FooTable.Column} to check. - * @returns {Array.} - */ - ensure: function(columns){ - var self = this, result = []; - if (!F.is.array(columns)) return result; - F.arr.each(columns, function(name){ - result.push(self.get(name)); - }); - return result; - } - }); - - F.components.internal.register('columns', F.Columns, 5); - -})(jQuery, FooTable); -(function(F){ - /** - * An array containing the column options or a jQuery promise that resolves returning the columns. The index of the definitions must match the index of each column as it should appear in the table. For more information on the options available see the {@link FooTable.Column} object. - * @type {(Array.|jQuery.Promise)} - * @default [] - * @example - * columns: [ - * { name: 'id', title: 'ID', type: 'number' }, - * { name: 'name', title: 'Name', sorted: true, direction: 'ASC' } - * { name: 'age', title: 'Age', type: 'number', breakpoints: 'xs' } - * ] - */ - F.Defaults.prototype.columns = []; - - /** - * Specifies whether or not the column headers should be displayed. - * @type {boolean} - * @default true - */ - F.Defaults.prototype.showHeader = true; -})(FooTable); -(function ($, F) { - F.Rows = F.Component.extend(/** @lends FooTable.Rows */{ - /** - * The rows class contains all the logic for handling rows. - * @constructs - * @extends FooTable.Component - * @param {FooTable.Table} table - The parent {@link FooTable.Table} this component belongs to. - * @returns {FooTable.Rows} - */ - construct: function (table) { - // call the base class constructor - this._super(table, true); - - /** - * This provides a shortcut to the {@link FooTable.Table#options} object. - * @instance - * @protected - * @type {FooTable.Table#options} - */ - this.o = table.o; - /** - * The current working array of {@link FooTable.Row} objects. - * @instance - * @protected - * @type {Array.} - * @default [] - */ - this.array = []; - /** - * The base array of rows parsed from either the DOM or the constructor options. - * The {@link FooTable.Rows#current} member is populated with a shallow clone of this array - * during the predraw operation before any core or custom components are executed. - * @instance - * @protected - * @type {Array.} - * @default [] - */ - this.all = []; - /** - * Whether or not to display a toggle in each row when it contains hidden columns. - * @type {boolean} - * @default true - */ - this.showToggle = table.o.showToggle; - /** - * Specifies which column the row toggle is appended to. Supports only two values; "first" and "last" - * @type {string} - */ - this.toggleColumn = table.o.toggleColumn; - /** - * The text to display when the table has no rows. - * @type {string} - */ - this.emptyString = table.o.empty; - /** - * Whether or not the first rows details are expanded by default when displayed on a device that hides any columns. - * @type {boolean} - */ - this.expandFirst = table.o.expandFirst; - /** - * The jQuery object that contains the empty row control. - * @type {jQuery} - */ - this.$empty = null; - }, - /** - * This parses the rows from either the tables rows or the supplied options. - * @instance - * @protected - * @returns {jQuery.Promise} - */ - parse: function(){ - var self = this; - return $.Deferred(function(d){ - var $rows = self.ft.$el.children('tbody').children('tr'); - if (F.is.jq($rows)){ - self.parseFinalize(d, $rows); - $rows.detach(); - } else if (F.is.array(self.o.rows) && self.o.rows.length > 0){ - self.parseFinalize(d, self.o.rows); - } else if (F.is.promise(self.o.rows)){ - self.o.rows.then(function(rows){ - self.parseFinalize(d, rows); - }, function(xhr){ - d.reject(Error('Rows ajax request error: ' + xhr.status + ' (' + xhr.statusText + ')')); - }); - } else { - self.parseFinalize(d, []); - } - }); - }, - /** - * Used to finalize the parsing of rows it is supplied the parse deferred object which must be resolved with an array of {@link FooTable.Row} objects - * or rejected with an error. - * @instance - * @protected - * @param {jQuery.Deferred} deferred - The deferred object used for parsing. - * @param {(Array.|jQuery)} rows - An array of row values and options or the jQuery object containing all rows. - */ - parseFinalize: function(deferred, rows){ - var self = this, result = $.map(rows, function(r){ - return new F.Row(self.ft, self.ft.columns.array, r); - }); - deferred.resolve(result); - }, - /** - * The columns preinit method is used to parse and check the column options supplied from both static content and through the constructor. - * @instance - * @protected - * @param {object} data - The jQuery data object from the root table element. - * @fires FooTable.Rows#"preinit.ft.rows" - */ - preinit: function(data){ - var self = this; - /** - * The preinit.ft.rows event is raised before any UI is created and provides the tables jQuery data object for additional options parsing. - * Calling preventDefault on this event will disable the entire plugin. - * @event FooTable.Rows#"preinit.ft.rows" - * @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. - */ - return self.ft.raise('preinit.ft.rows', [data]).then(function(){ - return self.parse().then(function(rows){ - self.all = rows; - self.array = self.all.slice(0); - self.showToggle = F.is.boolean(data.showToggle) ? data.showToggle : self.showToggle; - self.toggleColumn = F.is.string(data.toggleColumn) ? data.toggleColumn : self.toggleColumn; - if (self.toggleColumn != "first" && self.toggleColumn != "last") self.toggleColumn = "first"; - self.emptyString = F.is.string(data.empty) ? data.empty : self.emptyString; - self.expandFirst = F.is.boolean(data.expandFirst) ? data.expandFirst : self.expandFirst; - }); - }); - }, - /** - * Initializes the rows class using the supplied table and options. - * @instance - * @protected - * @fires FooTable.Rows#"init.ft.rows" - */ - init: function () { - var self = this; - /** - * The init.ft.rows event is raised after the the rows are parsed from either the DOM or the options. - * Calling preventDefault on this event will disable the entire plugin. - * @event FooTable.Rows#"init.ft.rows" - * @param {jQuery.Event} e - The jQuery.Event object for the event. - * @param {FooTable.Table} instance - The instance of the plugin raising the event. - * @param {Array.} rows - The array of {@link FooTable.Row} objects parsed from the DOM or the options. - */ - return self.ft.raise('init.ft.rows', [self.all]).then(function(){ - self.$create(); - }); - }, - /** - * Performs the predraw operations that are required including creating the shallow clone of the {@link FooTable.Rows#array} to work with. - * @instance - * @protected - */ - predraw: function(){ - F.arr.each(this.array, function(row){ - row.predraw(); - }); - this.array = this.all.slice(0); - }, - $create: function(){ - this.$empty = $('', { 'class': 'footable-empty' }).append($(' + * var Person = FooTable.Class.extend({ + * construct: function(isDancing){ + * this.dancing = isDancing; + * }, + * dance: function(){ + * return this.dancing; + * } + * }); + * + * var Ninja = Person.extend({ + * construct: function(){ + * this._super( false ); + * }, + * dance: function(){ + * // Call the inherited version of dance() + * return this._super(); + * }, + * swingSword: function(){ + * return true; + * } + * }); + * + * var p = new Person(true); + * p.dance(); // => true + * + * var n = new Ninja(); + * n.dance(); // => false + * n.swingSword(); // => true + * + * // Should all be true + * p instanceof Person && p instanceof FooTable.Class && + * n instanceof Ninja && n instanceof Person && n instanceof FooTable.Class + */ + Class.extend = function (arg1 , arg2) { + var args = Array.prototype.slice.call(arguments); + arg1 = args.shift(); + arg2 = args.shift(); + + function __extend__(proto, name, func, original){ + // to all who venture here, here be dragons! + proto[name] = F.is.fn(original) && __extendable__.test(func) ? + (function (name, fn, ofn) { + return function () { + var tmp, ret; + tmp = this._super; + this._super = ofn; + ret = fn.apply(this, arguments); + this._super = tmp; + return ret; + }; + })(name, func, original) : func; + } + + if (F.is.hash(arg1)){ + var proto = Object.create(this.prototype), + _super = this.prototype; + for (var name in arg1) { + if (name === '__ctor__') continue; + __extend__(proto, name, arg1[name], _super[name]); + } + var obj = F.is.fn(proto.__ctor__) ? proto.__ctor__ : function () { + if (!F.is.fn(this.construct)) + throw new SyntaxError('FooTable class objects must be constructed with the "new" keyword.'); + this.construct.apply(this, arguments); + }; + proto.construct = F.is.fn(proto.construct) ? proto.construct : function(){}; + obj.prototype = proto; + proto.constructor = obj; + obj.extend = Class.extend; + return obj; + } else if (F.is.string(arg1) && F.is.fn(arg2)) { + __extend__(this.prototype, arg1, arg2, this.prototype[arg1]); + } + }; + + F.Class = Class; + + F.ClassFactory = F.Class.extend(/** @lends FooTable.ClassFactory */{ + /** + * This is a simple factory for {@link FooTable.Class} objects allowing them to be registered using a friendly name + * and then new instances can be created using this friendly name. + * @constructs + * @extends FooTable.Class + * @returns {FooTable.ClassFactory} + * @this FooTable.ClassFactory + */ + construct: function(){ + /** + * An object containing all registered classes. + * @type {{}} + */ + this.registered = {}; + }, + /** + * Checks if the factory contains a class registered using the supplied name. + * @instance + * @param {string} name - The name of the class to check. + * @returns {boolean} + * @this FooTable.ClassFactory + */ + contains: function(name){ + return F.is.defined(this.registered[name]); + }, + /** + * Gets an array of all registered names. + * @instance + * @returns {Array.} + * @this FooTable.ClassFactory + */ + names: function(){ + var names = [], name; + for (name in this.registered){ + if (!this.registered.hasOwnProperty(name)) continue; + names.push(name); + } + return names; + }, + /** + * Registers a class object using the supplied friendly name and priority. The priority is only taken into account when loading all registered classes + * using the {@link FooTable.ClassFactory#load} method. + * @instance + * @param {string} name - The friendly name of the class. + * @param {function} klass - The class to register. + * @param {number} priority - This determines the order that the class is created when using the {@link FooTable.ClassFactory#load} method, higher values are loaded first. + * @this FooTable.ClassFactory + */ + register: function(name, klass, priority){ + if (!F.is.string(name) || !F.is.fn(klass)) return; + var current = this.registered[name]; + this.registered[name] = { + name: name, + klass: klass, + priority: F.is.number(priority) ? priority : (F.is.defined(current) ? current.priority : 0) + }; + }, + /** + * Creates new instances of all registered classes using there priority and the supplied arguments to return them in an array. + * @instance + * @param {object} subs - An object containing classes to substitute on load. + * @param {*} arg1 - The first argument to supply when creating new instances of all registered classes. + * @param {*} [argN...] - Any number of additional arguments to supply when creating new instances of all registered classes. + * @returns {Array.} + * @this FooTable.ClassFactory + */ + load: function(subs, arg1, argN){ + var self = this, args = Array.prototype.slice.call(arguments), reg = [], loaded = [], name, klass; + subs = args.shift() || {}; + for (name in self.registered){ + if (!self.registered.hasOwnProperty(name)) continue; + var component = self.registered[name]; + if (subs.hasOwnProperty(name)){ + klass = subs[name]; + if (F.is.string(klass)) klass = F.getFnPointer(subs[name]); + if (F.is.fn(klass)){ + component = {name: name, klass: klass, priority: self.registered[name].priority}; + } + } + reg.push(component); + } + for (name in subs){ + if (!subs.hasOwnProperty(name) || self.registered.hasOwnProperty(name)) continue; + klass = subs[name]; + if (F.is.string(klass)) klass = F.getFnPointer(subs[name]); + if (F.is.fn(klass)){ + reg.push({name: name, klass: klass, priority: 0}); + } + } + reg.sort(function(a, b){ return b.priority - a.priority; }); + F.arr.each(reg, function(r){ + if (F.is.fn(r.klass)){ + loaded.push(self._make(r.klass, args)); + } + }); + return loaded; + }, + /** + * Create a new instance of a single class using the supplied name and arguments. + * @instance + * @param {string} name - The name of the class to create. + * @param {*} arg1 - The first argument to supply to the new instance. + * @param {*} [argN...] - Any number of additional arguments to supply to the new instance. + * @returns {FooTable.Class} + * @this FooTable.ClassFactory + */ + make: function(name, arg1, argN){ + var self = this, args = Array.prototype.slice.call(arguments), reg; + name = args.shift(); + reg = self.registered[name]; + if (F.is.fn(reg.klass)){ + return self._make(reg.klass, args); + } + return null; + }, + /** + * This in effect lets us use the "apply" method on a function using the "new" keyword. + * @instance + * @private + * @param {function} klass + * @param args + * @returns {FooTable.Class} + * @this FooTable.ClassFactory + */ + _make: function(klass, args){ + function Class() { + return klass.apply(this, args); + } + Class.prototype = klass.prototype; + return new Class(); + } + }); + +})(FooTable); +(function($, F){ + + /** + * Converts the supplied cssText string into JSON object. + * @param {string} cssText - The cssText to convert to a JSON object. + * @returns {object} + */ + F.css2json = function(cssText){ + if (F.is.emptyString(cssText)) return {}; + var json = {}, props = cssText.split(';'), pair, key, value; + for (var i = 0, i_len = props.length; i < i_len; i++){ + if (F.is.emptyString(props[i])) continue; + pair = props[i].split(':'); + if (F.is.emptyString(pair[0]) || F.is.emptyString(pair[1])) continue; + key = F.str.toCamelCase($.trim(pair[0])); + value = $.trim(pair[1]); + json[key] = value; + } + return json; + }; + + /** + * Attempts to retrieve a function pointer using the given name. + * @param {string} functionName - The name of the function to fetch a pointer to. + * @returns {(function|object|null)} + */ + F.getFnPointer = function(functionName){ + if (F.is.emptyString(functionName)) return null; + var pointer = window, + parts = functionName.split('.'); + F.arr.each(parts, function(part){ + if (pointer[part]) pointer = pointer[part]; + }); + return F.is.fn(pointer) ? pointer : null; + }; + + /** + * Checks the value for function properties such as the {@link FooTable.Column#formatter} option which could also be specified using just the name + * and attempts to return the correct function pointer or null if none was found matching the value. + * @param {FooTable.Class} self - The class to use as the 'this' keyword within the context of the function. + * @param {(function|string)} value - The actual function or the name of the function for the property. + * @param {function} [def] - A default function to return if none is found. + * @returns {(function|null)} + */ + F.checkFnValue = function(self, value, def){ + def = F.is.fn(def) ? def : null; + function wrap(t, fn, d){ + if (!F.is.fn(fn)) return d; + return function(){ + return fn.apply(t, arguments); + }; + } + return F.is.fn(value) ? wrap(self, value, def) : (F.is.type(value, 'string') ? wrap(self, F.getFnPointer(value), def) : def); + }; + +})(jQuery, FooTable); +(function($, F){ + + F.Cell = F.Class.extend(/** @lends FooTable.Cell */{ + /** + * The cell class containing all the properties for cells. + * @constructs + * @extends FooTable.Class + * @param {FooTable.Table} table - The root {@link FooTable.Table} this cell belongs to. + * @param {FooTable.Row} row - The parent {@link FooTable.Row} this cell belongs to. + * @param {FooTable.Column} column - The {@link FooTable.Column} this cell falls under. + * @param {(*|HTMLElement|jQuery)} valueOrElement - Either the value or the element for the cell. + * @returns {FooTable.Cell} + * @this FooTable.Cell + */ + construct: function (table, row, column, valueOrElement) { + /** + * The root {@link FooTable.Table} for the cell. + * @instance + * @readonly + * @type {FooTable.Table} + */ + this.ft = table; + /** + * The parent {@link FooTable.Row} for the cell. + * @instance + * @readonly + * @type {FooTable.Row} + */ + this.row = row; + /** + * The {@link FooTable.Column} this cell falls under. + * @instance + * @readonly + * @type {FooTable.Column} + */ + this.column = column; + this.created = false; + this.define(valueOrElement); + }, + /** + * This is supplied either the value or the cell element/jQuery object if it exists. + * If supplied the element we need set the $el property and parse the value from it. + * @instance + * @protected + * @param {(*|jQuery)} valueOrElement - The value or element to define the cell. + * @this FooTable.Cell + */ + define: function(valueOrElement){ + /** + * The jQuery table cell object this instance wraps. + * @instance + * @type {jQuery} + */ + this.$el = F.is.element(valueOrElement) || F.is.jq(valueOrElement) ? $(valueOrElement) : null; + /** + * The jQuery row object that represents this cell in the details table. + * @type {jQuery} + */ + this.$detail = null; + + var hasOptions = F.is.hash(valueOrElement) && F.is.hash(valueOrElement.options) && F.is.defined(valueOrElement.value); + + /** + * The value of the cell. + * @instance + * @type {*} + */ + this.value = this.column.parser.call(this.column, F.is.jq(this.$el) ? this.$el : (hasOptions ? valueOrElement.value : valueOrElement), this.ft.o); + + /** + * Contains any options for the cell. These are the options supplied through the plugin constructor as part of the row object itself. + * @type {object} + */ + this.o = $.extend(true, { + classes: null, + style: null + }, hasOptions ? valueOrElement.options : {}); + /** + * An array of CSS classes for the cell. + * @instance + * @protected + * @type {Array.} + */ + this.classes = F.is.jq(this.$el) && this.$el.attr('class') ? this.$el.attr('class').match(/\S+/g) : (F.is.array(this.o.classes) ? this.o.classes : (F.is.string(this.o.classes) ? this.o.classes.match(/\S+/g) : [])); + /** + * The inline styles for the cell. + * @instance + * @protected + * @type {object} + */ + this.style = F.is.jq(this.$el) && this.$el.attr('style') ? F.css2json(this.$el.attr('style')) : (F.is.hash(this.o.style) ? this.o.style : (F.is.string(this.o.style) ? F.css2json(this.o.style) : {})); + }, + /** + * After the cell has been defined this ensures that the $el and #detail properties are jQuery objects by either creating or updating them. + * @instance + * @protected + * @this FooTable.Cell + */ + $create: function(){ + if (this.created) return; + (this.$el = F.is.jq(this.$el) ? this.$el : $('').addClass(this.row.classes.join(' ')) + .data('__FooTableCell__', this) + .append($(' + * "on": { + * "click": function(e){ + * // bind a custom click event to do something whenever the table is clicked + * }, + * "init.ft.table": function(e, ft){ + * // bind to the FooTable initialize event to do something + * } + * } + */ + this.on = null; + }; + + /** + * Contains all the default options for the plugin. + * @type {FooTable.Defaults} + */ + F.defaults = new F.Defaults(); + +})(jQuery, FooTable); +(function($, F){ + + F.Row = F.Class.extend(/** @lends FooTable.Row */{ + /** + * The row class containing all the properties for a row and its' cells. + * @constructs + * @extends FooTable.Class + * @param {FooTable.Table} table - The parent {@link FooTable.Table} this component belongs to. + * @param {Array.} columns - The array of {@link FooTable.Column} for this row. + * @param {(*|HTMLElement|jQuery)} dataOrElement - Either the data for the row (create) or the element (parse) for the row. + * @returns {FooTable.Row} + */ + construct: function (table, columns, dataOrElement) { + /** + * The {@link FooTable.Table} for the row. + * @type {FooTable.Table} + */ + this.ft = table; + /** + * The array of {@link FooTable.Column} for this row. + * @type {Array.} + */ + this.columns = columns; + + this.created = false; + this.define(dataOrElement); + }, + /** + * This is supplied either the object containing the values for the row or the row element/jQuery object if it exists. + * If supplied the element we need to set the $el property and parse the cells from it using the column index. + * If we have an object we parse the cells from it using the column name. + * @param {(object|jQuery)} dataOrElement - The row object or element to define the row. + */ + define: function(dataOrElement){ + /** + * The jQuery table row object this instance wraps. + * @instance + * @protected + * @type {jQuery} + */ + this.$el = F.is.element(dataOrElement) || F.is.jq(dataOrElement) ? $(dataOrElement) : null; + /** + * The jQuery toggle element for the row. + * @instance + * @protected + * @type {jQuery} + */ + this.$toggle = $('', {'class': 'footable-toggle fooicon fooicon-plus'}); + + var isObj = F.is.hash(dataOrElement), + hasOptions = isObj && F.is.hash(dataOrElement.options) && F.is.hash(dataOrElement.value); + + /** + * The value of the row. + * @instance + * @protected + * @type {Object} + */ + this.value = isObj ? (hasOptions ? dataOrElement.value : dataOrElement) : null; + + /** + * Contains any options for the row. + * @type {object} + */ + this.o = $.extend(true, { + expanded: false, + classes: null, + style: null + }, hasOptions ? dataOrElement.options : {}); + + /** + * Whether or not this row is expanded and will display it's detail row when there are any hidden columns. + * @instance + * @protected + * @type {boolean} + */ + this.expanded = F.is.jq(this.$el) ? (this.$el.data('expanded') || this.o.expanded) : this.o.expanded; + /** + * An array of CSS classes for the row. + * @instance + * @protected + * @type {Array.} + */ + this.classes = F.is.jq(this.$el) && this.$el.attr('class') ? this.$el.attr('class').match(/\S+/g) : (F.is.array(this.o.classes) ? this.o.classes : (F.is.string(this.o.classes) ? this.o.classes.match(/\S+/g) : [])); + /** + * The inline styles for the row. + * @instance + * @protected + * @type {object} + */ + this.style = F.is.jq(this.$el) && this.$el.attr('style') ? F.css2json(this.$el.attr('style')) : (F.is.hash(this.o.style) ? this.o.style : (F.is.string(this.o.style) ? F.css2json(this.o.style) : {})); + + /** + * The cells array. This is populated before the call to the {@link FooTable.Row#$create} method. + * @instance + * @type {Array.} + */ + this.cells = this.createCells(); + + // this ensures the value contains the parsed cell values and not the supplied values + var self = this; + self.value = {}; + F.arr.each(self.cells, function(cell){ + self.value[cell.column.name] = cell.val(); + }); + }, + /** + * After the row 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.Row + */ + $create: function(){ + if (this.created) return; + (this.$el = F.is.jq(this.$el) ? this.$el : $('')) + .data('__FooTableRow__', this); + + this._setClasses(this.$el); + this._setStyle(this.$el); + + if (this.ft.rows.toggleColumn == 'last') this.$toggle.addClass('last-column'); + + this.$details = $('', { 'class': 'footable-detail-row' }) + .append($('
The below shows how this value would be setThe below shows what the default getWidth function would look like.
This example shows retrieving a column by name assuming a column called "id" exists. The columns object is an instance of {@link FooTable.Columns}.The below shows column definitions for a row defined as { id: Number, name: String, age: Number }. The ID column has a fixed width, the table is initially sorted on the Name column and the Age column will be hidden on phones.
').text(this.emptyString)); - }, - /** - * Performs the actual drawing of the table rows. - * @instance - * @protected - */ - draw: function(){ - var self = this, $tbody = self.ft.$el.children('tbody'), first = true; - // if we have rows - if (self.array.length > 0){ - self.$empty.detach(); - // loop through them appending to the tbody and then drawing - F.arr.each(self.array, function(row){ - if (self.expandFirst && first){ - row.expanded = true; - first = false; - } - row.draw($tbody); - }); - } else { - // otherwise display the $empty row - self.$empty.children('td').attr('colspan', self.ft.columns.visibleColspan); - $tbody.append(self.$empty); - } - } - }); - - F.components.internal.register('rows', F.Rows, 0); - -})(jQuery, FooTable); -(function(F){ - /** - * An array of JSON objects containing the row data or a jQuery promise that resolves returning the row data. - * @type {(Array.|jQuery.Promise)} - * @default [] - */ - F.Defaults.prototype.rows = []; - - /** - * A string to display when there are no rows in the table. - * @type {string} - * @default "No results" - */ - F.Defaults.prototype.empty = 'No results'; - - /** - * Whether or not the toggle is appended to each row. - * @type {boolean} - * @default true - */ - F.Defaults.prototype.showToggle = true; - - /** - * Specifies which column to display the row toggle in. The only supported values are "first" or "last". - * @type {string} - * @default "first" - */ - F.Defaults.prototype.toggleColumn = 'first'; - - /** - * Whether or not the first rows details are expanded by default when displayed on a device that hides any columns. - * @type {boolean} - */ - F.Defaults.prototype.expandFirst = false; +/* +* 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){ + // add in console we use in case it's missing + window.console = window.console || { log:function(){}, error:function(){} }; + + /** + * The jQuery plugin initializer. + * @function jQuery.fn.footable + * @param {(object|FooTable.Defaults)} [options] - The options to initialize the plugin with. + * @param {function} [ready] - A callback function to execute for each initialized plugin. + * @returns {jQuery} + */ + $.fn.footable = function (options, ready) { + options = options || {}; + // make sure we only work with tables + return this.filter('table').each(function (i, tbl) { + F.init(tbl, options, ready); + }); + }; + + var debug_defaults = { + events: [] + }; + F.__debug__ = JSON.parse(localStorage.getItem('footable_debug')) || false; + F.__debug_options__ = JSON.parse(localStorage.getItem('footable_debug_options')) || debug_defaults; + + /** + * Gets or sets the internal debug variable which enables some additional logging to the console. + * When enabled this value is stored in the localStorage so it can persist across page reloads. + * @param {boolean} value - Whether or not to enable additional logging. + * @param {object} [options] - Any debug specific options. + * @returns {(boolean|undefined)} + */ + F.debug = function(value, options){ + if (!F.is.boolean(value)) return F.__debug__; + F.__debug__ = value; + if (F.__debug__){ + localStorage.setItem('footable_debug', JSON.stringify(F.__debug__)); + F.__debug_options__ = $.extend(true, {}, debug_defaults, options || {}); + if (F.is.hash(options)){ + localStorage.setItem('footable_debug_options', JSON.stringify(F.__debug_options__)); + } + } else { + localStorage.removeItem('footable_debug'); + localStorage.removeItem('footable_debug_options'); + } + }; + + /** + * Gets the FooTable instance of the supplied table if one exists. + * @param {(jQuery|jQuery.selector|HTMLTableElement)} table - The jQuery table object, selector or the HTMLTableElement to retrieve FooTable from. + * @returns {(FooTable.Table|undefined)} + */ + F.get = function(table){ + return $(table).first().data('__FooTable__'); + }; + + /** + * Initializes a new instance of FooTable on the supplied table. + * @param {(jQuery|jQuery.selector|HTMLTableElement)} table - The jQuery table object, selector or the HTMLTableElement to initialize FooTable on. + * @param {object} options - The options to initialize FooTable with. + * @param {function} [ready] - A callback function to execute once the plugin is initialized. + * @returns {FooTable.Table} + */ + F.init = function(table, options, ready){ + var ft = F.get(table); + if (ft instanceof F.Table) ft.destroy(); + return new F.Table(table, options, ready); + }; + + /** + * Gets the FooTable.Row instance for the supplied element. + * @param {(jQuery|jQuery.selector|HTMLTableElement)} element - A jQuery object, selector or the HTMLElement of an element to retrieve the FooTable.Row for. + * @returns {FooTable.Row} + */ + F.getRow = function(element){ + // to get the FooTable.Row object simply walk up the DOM, find the TR and grab the __FooTableRow__ data value + var $row = $(element).closest('tr'); + // if this is a detail row get the previous row in the table to get the main TR element + if ($row.hasClass('footable-detail-row')){ + $row = $row.prev(); + } + // grab the row object + return $row.data('__FooTableRow__'); + }; + + // The below are external type definitions mainly used as pointers to jQuery docs for important information + /** + * jQuery is a fast, small, and feature-rich JavaScript library. It makes things like HTML document traversal and manipulation, event handling, animation, and Ajax much simpler with an easy-to-use API + * that works across a multitude of browsers. With a combination of versatility and extensibility, jQuery has changed the way that millions of people write JavaScript. + * @name jQuery + * @constructor + * @returns {jQuery} + * @see {@link http://api.jquery.com/} + */ + + /** + * This object provides a subset of the methods of the Deferred object (then, done, fail, always, pipe, and state) to prevent users from changing the state of the Deferred. + * @typedef {object} jQuery.Promise + * @see {@link http://api.jquery.com/Types/#Promise} + */ + + /** + * As of jQuery 1.5, the Deferred object provides a way to register multiple callbacks into self-managed callback queues, invoke callback queues as appropriate, + * and relay the success or failure state of any synchronous or asynchronous function. + * @typedef {object} jQuery.Deferred + * @see {@link http://api.jquery.com/Types/#Deferred} + */ + + /** + * jQuery's event system normalizes the event object according to W3C standards. The event object is guaranteed to be passed to the event handler. Most properties from + * the original event are copied over and normalized to the new event object. + * @typedef {object} jQuery.Event + * @see {@link http://api.jquery.com/category/events/event-object/} + */ + + /** + * Provides a way to execute callback functions based on one or more objects, usually Deferred objects that represent asynchronous events. + * @memberof jQuery + * @function when + * @param {...jQuery.Deferred} deferreds - Any number of deferred objects to wait for. + * @returns {jQuery.Promise} + * @see {@link http://api.jquery.com/jQuery.when/} + */ + + /** + * The jQuery.fn namespace used to register plugins with jQuery. + * @memberof jQuery + * @namespace fn + * @see {@link http://learn.jquery.com/plugins/basic-plugin-creation/} + */ +})( + jQuery, + /** + * The core FooTable namespace containing all the plugin code. + * @namespace + */ + FooTable = window.FooTable || {} +); +(function(F){ + var returnTrue = function(){ return true; }; + + /** + * This namespace contains commonly used array utility methods. + * @namespace {object} FooTable.arr + */ + F.arr = {}; + + /** + * Iterates over each item in the supplied array and performs the supplied function passing in the current item as the first argument. + * @memberof FooTable.arr + * @function each + * @param {Array} array - The array to iterate + * @param {function} func - The function to execute for each item. The first argument supplied to this function is the current item and the second is the current index. + */ + F.arr.each = function (array, func) { + if (!F.is.array(array) || !F.is.fn(func)) return; + for (var i = 0, len = array.length; i < len; i++) { + if (func(array[i], i) === false) break; + } + }; + + /** + * Get all items in the supplied array that optionally matches the supplied where function. If no items are found an empty array is returned. + * @memberof FooTable.arr + * @function get + * @param {Array} array - The array to get items from. + * @param {function} where - This function must return a boolean value, true includes the item in the result array. + * @returns {Array} + */ + F.arr.get = function (array, where) { + var result = []; + if (!F.is.array(array)) return result; + if (!F.is.fn(where)) return array; + for (var i = 0, len = array.length; i < len; i++) { + if (where(array[i], i)) result.push(array[i]); + } + return result; + }; + + /** + * Get a boolean value indicating if any item exists in the supplied array that optionally matches the supplied where function. + * @memberof FooTable.arr + * @function any + * @param {Array} array - The array to check. + * @param {function} [where] - [Optional] This function must return a boolean value, true indicates that the current item is a valid match. + * @returns {boolean} + */ + F.arr.any = function (array, where) { + if (!F.is.array(array)) return false; + where = F.is.fn(where) ? where : returnTrue; + for (var i = 0, len = array.length; i < len; i++) { + if (where(array[i], i)) return true; + } + return false; + }; + + /** + * Checks if the supplied value exists in the array. + * @memberof FooTable.arr + * @function contains + * @param {Array} array - The array to check. + * @param {*} value - The value to check for. + * @returns {boolean} + */ + F.arr.contains = function(array, value){ + if (!F.is.array(array) || F.is.undef(value)) return false; + for (var i = 0, len = array.length; i < len; i++) { + if (array[i] == value) return true; + } + return false; + }; + + /** + * Get the first item in the supplied array that optionally matches the supplied where function. If no item is found null is returned. + * @memberof FooTable.arr + * @function first + * @param {Array} array - The array to get the item from. + * @param {function} [where] - [Optional] This function must return a boolean value, true indicates that the current item can be returned. + * @returns {(*|null)} + */ + F.arr.first = function (array, where) { + if (!F.is.array(array)) return null; + where = F.is.fn(where) ? where : returnTrue; + for (var i = 0, len = array.length; i < len; i++) { + if (where(array[i], i)) return array[i]; + } + return null; + }; + + /** + * Creates a new array from the results of the supplied getter function. If no items are found an empty array is returned, to exclude an item from the results return null. + * @memberof FooTable.arr + * @function map + * @param {Array} array - The array to iterate. + * @param {function} getter - This function must return either a new value or null. + * The first argument is the result being returned at this point in the iteration. The second argument is the current item being iterated. + * @returns {(*|null)} + */ + F.arr.map = function (array, getter) { + var result = [], returned = null; + if (!F.is.array(array) || !F.is.fn(getter)) return result; + for (var i = 0, len = array.length; i < len; i++) { + if ((returned = getter(array[i], i)) != null) result.push(returned); + } + return result; + }; + + /** + * Removes items from the array matching the supplied where function. All removed items are returned in a new array. + * @memberof FooTable.arr + * @function remove + * @param {Array} array - The array to iterate and remove items from. + * @param {function} where - This function must return a boolean value, true includes the item in the result array. + * @returns {*} + */ + F.arr.remove = function (array, where) { + var remove = [], removed = []; + if (!F.is.array(array) || !F.is.fn(where)) return removed; + var i = 0, len = array.length; + for (; i < len; i++) { + if (where(array[i], i, removed)){ + remove.push(i); + removed.push(array[i]); + } + } + // sort the indexes to be removed from largest to smallest + remove.sort(function(a, b){ return b - a; }); + i = 0; len = remove.length; + for(; i < len; i++){ + var index = remove[i] - i; + array.splice(index, 1); + } + return removed; + }; + + /** + * Deletes a single item from the array. The item if removed is returned. + * @memberof FooTable.arr + * @function delete + * @param {Array} array - The array to iterate and delete the item from. + * @param {*} item - The item to find and delete. + * @returns {(*|null)} + */ + F.arr.delete = function(array, item){ + var remove = -1, removed = null; + if (!F.is.array(array) || F.is.undef(item)) return removed; + var i = 0, len = array.length; + for (; i < len; i++) { + if (array[i] == item){ + remove = i; + removed = array[i]; + break; + } + } + if (remove != -1) array.splice(remove, 1); + return removed; + }; + + /** + * Replaces a single item in the array with a new one. + * @memberof FooTable.arr + * @function replace + * @param {Array} array - The array to iterate and replace the item in. + * @param {*} oldItem - The item to be replaced. + * @param {*} newItem - The item to be inserted. + */ + F.arr.replace = function(array, oldItem, newItem){ + var index = array.indexOf(oldItem); + if (index !== -1) array[index] = newItem; + }; + +})(FooTable); +(function (F) { + + /** + * This namespace contains commonly used 'is' type methods that return boolean values. + * @namespace FooTable.is + */ + F.is = {}; + + /** + * Checks if the type of the value is the same as that supplied. + * @memberof FooTable.is + * @function type + * @param {*} value - The value to check the type of. + * @param {string} type - The type to check for. + * @returns {boolean} + */ + F.is.type = function (value, type) { + return typeof value === type; + }; + + /** + * Checks if the value is defined. + * @memberof FooTable.is + * @function defined + * @param {*} value - The value to check is defined. + * @returns {boolean} + */ + F.is.defined = function (value) { + return typeof value !== 'undefined'; + }; + + /** + * Checks if the value is undefined. + * @memberof FooTable.is + * @function undef + * @param {*} value - The value to check is undefined. + * @returns {boolean} + */ + F.is.undef = function (value) { + return typeof value === 'undefined'; + }; + + /** + * Checks if the value is an array. + * @memberof FooTable.is + * @function array + * @param {*} value - The value to check. + * @returns {boolean} + */ + F.is.array = function (value) { + return '[object Array]' === Object.prototype.toString.call(value); + }; + + /** + * Checks if the value is a date. + * @memberof FooTable.is + * @function date + * @param {*} value - The value to check. + * @returns {boolean} + */ + F.is.date = function (value) { + return '[object Date]' === Object.prototype.toString.call(value) && !isNaN(value.getTime()); + }; + + /** + * Checks if the value is a boolean. + * @memberof FooTable.is + * @function boolean + * @param {*} value - The value to check. + * @returns {boolean} + */ + F.is.boolean = function (value) { + return '[object Boolean]' === Object.prototype.toString.call(value); + }; + + /** + * Checks if the value is a string. + * @memberof FooTable.is + * @function string + * @param {*} value - The value to check. + * @returns {boolean} + */ + F.is.string = function (value) { + return '[object String]' === Object.prototype.toString.call(value); + }; + + /** + * Checks if the value is a number. + * @memberof FooTable.is + * @function number + * @param {*} value - The value to check. + * @returns {boolean} + */ + F.is.number = function (value) { + return '[object Number]' === Object.prototype.toString.call(value) && !isNaN(value); + }; + + /** + * Checks if the value is a function. + * @memberof FooTable.is + * @function fn + * @param {*} value - The value to check. + * @returns {boolean} + */ + F.is.fn = function (value) { + return (F.is.defined(window) && value === window.alert) || '[object Function]' === Object.prototype.toString.call(value); + }; + + /** + * Checks if the value is an error. + * @memberof FooTable.is + * @function error + * @param {*} value - The value to check. + * @returns {boolean} + */ + F.is.error = function (value) { + return '[object Error]' === Object.prototype.toString.call(value); + }; + + /** + * Checks if the value is an object. + * @memberof FooTable.is + * @function object + * @param {*} value - The value to check. + * @returns {boolean} + */ + F.is.object = function (value) { + return '[object Object]' === Object.prototype.toString.call(value); + }; + + /** + * Checks if the value is a hash. + * @memberof FooTable.is + * @function hash + * @param {*} value - The value to check. + * @returns {boolean} + */ + F.is.hash = function (value) { + return F.is.object(value) && value.constructor === Object && !value.nodeType && !value.setInterval; + }; + + /** + * Checks if the supplied object is an HTMLElement + * @memberof FooTable.is + * @function element + * @param {object} obj - The object to check. + * @returns {boolean} + */ + F.is.element = function (obj) { + return typeof HTMLElement === 'object' + ? obj instanceof HTMLElement + : obj && typeof obj === 'object' && obj !== null && obj.nodeType === 1 && typeof obj.nodeName === 'string'; + }; + + /** + * This is a simple check to determine if an object is a jQuery promise object. It simply checks the object has a "then" and "promise" function defined. + * The promise object is created as an object literal inside of jQuery.Deferred. + * It has no prototype, nor any other truly unique properties that could be used to distinguish it. + * This method should be a little more accurate than the internal jQuery one that simply checks for a "promise" method. + * @memberof FooTable.is + * @function promise + * @param {object} obj - The object to check. + * @returns {boolean} + */ + F.is.promise = function(obj){ + return F.is.object(obj) && F.is.fn(obj.then) && F.is.fn(obj.promise); + }; + + /** + * Checks if the supplied object is an instance of a jQuery object. + * @memberof FooTable.is + * @function jq + * @param {object} obj - The object to check. + * @returns {boolean} + */ + F.is.jq = function(obj){ + return F.is.defined(window.jQuery) && obj instanceof jQuery && obj.length > 0; + }; + + /** + * Checks if the supplied object is a moment.js date object. + * @memberof FooTable.is + * @function moment + * @param {object} obj - The object to check. + * @returns {boolean} + */ + F.is.moment = function(obj){ + return F.is.defined(window.moment) && F.is.object(obj) && F.is.boolean(obj._isAMomentObject) + }; + + /** + * Checks if the supplied value is an object and if it is empty. + * @memberof FooTable.is + * @function emptyObject + * @param {*} value - The value to check. + * @returns {boolean} + */ + F.is.emptyObject = function(value){ + if (!F.is.hash(value)) return false; + for(var prop in value) { + if(value.hasOwnProperty(prop)) + return false; + } + return true; + }; + + /** + * Checks if the supplied value is an array and if it is empty. + * @memberof FooTable.is + * @function emptyArray + * @param {*} value - The value to check. + * @returns {boolean} + */ + F.is.emptyArray = function(value){ + return F.is.array(value) ? value.length === 0 : true; + }; + + /** + * Checks if the supplied value is a string and if it is empty. + * @memberof FooTable.is + * @function emptyString + * @param {*} value - The value to check. + * @returns {boolean} + */ + F.is.emptyString = function(value){ + return F.is.string(value) ? value.length === 0 : true; + }; + +})(FooTable); +(function (F) { + /** + * This namespace contains commonly used string utility methods. + * @namespace FooTable.str + */ + F.str = {}; + + /** + * Checks if the supplied string contains the given substring. + * @memberof FooTable.str + * @function contains + * @param {string} str - The string to check. + * @param {string} contains - The string to check for. + * @param {boolean} [ignoreCase=false] - Whether or not to ignore casing when performing the check. + * @returns {boolean} + */ + F.str.contains = function (str, contains, ignoreCase) { + if (F.is.emptyString(str) || F.is.emptyString(contains)) return false; + return contains.length <= str.length + && (ignoreCase ? str.toUpperCase().indexOf(contains.toUpperCase()) : str.indexOf(contains)) !== -1; + }; + + /** + * Checks if the supplied string contains the exact given substring. + * @memberof FooTable.str + * @function contains + * @param {string} str - The string to check. + * @param {string} contains - The string to check for. + * @param {boolean} [ignoreCase=false] - Whether or not to ignore casing when performing the check. + * @returns {boolean} + */ + F.str.containsExact = function (str, contains, ignoreCase) { + if (F.is.emptyString(str) || F.is.emptyString(contains) || contains.length > str.length) return false; + return new RegExp('\\b'+ F.str.escapeRegExp(contains)+'\\b', ignoreCase ? 'i' : '').test(str); + }; + + /** + * Checks if the supplied string contains the given word. + * @memberof FooTable.str + * @function containsWord + * @param {string} str - The string to check. + * @param {string} word - The word to check for. + * @param {boolean} [ignoreCase=false] - Whether or not to ignore casing when performing the check. + * @returns {boolean} + */ + F.str.containsWord = function(str, word, ignoreCase){ + if (F.is.emptyString(str) || F.is.emptyString(word) || str.length < word.length) + return false; + var parts = str.split(/\W/); + for (var i = 0, len = parts.length; i < len; i++){ + if (ignoreCase ? parts[i].toUpperCase() == word.toUpperCase() : parts[i] == word) return true; + } + return false; + }; + + /** + * Returns the remainder of a string split on the first index of the given substring. + * @memberof FooTable.str + * @function from + * @param {string} str - The string to split. + * @param {string} from - The substring to split on. + * @returns {string} + */ + F.str.from = function (str, from) { + if (F.is.emptyString(str)) return str; + return F.str.contains(str, from) ? str.substring(str.indexOf(from) + 1) : str; + }; + + /** + * Checks if a string starts with the supplied prefix. + * @memberof FooTable.str + * @function startsWith + * @param {string} str - The string to check. + * @param {string} prefix - The prefix to check for. + * @returns {boolean} + */ + F.str.startsWith = function (str, prefix) { + if (F.is.emptyString(str)) return str == prefix; + return str.slice(0, prefix.length) == prefix; + }; + + /** + * Takes the supplied string and converts it to camel case. + * @memberof FooTable.str + * @function toCamelCase + * @param {string} str - The string to camel case. + * @returns {string} + */ + F.str.toCamelCase = function (str) { + if (F.is.emptyString(str)) return str; + if (str.toUpperCase() === str) return str.toLowerCase(); + return str.replace(/^([A-Z])|[-\s_](\w)/g, function (match, p1, p2) { + if (F.is.string(p2)) return p2.toUpperCase(); + return p1.toLowerCase(); + }); + }; + + /** + * Generates a random string 9 characters long using the optional prefix if supplied. + * @memberof FooTable.str + * @function random + * @param {string} [prefix] - The prefix to append to the 9 random characters. + * @returns {string} + */ + F.str.random = function(prefix){ + prefix = F.is.emptyString(prefix) ? '' : prefix; + return prefix + Math.random().toString(36).substr(2, 9); + }; + + /** + * Escapes a string for use in a regular expression. + * @memberof FooTable.str + * @function escapeRegExp + * @param {string} str - The string to escape. + * @returns {string} + */ + F.str.escapeRegExp = function(str){ + if (F.is.emptyString(str)) return str; + return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); + }; + +})(FooTable); +(function (F) { + "use strict"; + + if (!Object.create) { + Object.create = (function () { + var Object = function () {}; + return function (prototype) { + if (arguments.length > 1) + throw Error('Second argument not supported'); + + if (!F.is.object(prototype)) + throw TypeError('Argument must be an object'); + + Object.prototype = prototype; + var result = new Object(); + Object.prototype = null; + return result; + }; + })(); + } + + /** + * This base implementation does nothing except provide access to the {@link FooTable.Class#extend} method. + * @constructs FooTable.Class + * @classdesc This class is based off of John Resig's [Simple JavaScript Inheritance]{@link http://ejohn.org/blog/simple-javascript-inheritance} but it has been updated to be ES 5.1 + * compatible by implementing an [Object.create polyfill]{@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/create#Polyfill} + * for older browsers. + * @see {@link http://ejohn.org/blog/simple-javascript-inheritance} + * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/create#Polyfill} + * @returns {FooTable.Class} + */ + function Class() {} + + var __extendable__ = /xyz/.test(function () {xyz;}) ? /\b_super\b/ : /.*/; + + // this._super() within the context of the new function is a pointer to the original function + // except if the hook param is specified then the this._super variable is the result of the original function + Class.__extend__ = function(proto, name, func, original){ + // to all who venture here, here be dragons! + proto[name] = F.is.fn(original) && __extendable__.test(func) ? + (function (name, fn) { + return function () { + var tmp, ret; + tmp = this._super; + this._super = original; + ret = fn.apply(this, arguments); + this._super = tmp; + return ret; + }; + })(name, func) : func; + }; + + /** + * Creates a new class that inherits from this class which in turn allows itself to be extended or if a name and function is supplied extends only that specific function on the class. + * @param {(object|string)} arg1 - An object containing any new methods/members to implement or the name of the method to extend. + * @param {function} arg2 - If the first argument is a method name then this is the new function to replace it with. + * @returns {FooTable.Class} A new class that inherits from the base class. + * @example
The below shows an example of how to implement inheritance using this method.
')) + .data('value', this.value) + .contents().detach().end() + .append(this.format(this.value)); + + this._setClasses(this.$el); + this._setStyle(this.$el); + + this.$detail = $('
')) + .append($('')); + + this.created = true; + }, + /** + * Collapses this cell and displays it in the details row. + * @instance + * @protected + */ + collapse: function(){ + if (!this.created) return; + this.$detail.children('th').html(this.column.title); + this.$el.clone() + .attr('id', this.$el.attr('id') ? this.$el.attr('id') + '-detail' : undefined) + .css('display', 'table-cell') + .html('') + .append(this.$el.contents().detach()) + .replaceAll(this.$detail.children('td').first()); + + if (!F.is.jq(this.$detail.parent())) + this.$detail.appendTo(this.row.$details.find('.footable-details > tbody')); + }, + /** + * Restores this cell from a detail row back into the normal row. + * @instance + * @protected + */ + restore: function(){ + if (!this.created) return; + if (F.is.jq(this.$detail.parent())){ + var $cell = this.$detail.children('td').first(); + this.$el + .attr('class', $cell.attr('class')) + .attr('style', $cell.attr('style')) + .css('display', (this.column.hidden || !this.column.visible) ? 'none' : 'table-cell') + .append($cell.contents().detach()); + } + this.$detail.detach(); + }, + /** + * Helper method to call this cell's column parser function supplying the required parameters. + * @instance + * @protected + * @returns {*} + * @see FooTable.Column#parser + * @this FooTable.Cell + */ + parse: function(){ + return this.column.parser.call(this.column, this.$el, this.ft.o); + }, + /** + * Helper method to call this cell's column formatter function using the supplied value and any additional required parameters. + * @instance + * @protected + * @param {*} value - The value to format. + * @returns {(string|HTMLElement|jQuery)} + * @see FooTable.Column#formatter + * @this FooTable.Cell + */ + format: function(value){ + return this.column.formatter.call(this.column, value, this.ft.o); + }, + /** + * Allows easy access to getting or setting the cell's value. If the value is set all associated properties are also updated along with the actual element. + * Using this method also allows us to supply an object containing options and the value for the cell. + * @instance + * @param {*} [value] - The value to set for the cell. If not supplied the current value of the cell is returned. + * @param {boolean} [redraw=true] - Whether or not to redraw the row once the value has been set. + * @returns {(*|undefined)} + * @this FooTable.Cell + */ + val: function(value, redraw){ + if (F.is.undef(value)){ + // get + return this.value; + } + // set + var self = this, hasOptions = F.is.hash(value) && F.is.hash(value.options) && F.is.defined(value.value); + this.o = $.extend(true, { + classes: self.classes, + style: self.style + }, hasOptions ? value.options : {}); + + this.value = hasOptions ? value.value : value; + this.classes = F.is.array(this.o.classes) ? this.o.classes : (F.is.string(this.o.classes) ? this.o.classes.match(/\S+/g) : []); + this.style = F.is.hash(this.o.style) ? this.o.style : (F.is.string(this.o.style) ? F.css2json(this.o.style) : {}); + + if (this.created){ + this.$el.data('value', this.value).empty(); + + var $detail = this.$detail.children('td').first().empty(), + $target = F.is.jq(this.$detail.parent()) ? $detail : this.$el; + + $target.append(this.format(this.value)); + + this._setClasses($target); + this._setStyle($target); + + if (F.is.boolean(redraw) ? redraw : true) this.row.draw(); + } + }, + _setClasses: function($el){ + var hasColClasses = !F.is.emptyArray(this.column.classes), + hasClasses = !F.is.emptyArray(this.classes), + classes = null; + $el.removeAttr('class'); + if (!hasColClasses && !hasClasses) return; + if (hasColClasses && hasClasses){ + classes = this.classes.concat(this.column.classes).join(' '); + } else if (hasColClasses) { + classes = this.column.classes.join(' '); + } else if (hasClasses){ + classes = this.classes.join(' '); + } + if (!F.is.emptyString(classes)){ + $el.addClass(classes); + } + }, + _setStyle: function($el){ + var hasColStyle = !F.is.emptyObject(this.column.style), + hasStyle = !F.is.emptyObject(this.style), + style = null; + $el.removeAttr('style'); + if (!hasColStyle && !hasStyle) return; + if (hasColStyle && hasStyle){ + style = $.extend({}, this.column.style, this.style); + } else if (hasColStyle) { + style = this.column.style; + } else if (hasStyle){ + style = this.style; + } + if (F.is.hash(style)){ + $el.css(style); + } + } + }); + +})(jQuery, FooTable); +(function($, F){ + + F.Column = F.Class.extend(/** @lends FooTable.Column */{ + /** + * The column class containing all the properties for columns. All members marked as "readonly" should not be used when defining {@link FooTable.Defaults#columns}. + * @constructs + * @extends FooTable.Class + * @param {FooTable.Table} instance - The parent {@link FooTable.Table} this component belongs to. + * @param {object} definition - An object containing all the properties to set for the column. + * @param {string} [type] - The type of column, "text" by default. + * @returns {FooTable.Column} + * @this FooTable.Column + */ + construct: function(instance, definition, type){ + /** + * The root {@link FooTable.Table} for the column. + * @instance + * @readonly + * @type {FooTable.Table} + */ + this.ft = instance; + /** + * The type of data displayed by the column. + * @instance + * @readonly + * @type {string} + */ + this.type = F.is.emptyString(type) ? 'text' : type; + /** + * Whether or not the column was parsed from a standard table row containing data instead of from an actual header row. + * @instance + * @readonly + * @type {boolean} + */ + this.virtual = F.is.boolean(definition.virtual) ? definition.virtual : false; + /** + * The jQuery cell object for the column header. + * @instance + * @readonly + * @type {jQuery} + */ + this.$el = F.is.jq(definition.$el) ? definition.$el : null; + /** + * The index of the column in the table. This is set by the plugin during initialization. + * @instance + * @readonly + * @type {number} + * @default -1 + */ + this.index = F.is.number(definition.index) ? definition.index : -1; + this.define(definition); + this.$create(); + }, + /** + * This is supplied the column definition in the form of a simple object created by merging options supplied via the plugin constructor with those parsed from the DOM. + * @instance + * @protected + * @param {object} definition - The object containing the column definition. + * @this FooTable.Column + */ + define: function(definition){ + /** + * Whether or not this column is hidden from view and appears in the details row. + * @type {boolean} + * @default false + */ + this.hidden = F.is.boolean(definition.hidden) ? definition.hidden : false; + /** + * Whether or not this column is completely hidden from view and will not appear in the details row. + * @type {boolean} + * @default true + */ + this.visible = F.is.boolean(definition.visible) ? definition.visible : true; + + /** + * The name of the column. This name must correspond to the property name of the JSON row data. + * @type {string} + * @default null + */ + this.name = F.is.string(definition.name) ? definition.name : null; + if (this.name == null) this.name = 'col'+(definition.index+1); + /** + * The title to display in the column header, this can be HTML. + * @type {string} + * @default null + */ + this.title = F.is.string(definition.title) ? definition.title : null; + if (!this.virtual && this.title == null && F.is.jq(this.$el)) this.title = this.$el.html(); + if (this.title == null) this.title = 'Column '+(definition.index+1); + /** + * The styles to apply to all cells in this column. + * @type {object} + */ + this.style = F.is.hash(definition.style) ? definition.style : (F.is.string(definition.style) ? F.css2json(definition.style) : {}); + /** + * The classes to apply to all cells in this column. + * @type {Array.} + */ + this.classes = F.is.array(definition.classes) ? definition.classes : (F.is.string(definition.classes) ? definition.classes.match(/\S+/g) : []); + + // override any default functions ensuring when they are executed "this" within the context of the function points to the instance of this object. + this.parser = F.checkFnValue(this, definition.parser, this.parser); + this.formatter = F.checkFnValue(this, definition.formatter, this.formatter); + }, + /** + * 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 : $('')).html(this.title).addClass(this.classes.join(' ')).css(this.style); + }, + /** + * 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.Column#format} function + * to generate the cell contents. + * @instance + * @protected + * @param {(*|jQuery)} valueOrElement - The value or jQuery cell object. + * @returns {string} + * @this FooTable.Column + */ + parser: function(valueOrElement){ + if (F.is.element(valueOrElement) || F.is.jq(valueOrElement)){ // use jQuery to get the value + var data = $(valueOrElement).data('value'); + return F.is.defined(data) ? data : $(valueOrElement).html(); + } + if (F.is.defined(valueOrElement) && valueOrElement != null) return valueOrElement+''; // use the native toString of the value + return null; // otherwise we have no value so return null + }, + /** + * This is supplied the value retrieved from the {@link FooTable.Column#parse} function and must return a string, HTMLElement or jQuery object. + * The return value from this function is what is displayed in the cell in the table. + * @instance + * @protected + * @param {string} value - The value to format. + * @returns {(string|HTMLElement|jQuery)} + * @this FooTable.Column + */ + formatter: function(value){ + return value == null ? '' : value; + }, + /** + * Creates a cell for this column from the supplied {@link FooTable.Row} object. This allows different column types to return different types of cells. + * @instance + * @protected + * @param {FooTable.Row} row - The row to create the cell from. + * @returns {FooTable.Cell} + * @this FooTable.Column + */ + createCell: function(row){ + var element = F.is.jq(row.$el) ? row.$el.children('td,th').get(this.index) : null, + data = F.is.hash(row.value) ? row.value[this.name] : null; + return new F.Cell(this.ft, row, this, element || data); + } + }); + + F.columns = new F.ClassFactory(); + + F.columns.register('text', F.Column); + +})(jQuery, FooTable); +(function ($, F) { + + F.Component = F.Class.extend(/** @lends FooTable.Component */{ + /** + * The base class for all FooTable components. + * @constructs + * @extends FooTable.Class + * @param {FooTable.Table} instance - The parent {@link FooTable.Table} object for the component. + * @param {boolean} enabled - Whether or not the component is enabled. + * @throws {TypeError} The instance parameter must be an instance of {@link FooTable.Table}. + * @returns {FooTable.Component} + */ + construct: function (instance, enabled) { + if (!(instance instanceof F.Table)) + throw new TypeError('The instance parameter must be an instance of FooTable.Table.'); + + /** + * The parent {@link FooTable.Table} for the component. + * @type {FooTable.Table} + */ + this.ft = instance; + /** + * Whether or not this component is enabled. Disabled components only have there preinit method called allowing for this value to be overridden. + * @type {boolean} + */ + this.enabled = F.is.boolean(enabled) ? enabled : false; + }, + /** + * The preinit method is called during the parent {@link FooTable.Table} constructor call. + * @param {object} data - The jQuery.data() object of the root table. + * @instance + * @protected + * @function + */ + preinit: function(data){}, + /** + * The init method is called during the parent {@link FooTable.Table} constructor call. + * @instance + * @protected + * @function + */ + init: function(){}, + /** + * This method is called from the {@link FooTable.Table#destroy} method. + * @instance + * @protected + * @function + */ + destroy: function(){}, + /** + * This method is called from the {@link FooTable.Table#draw} method. + * @instance + * @protected + * @function + */ + predraw: function(){}, + /** + * This method is called from the {@link FooTable.Table#draw} method. + * @instance + * @protected + * @function + */ + draw: function(){}, + /** + * This method is called from the {@link FooTable.Table#draw} method. + * @instance + * @protected + * @function + */ + postdraw: function(){} + }); + + F.components = new F.ClassFactory(); + +})(jQuery, FooTable); +(function ($, F) { + /** + * Contains all the available options for the FooTable plugin. + * @name FooTable.Defaults + * @function + * @constructor + * @returns {FooTable.Defaults} + */ + F.Defaults = function () { + /** + * Whether or not events raised using the {@link FooTable.Table#raise} method are propagated up the DOM. By default this is set to false and all events bubble up the DOM as per usual + * however the reason for this option is if we have nested tables. If false the parent table would receive all the events raised by it's children and any handlers bound to both the + * parent and child would be triggered which is not the desired behavior. + * @type {boolean} + * @default false + */ + this.stopPropagation = false; + /** + * An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s). + * @type {object.} + * @default NULL + * @example
This example shows how to pass an object containing the events and handlers.
', { colspan: this.ft.columns.visibleColspan }) + .append($('', { 'class': 'footable-details ' + this.ft.classes.join(' ') }) + .append(''))); + + var self = this; + F.arr.each(self.cells, function(cell){ + if (!cell.created) cell.$create(); + self.$el.append(cell.$el); + }); + self.$el.off('click.ft.row').on('click.ft.row', { self: self }, self._onToggle); + this.created = true; + }, + /** + * This is called during the construct method and uses the current column definitions to create an array of {@link FooTable.Cell} objects for the row. + * @instance + * @protected + * @returns {Array.} + * @this FooTable.Row + */ + createCells: function(){ + var self = this; + return F.arr.map(self.columns, function(col){ + return col.createCell(self); + }); + }, + /** + * Allows easy access to getting or setting the row's data. If the data is set all associated properties are also updated along with the actual element. + * Using this method also allows us to supply an object containing options and the data for the row at the same time. + * @instance + * @param {object} [data] - The data to set for the row. If not supplied the current value of the row is returned. + * @param {boolean} [redraw=true] - Whether or not to redraw the row once the value has been set. + * @returns {(*|undefined)} + */ + val: function(data, redraw){ + var self = this; + if (!F.is.hash(data)){ + // get - check the value property and build it from the cells if required. + if (!F.is.hash(this.value) || F.is.emptyObject(this.value)){ + this.value = {}; + F.arr.each(this.cells, function(cell){ + self.value[cell.column.name] = cell.val(); + }); + } + return this.value; + } + // set + this.collapse(false); + var isObj = F.is.hash(data), + hasOptions = isObj && F.is.hash(data.options) && F.is.hash(data.value); + + this.o = $.extend(true, { + expanded: self.expanded, + classes: self.classes, + style: self.style + }, hasOptions ? data.options : {}); + + this.expanded = this.o.expanded; + this.classes = F.is.array(this.o.classes) ? this.o.classes : (F.is.string(this.o.classes) ? this.o.classes.match(/\S+/g) : []); + this.style = F.is.hash(this.o.style) ? this.o.style : (F.is.string(this.o.style) ? F.css2json(this.o.style) : {}); + if (isObj) { + if ( hasOptions ) data = data.value; + if (F.is.hash(this.value)){ + for (var prop in data) { + if (!data.hasOwnProperty(prop)) continue; + this.value[prop] = data[prop]; + } + } else { + this.value = data; + } + } else { + this.value = null; + } + + F.arr.each(this.cells, function(cell){ + if (F.is.defined(self.value[cell.column.name])) cell.val(self.value[cell.column.name], false); + }); + + if (this.created){ + this._setClasses(this.$el); + this._setStyle(this.$el); + if (F.is.boolean(redraw) ? redraw : true) this.draw(); + } + }, + _setClasses: function($el){ + var hasClasses = !F.is.emptyArray(this.classes), + classes = null; + $el.removeAttr('class'); + if (!hasClasses) return; + else classes = this.classes.join(' '); + if (!F.is.emptyString(classes)){ + $el.addClass(classes); + } + }, + _setStyle: function($el){ + var hasStyle = !F.is.emptyObject(this.style), + style = null; + $el.removeAttr('style'); + if (!hasStyle) return; + else style = this.style; + if (F.is.hash(style)){ + $el.css(style); + } + }, + /** + * Sets the current row to an expanded state displaying any hidden columns in a detail row just below it. + * @instance + * @fires FooTable.Row#"expand.ft.row" + */ + expand: function(){ + if (!this.created) return; + var self = this; + /** + * The expand.ft.row event is raised before the the row is expanded. + * Calling preventDefault on this event will stop the row being expanded. + * @event FooTable.Row#"expand.ft.row" + * @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 about to be expanded. + */ + self.ft.raise('expand.ft.row',[self]).then(function(){ + self.__hidden__ = F.arr.map(self.cells, function(cell){ + return cell.column.hidden && cell.column.visible ? cell : null; + }); + + if (self.__hidden__.length > 0){ + self.$details.insertAfter(self.$el) + .children('td').first() + .attr('colspan', self.ft.columns.visibleColspan); + + F.arr.each(self.__hidden__, function(cell){ + cell.collapse(); + }); + } + self.$el.attr('data-expanded', true); + self.$toggle.removeClass('fooicon-plus').addClass('fooicon-minus'); + self.expanded = true; + }); + }, + /** + * Sets the current row to a collapsed state removing the detail row if it exists. + * @instance + * @param {boolean} [setExpanded] - Whether or not to set the {@link FooTable.Row#expanded} property to false. + * @fires FooTable.Row#"collapse.ft.row" + */ + collapse: function(setExpanded){ + if (!this.created) return; + var self = this; + /** + * The collapse.ft.row event is raised before the the row is collapsed. + * Calling preventDefault on this event will stop the row being collapsed. + * @event FooTable.Row#"collapse.ft.row" + * @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 about to be expanded. + */ + self.ft.raise('collapse.ft.row',[self]).then(function(){ + F.arr.each(self.__hidden__, function(cell){ + cell.restore(); + }); + self.$details.detach(); + self.$el.removeAttr('data-expanded'); + self.$toggle.removeClass('fooicon-minus').addClass('fooicon-plus'); + if (F.is.boolean(setExpanded) ? setExpanded : true) self.expanded = false; + }); + }, + /** + * Prior to drawing this moves the details contents back to there original cells and detaches the toggle element from the row. + * @instance + * @param {boolean} [detach] - Whether or not to detach the row. + * @this FooTable.Row + */ + predraw: function(detach){ + if (this.created){ + if (this.expanded){ + this.collapse(false); + } + this.$toggle.detach(); + detach = F.is.boolean(detach) ? detach : true; + if (detach) this.$el.detach(); + } + }, + /** + * Draws the current row and cells. + * @instance + * @this FooTable.Row + */ + draw: function($parent){ + if (!this.created) this.$create(); + if (F.is.jq($parent)) $parent.append(this.$el); + var self = this; + F.arr.each(self.cells, function(cell){ + cell.$el.css('display', (cell.column.hidden || !cell.column.visible ? 'none' : 'table-cell')); + if (self.ft.rows.showToggle && self.ft.columns.hasHidden){ + if ((self.ft.rows.toggleColumn == 'first' && cell.column.index == self.ft.columns.firstVisibleIndex) + || (self.ft.rows.toggleColumn == 'last' && cell.column.index == self.ft.columns.lastVisibleIndex)) { + cell.$el.prepend(self.$toggle); + } + } + cell.$el.add(cell.column.$el).removeClass('footable-first-visible footable-last-visible'); + if (cell.column.index == self.ft.columns.firstVisibleIndex){ + cell.$el.add(cell.column.$el).addClass('footable-first-visible'); + } + if (cell.column.index == self.ft.columns.lastVisibleIndex){ + cell.$el.add(cell.column.$el).addClass('footable-last-visible'); + } + }); + if (this.expanded){ + this.expand(); + } + }, + /** + * Toggles the row between it's expanded and collapsed state if there are hidden columns. + * @instance + * @this FooTable.Row + */ + toggle: function(){ + if (this.created && this.ft.columns.hasHidden){ + if (this.expanded) this.collapse(); + else this.expand(); + } + }, + /** + * Handles the toggle click event for rows. + * @instance + * @param {jQuery.Event} e - The jQuery.Event object for the click event. + * @private + * @this jQuery + */ + _onToggle: function (e) { + var self = e.data.self; + // only execute the toggle if the event.target is one of the approved initiators + if ($(e.target).is(self.ft.rows.toggleSelector)){ + self.toggle(); + } + } + }); + +})(jQuery, FooTable); + +(function ($, F) { + + /** + * An array of all currently loaded instances of the plugin. + * @protected + * @readonly + * @type {Array.} + */ + F.instances = []; + + F.Table = F.Class.extend(/** @lends FooTable.Table */{ + /** + * This class is the core of the plugin and drives the logic of all components. + * @constructs + * @this FooTable.Table + * @extends FooTable.Class + * @param {(HTMLTableElement|jQuery)} element - The element or jQuery table object to bind the plugin to. + * @param {object} options - The options to initialize the plugin with. + * @param {function} [ready] - A callback function to execute once the plugin is initialized. + * @returns {FooTable.Table} + */ + construct: function (element, options, ready) { + //BEGIN MEMBERS + /** + * The timeout ID for the resize event. + * @instance + * @private + * @type {?number} + */ + this._resizeTimeout = null; + /** + * The ID of the FooTable instance. + * @instance + * @type {number} + */ + this.id = F.instances.push(this); + /** + * Whether or not the plugin and all components and add-ons are fully initialized. + * @instance + * @type {boolean} + */ + this.initialized = false; + /** + * The jQuery table object the plugin is bound to. + * @instance + * @type {jQuery} + */ + this.$el = (F.is.jq(element) ? element : $(element)).first(); // ensure one table, one instance + /** + * A loader jQuery instance + * @instance + * @type {jQuery} + */ + this.$loader = $('
', { 'class': 'footable-loader' }).append($('', {'class': 'fooicon fooicon-loader'})); + /** + * The options for the plugin. This is a merge of user defined options and the default options. + * @instance + * @type {object} + */ + this.o = $.extend(true, {}, F.defaults, options); + /** + * The jQuery data object for the table at initialization. + * @instance + * @type {object} + */ + this.data = this.$el.data() || {}; + /** + * An array of all CSS classes on the table that do not start with "footable". + * @instance + * @protected + * @type {Array.} + */ + this.classes = []; + /** + * All components for this instance of the plugin. These are executed in the order they appear in the array for the initialize phase and in reverse order for the destroy phase of the plugin. + * @instance + * @protected + * @type {object} + * @prop {Array.} internal - The internal components for the plugin. These are executed either before all other components in the initialize phase or after them in the destroy phase of the plugin. + * @prop {Array.} core - The core components for the plugin. These are executed either after the internal components in the initialize phase or before them in the destroy phase of the plugin. + * @prop {Array.} custom - The custom components for the plugin. These are executed either after the core components in the initialize phase or before them in the destroy phase of the plugin. + */ + this.components = F.components.load((F.is.hash(this.data.components) ? this.data.components : this.o.components), this); + /** + * The breakpoints component for this instance of the plugin. + * @instance + * @type {FooTable.Breakpoints} + */ + this.breakpoints = this.use(FooTable.Breakpoints); + /** + * The columns component for this instance of the plugin. + * @instance + * @type {FooTable.Columns} + */ + this.columns = this.use(FooTable.Columns); + /** + * The rows component for this instance of the plugin. + * @instance + * @type {FooTable.Rows} + */ + this.rows = this.use(FooTable.Rows); + + //END MEMBERS + this._construct(ready); + }, + /** + * Once all properties are set this performs the actual initialization of the plugin calling the {@link FooTable.Table#_preinit} and + * {@link FooTable.Table#_init} methods as well as raising the {@link FooTable.Table#"ready.ft.table"} event. + * @this FooTable.Table + * @instance + * @param {function} [ready] - A callback function to execute once the plugin is initialized. + * @private + * @returns {jQuery.Promise} + * @fires FooTable.Table#"ready.ft.table" + */ + _construct: function(ready){ + var self = this; + this._preinit().then(function(){ + return self._init(); + }).always(function(arg){ + self.$el.show(); + if (F.is.error(arg)){ + console.error('FooTable: unhandled error thrown during initialization.', arg); + } else { + /** + * The postinit.ft.table event is raised after the plugin has been initialized and the table drawn. + * Calling preventDefault on this event will stop the ready callback being executed. + * @event FooTable.Table#"postinit.ft.table" + * @param {jQuery.Event} e - The jQuery.Event object for the event. + * @param {FooTable.Table} ft - The instance of the plugin raising the event. + */ + return self.raise('ready.ft.table').then(function(){ + if (F.is.fn(ready)) ready.call(self, self); + }); + } + }); + }, + /** + * The preinit method is called prior to the plugins actual initialization and provides itself and it's components an opportunity to parse any additional option values. + * @instance + * @private + * @returns {jQuery.Promise} + * @fires FooTable.Table#"preinit.ft.table" + */ + _preinit: function(){ + var self = this; + /** + * The preinit.ft.table event is raised before any components. + * Calling preventDefault on this event will disable the entire plugin. + * @event FooTable.Table#"preinit.ft.table" + * @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 from the root table element. + */ + return this.raise('preinit.ft.table', [self.data]).then(function(){ + var classes = (self.$el.attr('class') || '').match(/\S+/g) || []; + + self.o.ajax = F.checkFnValue(self, self.data.ajax, self.o.ajax); + self.o.stopPropagation = F.is.boolean(self.data.stopPropagation) + ? self.data.stopPropagation + : self.o.stopPropagation; + + for (var i = 0, len = classes.length; i < len; i++){ + if (!F.str.startsWith(classes[i], 'footable')) self.classes.push(classes[i]); + } + + self.$el.hide().after(self.$loader); + return self.execute(false, false, 'preinit', self.data); + }); + }, + /** + * Initializes this instance of the plugin and calls the callback function if one is supplied once complete. + * @this FooTable.Table + * @instance + * @private + * @return {jQuery.Promise} + * @fires FooTable.Table#"init.ft.table" + */ + _init: function(){ + var self = this; + /** + * The init.ft.table event is raised before any components are initialized. + * Calling preventDefault on this event will disable the entire plugin. + * @event FooTable.Table#"init.ft.table" + * @param {jQuery.Event} e - The jQuery.Event object for the event. + * @param {FooTable.Table} ft - The instance of the plugin raising the event. + */ + return self.raise('init.ft.table').then(function(){ + var $thead = self.$el.children('thead'), + $tbody = self.$el.children('tbody'), + $tfoot = self.$el.children('tfoot'); + self.$el.addClass('footable footable-' + self.id); + if (F.is.hash(self.o.on)) self.$el.on(self.o.on); + if ($tfoot.length == 0) self.$el.append($tfoot = $('
')); + if ($tbody.length == 0) self.$el.append(''); + if ($thead.length == 0) self.$el.prepend($thead = $('')); + return self.execute(false, true, 'init').then(function(){ + self.$el.data('__FooTable__', self); + if ($tfoot.children('tr').length == 0) $tfoot.remove(); + if ($thead.children('tr').length == 0) $thead.remove(); + + /** + * The postinit.ft.table event is raised after any components are initialized but before the table is + * drawn for the first time. + * Calling preventDefault on this event will disable the initial drawing of the table. + * @event FooTable.Table#"postinit.ft.table" + * @param {jQuery.Event} e - The jQuery.Event object for the event. + * @param {FooTable.Table} ft - The instance of the plugin raising the event. + */ + return self.raise('postinit.ft.table').then(function(){ + return self.draw(); + }).always(function(){ + $(window).off('resize.ft'+self.id, self._onWindowResize) + .on('resize.ft'+self.id, { self: self }, self._onWindowResize); + self.initialized = true; + }); + }); + }); + }, + /** + * Destroys this plugin removing it from the table. + * @this FooTable.Table + * @instance + * @fires FooTable.Table#"destroy.ft.table" + */ + destroy: function () { + var self = this; + /** + * The destroy.ft.table event is called before all core components. + * Calling preventDefault on this event will prevent the entire plugin from being destroyed. + * @event FooTable.Table#"destroy.ft.table" + * @param {jQuery.Event} e - The jQuery.Event object for the event. + * @param {FooTable.Table} ft - The instance of the plugin raising the event. + */ + return self.raise('destroy.ft.table').then(function(){ + return self.execute(true, true, 'destroy').then(function () { + self.$el.removeData('__FooTable__').removeClass('footable-' + self.id); + if (F.is.hash(self.o.on)) self.$el.off(self.o.on); + $(window).off('resize.ft'+self.id, self._onWindowResize); + self.initialized = false; + }); + }).fail(function(err){ + if (F.is.error(err)){ + console.error('FooTable: unhandled error thrown while destroying the plugin.', err); + } + }); + }, + /** + * Raises an event on this instance supplying the args array as additional parameters to the handlers. + * @this FooTable.Table + * @instance + * @param {string} eventName - The name of the event to raise, this can include namespaces. + * @param {Array} [args] - An array containing additional parameters to be passed to any bound handlers. + * @returns {jQuery.Event} + */ + raise: function(eventName, args){ + var self = this, + debug = F.__debug__ && (F.is.emptyArray(F.__debug_options__.events) || F.arr.any(F.__debug_options__.events, function(name){ return F.str.contains(eventName, name); })); + args = args || []; + args.unshift(this); + return $.Deferred(function(d){ + var evt = $.Event(eventName); + if (self.o.stopPropagation == true){ + self.$el.one(eventName, function (e) {e.stopPropagation();}); + } + if (debug) console.log('FooTable:'+eventName+': ', args); + self.$el.trigger(evt, args); + if (evt.isDefaultPrevented()){ + if (debug) console.log('FooTable: default prevented for the "'+eventName+'" event.'); + d.reject(evt); + } else d.resolve(evt); + }); + }, + /** + * Attempts to retrieve the instance of the supplied component type for this instance. + * @this FooTable.Table + * @instance + * @param {object} type - The content type to retrieve for this instance. + * @returns {(*|null)} + */ + use: function(type){ + for (var i = 0, len = this.components.length; i < len; i++){ + if (this.components[i] instanceof type) return this.components[i]; + } + return null; + }, + /** + * Performs the drawing of the table. + * @this FooTable.Table + * @instance + * @protected + * @returns {jQuery.Promise} + * @fires FooTable.Table#"predraw.ft.table" + * @fires FooTable.Table#"draw.ft.table" + * @fires FooTable.Table#"postdraw.ft.table" + */ + draw: function () { + var self = this; + + // Clone the current table and insert it into the original's place + var $elCopy = self.$el.clone().insertBefore(self.$el); + + // Detach `self.$el` from the DOM, retaining its event handlers + self.$el.detach(); + + // when drawing the order that the components are executed is important so chain the methods but use promises to retain async safety. + return self.execute(false, true, 'predraw').then(function(){ + /** + * The predraw.ft.table event is raised after all core components and add-ons have executed there predraw functions but before they execute there draw functions. + * @event FooTable.Table#"predraw.ft.table" + * @param {jQuery.Event} e - The jQuery.Event object for the event. + * @param {FooTable.Table} ft - The instance of the plugin raising the event. + */ + return self.raise('predraw.ft.table').then(function(){ + return self.execute(false, true, 'draw').then(function(){ + /** + * The draw.ft.table event is raised after all core components and add-ons have executed there draw functions. + * @event FooTable.Table#"draw.ft.table" + * @param {jQuery.Event} e - The jQuery.Event object for the event. + * @param {FooTable.Table} ft - The instance of the plugin raising the event. + */ + return self.raise('draw.ft.table').then(function(){ + return self.execute(false, true, 'postdraw').then(function(){ + /** + * The postdraw.ft.table event is raised after all core components and add-ons have executed there postdraw functions. + * @event FooTable.Table#"postdraw.ft.table" + * @param {jQuery.Event} e - The jQuery.Event object for the event. + * @param {FooTable.Table} ft - The instance of the plugin raising the event. + */ + return self.raise('postdraw.ft.table'); + }); + }); + }); + }); + }).fail(function(err){ + if (F.is.error(err)){ + console.error('FooTable: unhandled error thrown during a draw operation.', err); + } + }).always(function(){ + // Replace the copy that we added above with the modified `self.$el` + $elCopy.replaceWith(self.$el); + self.$loader.remove(); + }); + }, + /** + * Executes the specified method with the optional number of parameters on all components and waits for the promise from each to be resolved before executing the next. + * @this FooTable.Table + * @instance + * @protected + * @param {boolean} reverse - Whether or not to execute the component methods in the reverse order to what they were registered in. + * @param {boolean} enabled - Whether or not to execute the method on enabled components only. + * @param {string} methodName - The name of the method to execute. + * @param {*} [param1] - The first parameter for the method. + * @param {...*} [paramN] - Any number of additional parameters for the method. + * @returns {jQuery.Promise} + */ + execute: function(reverse, enabled, methodName, param1, paramN){ + var self = this, args = Array.prototype.slice.call(arguments); + reverse = args.shift(); + enabled = args.shift(); + var components = enabled ? F.arr.get(self.components, function(c){ return c.enabled; }) : self.components.slice(0); + args.unshift(reverse ? components.reverse() : components); + return self._execute.apply(self, args); + }, + /** + * Executes the specified method with the optional number of parameters on all supplied components waiting for the result of each before executing the next. + * @this FooTable.Table + * @instance + * @private + * @param {Array.} components - The components to call the method on. + * @param {string} methodName - The name of the method to execute + * @param {*} [param1] - The first parameter for the method. + * @param {...*} [paramN] - Any additional parameters for the method. + * @returns {jQuery.Promise} + */ + _execute: function(components, methodName, param1, paramN){ + if (!components || !components.length) return $.when(); + var self = this, args = Array.prototype.slice.call(arguments), + component; + components = args.shift(); + methodName = args.shift(); + component = components.shift(); + + if (!F.is.fn(component[methodName])) + return self._execute.apply(self, [components, methodName].concat(args)); + + return $.Deferred(function(d){ + try { + var result = component[methodName].apply(component, args); + if (F.is.promise(result)){ + return result.then(d.resolve, d.reject); + } else { + d.resolve(result); + } + } catch (err) { + d.reject(err); + } + }).then(function(){ + return self._execute.apply(self, [components, methodName].concat(args)); + }); + }, + /** + * Listens to the window resize event and performs a check to see if the breakpoint has changed. + * @this window + * @instance + * @private + * @fires FooTable.Table#"resize.ft.table" + */ + _onWindowResize: function (e) { + var self = e.data.self; + if (self._resizeTimeout != null) { clearTimeout(self._resizeTimeout); } + self._resizeTimeout = setTimeout(function () { + self._resizeTimeout = null; + /** + * The resize event is raised a short time after window resize operations cease. + * @event FooTable.Table#"resize.ft.table" + * @param {jQuery.Event} e - The jQuery.Event object for the event. + * @param {FooTable.Table} ft - The instance of the plugin raising the event. + */ + self.raise('resize.ft.table').then(function(){ + self.breakpoints.check(); + }); + }, 300); + } + }); + +})(jQuery, FooTable); +(function($, F){ + + if (F.is.undef(window.moment)){ + // The DateColumn requires moment.js to parse and format date values. Goto http://momentjs.com/ to get it. + return; + } + + F.DateColumn = F.Column.extend(/** @lends FooTable.DateColumn */{ + /** + * The date column class is used to handle date values. This column is dependent on [moment.js]{@link http://momentjs.com/} to provide date parsing and formatting functionality. + * @constructs + * @extends FooTable.Column + * @param {FooTable.Table} instance - The parent {@link FooTable.Table} this column belongs to. + * @param {object} definition - An object containing all the properties to set for the column. + * @returns {FooTable.DateColumn} + */ + construct: function(instance, definition){ + this._super(instance, definition, 'date'); + /** + * The format string to use when parsing and formatting dates. + * @instance + * @type {string} + */ + this.formatString = F.is.string(definition.formatString) ? definition.formatString : 'MM-DD-YYYY'; + }, + /** + * 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.DateColumn#format} function + * to generate the cell contents. + * @instance + * @protected + * @param {(*|jQuery)} valueOrElement - The value or jQuery cell object. + * @returns {(moment|null)} + * @this FooTable.DateColumn + */ + parser: function(valueOrElement){ + if (F.is.element(valueOrElement) || F.is.jq(valueOrElement)){ + var data = $(valueOrElement).data('value'); + valueOrElement = F.is.defined(data) ? data : $(valueOrElement).text(); + if (F.is.string(valueOrElement)) valueOrElement = isNaN(valueOrElement) ? valueOrElement : +valueOrElement; + } + if (F.is.date(valueOrElement)) return moment(valueOrElement); + if (F.is.object(valueOrElement) && F.is.boolean(valueOrElement._isAMomentObject)) return valueOrElement; + if (F.is.string(valueOrElement)){ + // if it looks like a number convert it and do nothing else otherwise create a new moment using the string value and formatString + if (isNaN(valueOrElement)){ + return moment(valueOrElement, this.formatString); + } else { + valueOrElement = +valueOrElement; + } + } + if (F.is.number(valueOrElement)){ + return moment(valueOrElement); + } + return null; + }, + /** + * This is supplied the value retrieved from the {@link FooTable.DateColumn#parser} function and must return a string, HTMLElement or jQuery object. + * The return value from this function is what is displayed in the cell in the table. + * @instance + * @protected + * @param {*} value - The value to format. + * @returns {(string|HTMLElement|jQuery)} + * @this FooTable.DateColumn + */ + formatter: function(value){ + return F.is.object(value) && F.is.boolean(value._isAMomentObject) && value.isValid() ? value.format(this.formatString) : ''; + }, + /** + * This is supplied either the cell value or jQuery object to parse. A string value must be returned from this method and will be used during filtering operations. + * @param {(*|jQuery)} valueOrElement - The value or jQuery cell object. + * @returns {string} + * @this FooTable.DateColumn + */ + 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)) valueOrElement = $(valueOrElement).data('filterValue') || $(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)) valueOrElement = valueOrElement.options.filterValue; + if (F.is.defined(valueOrElement.value)) valueOrElement = valueOrElement.value; + } + // if the value is a moment object just return the formatted value + if (F.is.object(valueOrElement) && F.is.boolean(valueOrElement._isAMomentObject)) return valueOrElement.format(this.formatString); + // if its a string + if (F.is.string(valueOrElement)){ + // if its not a number return it + if (isNaN(valueOrElement)){ + return valueOrElement; + } else { // otherwise convert it and carry on + valueOrElement = +valueOrElement; + } + } + // if the value is a number or date convert to a moment object and return the formatted result. + if (F.is.number(valueOrElement) || F.is.date(valueOrElement)){ + return moment(valueOrElement).format(this.formatString); + } + // try use the native toString of the value if its not undefined or null + if (F.is.defined(valueOrElement) && valueOrElement != null) return valueOrElement+''; + return ''; // otherwise we have no value so return an empty string + } + }); + + F.columns.register('date', F.DateColumn); + +})(jQuery, FooTable); + +(function($, F){ + + F.HTMLColumn = F.Column.extend(/** @lends FooTable.HTMLColumn */{ + /** + * The HTML column class is used to handle any raw HTML columns. + * @constructs + * @extends FooTable.Column + * @param {FooTable.Table} instance - The parent {@link FooTable.Table} this column belongs to. + * @param {object} definition - An object containing all the properties to set for the column. + * @returns {FooTable.HTMLColumn} + */ + construct: function(instance, definition){ + this._super(instance, definition, 'html'); + }, + /** + * 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.HTMLColumn#format} function + * to generate the cell contents. + * @instance + * @protected + * @param {(*|jQuery)} valueOrElement - The value or jQuery cell object. + * @returns {(jQuery|null)} + * @this FooTable.HTMLColumn + */ + 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'){ + var data = valueOrElement.data('value'); + return F.is.defined(data) ? data : valueOrElement.contents(); + } + return valueOrElement; + } + return null; + } + }); + + F.columns.register('html', F.HTMLColumn); + +})(jQuery, FooTable); +(function($, F){ + + F.NumberColumn = F.Column.extend(/** @lends FooTable.NumberColumn */{ + /** + * The number column class is used to handle simple number columns. + * @constructs + * @extends FooTable.Column + * @param {FooTable.Table} instance - The parent {@link FooTable.Table} this column belongs to. + * @param {object} definition - An object containing all the properties to set for the column. + * @returns {FooTable.NumberColumn} + */ + construct: function(instance, definition){ + this._super(instance, definition, 'number'); + this.decimalSeparator = F.is.string(definition.decimalSeparator) ? definition.decimalSeparator : '.'; + this.thousandSeparator = F.is.string(definition.thousandSeparator) ? definition.thousandSeparator : ','; + this.decimalSeparatorRegex = new RegExp(F.str.escapeRegExp(this.decimalSeparator), 'g'); + this.thousandSeparatorRegex = new RegExp(F.str.escapeRegExp(this.thousandSeparator), 'g'); + this.cleanRegex = new RegExp('[^0-9' + F.str.escapeRegExp(this.decimalSeparator) + ']', 'g'); + }, + /** + * 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.Column#formatter} function + * to generate the cell contents. + * @instance + * @protected + * @param {(*|jQuery)} valueOrElement - The value or jQuery cell object. + * @returns {(number|null)} + * @this FooTable.NumberColumn + */ + parser: function(valueOrElement){ + if (F.is.element(valueOrElement) || F.is.jq(valueOrElement)){ + var data = $(valueOrElement).data('value'); + valueOrElement = F.is.defined(data) ? data : $(valueOrElement).text().replace(this.cleanRegex, ''); + } + if (F.is.string(valueOrElement)){ + valueOrElement = valueOrElement.replace(this.thousandSeparatorRegex, '').replace(this.decimalSeparatorRegex, '.'); + valueOrElement = parseFloat(valueOrElement); + } + if (F.is.number(valueOrElement)) return valueOrElement; + return null; + }, + /** + * This is supplied the value retrieved from the {@link FooTable.NumberColumn#parse} function and must return a string, HTMLElement or jQuery object. + * The return value from this function is what is displayed in the cell in the table. + * @instance + * @protected + * @param {number} value - The value to format. + * @returns {(string|HTMLElement|jQuery)} + * @this FooTable.NumberColumn + */ + formatter: function(value){ + if (value == null) return ''; + var s = (value + '').split('.'); + if (s.length == 2 && s[0].length > 3) { + s[0] = s[0].replace(/\B(?=(?:\d{3})+(?!\d))/g, this.thousandSeparator); + } + return s.join(this.decimalSeparator); + } + }); + + F.columns.register('number', F.NumberColumn); + +})(jQuery, FooTable); +(function($, F){ + + F.Breakpoint = F.Class.extend(/** @lends FooTable.Breakpoint */{ + /** + * The breakpoint class containing the name and maximum width for the breakpoint. + * @constructs + * @extends FooTable.Class + * @param {string} name - The name of the breakpoint. Must contain no spaces or special characters. + * @param {number} width - The width of the breakpoint in pixels. + * @returns {FooTable.Breakpoint} + */ + construct: function(name, width){ + /** + * The name of the breakpoint. + * @type {string} + */ + this.name = name; + /** + * The maximum width of the breakpoint in pixels. + * @type {number} + */ + this.width = width; + } + }); + +})(jQuery, FooTable); +(function($, F){ + F.Breakpoints = F.Component.extend(/** @lends FooTable.Breakpoints */{ + /** + * Contains the logic to calculate and apply breakpoints for the plugin. + * @constructs + * @extends FooTable.Component + * @param {FooTable.Table} table - The parent {@link FooTable.Table} this component belongs to. + * @returns {FooTable.Breakpoints} + */ + construct: function(table){ + // call the base class constructor + this._super(table, true); + + /* PROTECTED */ + /** + * This provides a shortcut to the {@link FooTable.Table#options} object. + * @protected + * @type {FooTable.Table#options} + */ + this.o = table.o; + + /* PUBLIC */ + /** + * The current breakpoint. + * @type {FooTable.Breakpoint} + */ + this.current = null; + /** + * An array of {@link FooTable.Breakpoint} objects created from parsing the options. + * @type {Array.} + */ + this.array = []; + /** + * Whether or not breakpoints cascade. When set to true all breakpoints larger than the current will be hidden along with it. + * @type {boolean} + */ + this.cascade = this.o.cascade; + /** + * Whether or not to calculate breakpoints on the width of the parent element rather than the viewport. + * @type {boolean} + */ + this.useParentWidth = this.o.useParentWidth; + /** + * This value is updated each time the current breakpoint changes and contains a space delimited string of the names of the current breakpoint and all those smaller than it. + * @type {string} + */ + this.hidden = null; + + /* PRIVATE */ + /** + * This value is set once when the {@link FooTable.Breakpoints#array} is generated and contains a space delimited string of all the breakpoint class names. + * @type {string} + * @private + */ + this._classNames = ''; + + // check if a function was supplied to override the default getWidth + this.getWidth = F.checkFnValue(this, this.o.getWidth, this.getWidth); + }, + + /* PROTECTED */ + /** + * Checks the supplied data and options for the breakpoints component. + * @instance + * @protected + * @param {object} data - The jQuery data object from the parent table. + * @fires FooTable.Breakpoints#"preinit.ft.breakpoints" + */ + preinit: function(data){ + var self = this; + /** + * The preinit.ft.breakpoints event is raised before any UI is created and provides the tables jQuery data object for additional options parsing. + * Calling preventDefault on this event will disable the entire plugin. + * @event FooTable.Breakpoints#"preinit.ft.breakpoints" + * @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. + */ + return this.ft.raise('preinit.ft.breakpoints', [data]).then(function(){ + self.cascade = F.is.boolean(data.cascade) ? data.cascade : self.cascade; + self.o.breakpoints = F.is.hash(data.breakpoints) ? data.breakpoints : self.o.breakpoints; + self.getWidth = F.checkFnValue(self, data.getWidth, self.getWidth); + if (self.o.breakpoints == null) self.o.breakpoints = { "xs": 480, "sm": 768, "md": 992, "lg": 1200 }; + // Create a nice friendly array to work with out of the breakpoints object. + for (var name in self.o.breakpoints) { + if (!self.o.breakpoints.hasOwnProperty(name)) continue; + self.array.push(new F.Breakpoint(name, self.o.breakpoints[name])); + self._classNames += 'breakpoint-' + name + ' '; + } + // Sort the breakpoints so the largest is checked first + self.array.sort(function (a, b) { + return b.width - a.width; + }); + }); + }, + /** + * Initializes the class parsing the options into a sorted array of {@link FooTable.Breakpoint} objects. + * @instance + * @protected + * @fires FooTable.Breakpoints#"init.ft.breakpoints" + */ + init: function(){ + var self = this; + /** + * The init.ft.breakpoints event is raised before any UI is generated. + * Calling preventDefault on this event will disable the entire plugin. + * @event FooTable.Breakpoints#"init.ft.breakpoints" + * @param {jQuery.Event} e - The jQuery.Event object for the event. + * @param {FooTable.Table} ft - The instance of the plugin raising the event. + */ + return this.ft.raise('init.ft.breakpoints').then(function(){ + self.current = self.get(); + }); + }, + /** + * Whenever the table is drawn this ensures the correct breakpoint class is applied to the table. + * @instance + * @protected + */ + draw: function(){ + this.ft.$el.removeClass(this._classNames).addClass('breakpoint-' + this.current.name); + }, + + /* PUBLIC */ + /** + * Calculates the current breakpoint from the {@link FooTable.Breakpoints#array} and sets the {@link FooTable.Breakpoints#current} property. + * @instance + * @returns {FooTable.Breakpoint} + */ + calculate: function(){ + var self = this, current = null, hidden = [], breakpoint, prev = null, width = self.getWidth(); + for (var i = 0, len = self.array.length; i < len; i++) { + breakpoint = self.array[i]; + // if the width is smaller than the smallest breakpoint set the smallest as the current. + // if the width is larger than the largest breakpoint set the largest as the current. + // otherwise if the width is somewhere in between check all breakpoints testing if the width + // is greater than the current but smaller than the previous. + if ((!current && i == len -1) + || (width >= breakpoint.width && (prev instanceof F.Breakpoint ? width < prev.width : true))) { + current = breakpoint; + } + if (!current) hidden.push(breakpoint.name); + prev = breakpoint; + } + hidden.push(current.name); + self.hidden = hidden.join(' '); + return current; + }, + /** + * Supplied a columns breakpoints this returns a boolean value indicating whether or not the column is visible. + * @param {string} breakpoints - A space separated string of breakpoint names. + * @returns {boolean} + */ + visible: function(breakpoints){ + if (F.is.emptyString(breakpoints)) return true; + if (breakpoints === 'all') return false; + var parts = breakpoints.split(' '), i = 0, len = parts.length; + for (; i < len; i++){ + if (this.cascade ? F.str.containsWord(this.hidden, parts[i]) : parts[i] == this.current.name) return false; + } + return true; + }, + /** + * Performs a check between the current breakpoint and the previous breakpoint and performs a redraw if they differ. + * @instance + * @fires FooTable.Breakpoints#"before.ft.breakpoints" + * @fires FooTable.Breakpoints#"after.ft.breakpoints" + */ + check: function(){ + var self = this, bp = self.get(); + if (!(bp instanceof F.Breakpoint) + || bp == self.current) + return; + + /** + * The before.ft.breakpoints event is raised if the breakpoint has changed but before the UI is redrawn and is supplied both the current breakpoint + * and the next "new" one that is about to be applied. + * Calling preventDefault on this event will prevent the next breakpoint from being applied. + * @event FooTable.Breakpoints#"before.ft.breakpoints" + * @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.Breakpoint} current - The current breakpoint. + * @param {FooTable.Breakpoint} next - The breakpoint that is about to be applied. + */ + self.ft.raise('before.ft.breakpoints', [self.current, bp]).then(function(){ + var previous = self.current; + self.current = bp; + return self.ft.draw().then(function(){ + /** + * The after.ft.breakpoints event is raised after the breakpoint has changed and the UI is redrawn and is supplied both the "new" current breakpoint + * and the previous one that was replaced. + * @event FooTable.Breakpoints#"after.ft.breakpoints" + * @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.Breakpoint} current - The current breakpoint. + * @param {FooTable.Breakpoint} previous - The breakpoint that was just replaced. + */ + self.ft.raise('after.ft.breakpoints', [self.current, previous]); + }); + }); + }, + /** + * Attempts to return a {@link FooTable.Breakpoint} instance when passed a {@link FooTable.Breakpoint}, + * the {@link FooTable.Breakpoint#name} string or if nothing is supplied the current breakpoint. + * @instance + * @param {(FooTable.Breakpoint|string|number)} [breakpoint] - The breakpoint to retrieve. + * @returns {FooTable.Breakpoint} + */ + get: function(breakpoint){ + if (F.is.undef(breakpoint)) return this.calculate(); + if (breakpoint instanceof F.Breakpoint) return breakpoint; + if (F.is.string(breakpoint)) return F.arr.first(this.array, function (bp) { return bp.name == breakpoint; }); + if (F.is.number(breakpoint)) return breakpoint >= 0 && breakpoint < this.array.length ? this.array[breakpoint] : null; + return null; + }, + /** + * Gets the width used to determine breakpoints whether it be from the viewport, parent or a custom function. + * @instance + * @returns {number} + */ + getWidth: function(){ + if (F.is.fn(this.o.getWidth)) return this.o.getWidth(this.ft); + if (this.useParentWidth == true) return this.getParentWidth(); + return this.getViewportWidth(); + }, + /** + * Gets the tables direct parents width. + * @instance + * @returns {number} + */ + getParentWidth: function(){ + return this.ft.$el.parent().width(); + }, + /** + * Gets the current viewport width. + * @instance + * @returns {number} + */ + getViewportWidth: function(){ + return Math.max(document.documentElement.clientWidth, window.innerWidth, 0); + } + }); + + F.components.register('breakpoints', F.Breakpoints, 1000); + +})(jQuery, FooTable); +(function(F){ + /** + * A space delimited string of breakpoint names that specify when the column will be hidden. You can also specify "all" to make a column permanently display in an expandable detail row. + * @type {string} + * @default null + * @example + * breakpoints: "md" + */ + F.Column.prototype.breakpoints = null; + + F.Column.prototype.__breakpoints_define__ = function(definition){ + this.breakpoints = F.is.emptyString(definition.breakpoints) ? null : definition.breakpoints; + }; + + F.Column.extend('define', function(definition){ + this._super(definition); + this.__breakpoints_define__(definition); + }); +})(FooTable); +(function(F){ + /** + * An object containing the breakpoints for the plugin. + * @type {object.} + * @default { "xs": 480, "sm": 768, "md": 992, "lg": 1200 } + */ + F.Defaults.prototype.breakpoints = null; + + /** + * Whether or not breakpoints cascade. When set to true all breakpoints larger than the current will also be hidden along with it. + * @type {boolean} + * @default false + */ + F.Defaults.prototype.cascade = false; + + /** + * Whether or not to calculate breakpoints on the width of the parent element rather than the viewport. + * @type {boolean} + * @default false + */ + F.Defaults.prototype.useParentWidth = false; + + /** + * A function used to override the default getWidth function with a custom one. + * @type {function} + * @default null + * @example + * getWidth: function(instance){ + * if (instance.o.useParentWidth == true) return instance.$el.parent().width(); + * return instance.breakpoints.getViewportWidth(); + * } + */ + F.Defaults.prototype.getWidth = null; +})(FooTable); +(function($, F){ + F.Columns = F.Component.extend(/** @lends FooTable.Columns */{ + /** + * The columns class contains all the logic for handling columns. + * @constructs + * @extends FooTable.Component + * @param {FooTable.Table} table - The parent {@link FooTable.Table} this component belongs to. + * @returns {FooTable.Columns} + */ + construct: function(table){ + // call the base class constructor + this._super(table, true); + + /* PROTECTED */ + /** + * This provides a shortcut to the {@link FooTable.Table#options} object. + * @protected + * @type {FooTable.Table#options} + */ + this.o = table.o; + + /* PUBLIC */ + /** + * An array of {@link FooTable.Column} objects created from parsing the options and/or DOM. + * @type {Array.} + */ + this.array = []; + /** + * The jQuery header row object. + * @type {jQuery} + */ + this.$header = null; + /** + * Whether or not to display the header row. + * @type {boolean} + */ + this.showHeader = table.o.showHeader; + + this._fromHTML = F.is.emptyArray(table.o.columns) && !F.is.promise(table.o.columns); + }, + + /* PROTECTED */ + /** + * This parses the columns from either the tables rows or the supplied options. + * @instance + * @protected + * @param {object} data - The tables jQuery data object. + * @returns {jQuery.Promise} + * @this FooTable.Columns + */ + parse: function(data){ + var self = this; + return $.Deferred(function(d){ + function merge(cols1, cols2){ + var merged = []; + // check if either of the arrays is empty as it can save us having to merge them by index. + if (cols1.length == 0 || cols2.length == 0){ + merged = cols1.concat(cols2); + } else { + // at this point we have two arrays of column definitions, we now need to merge them based on there index properties + // first figure out the highest column index provided so we can loop that many times to merge all columns and provide + // defaults where nothing was specified (fill in the gaps in the array as it were). + var highest = 0; + F.arr.each(cols1.concat(cols2), function(c){ + if (c.index > highest) highest = c.index; + }); + highest++; + for (var i = 0, cols1_c, cols2_c; i < highest; i++){ + cols1_c = {}; + F.arr.each(cols1, function(c){ + if (c.index == i){ + cols1_c = c; + return false; + } + }); + cols2_c = {}; + F.arr.each(cols2, function(c){ + if (c.index == i){ + cols2_c = c; + return false; + } + }); + merged.push($.extend(true, {}, cols1_c, cols2_c)); + } + } + return merged; + } + + var json = [], html = []; + // get the column options from the content + var $header = self.ft.$el.find('tr.footable-header, thead > tr:last:has([data-breakpoints]), tbody > tr:first:has([data-breakpoints]), thead > tr:last, tbody > tr:first').first(), $cell, cdata; + if ($header.length > 0){ + var virtual = $header.parent().is('tbody') && $header.children().length == $header.children('td').length; + if (!virtual) self.$header = $header.addClass('footable-header'); + $header.children('td,th').each(function(i, cell){ + $cell = $(cell); + cdata = $cell.data(); + cdata.index = i; + cdata.$el = $cell; + cdata.virtual = virtual; + html.push(cdata); + }); + if (virtual) self.showHeader = false; + } + // get the supplied column options + if (F.is.array(self.o.columns) && !F.is.emptyArray(self.o.columns)){ + F.arr.each(self.o.columns, function(c, i){ + c.index = i; + json.push(c); + }); + self.parseFinalize(d, merge(json, html)); + } else if (F.is.promise(self.o.columns)){ + self.o.columns.then(function(cols){ + F.arr.each(cols, function(c, i){ + c.index = i; + json.push(c); + }); + self.parseFinalize(d, merge(json, html)); + }, function(xhr){ + d.reject(Error('Columns ajax request error: ' + xhr.status + ' (' + xhr.statusText + ')')); + }); + } else { + self.parseFinalize(d, merge(json, html)); + } + }); + }, + /** + * Used to finalize the parsing of columns it is supplied the parse deferred object which must be resolved with an array of {@link FooTable.Column} objects + * or rejected with an error. + * @instance + * @protected + * @param {jQuery.Deferred} deferred - The deferred object used for parsing. + * @param {Array.} cols - An array of all merged column definitions. + */ + parseFinalize: function(deferred, cols){ + // we now have a merged array of all column definitions supplied to the plugin, time to make the objects. + var self = this, columns = [], column; + F.arr.each(cols, function(def){ + // if we have a column registered using the definition type then create an instance of that column otherwise just create a default text column. + if (column = F.columns.contains(def.type) ? F.columns.make(def.type, self.ft, def) : new F.Column(self.ft, def)) + columns.push(column); + }); + if (F.is.emptyArray(columns)){ + deferred.reject(Error("No columns supplied.")); + } else { + // make sure to sort by the column index as the merge process may have mixed them up + columns.sort(function(a, b){ return a.index - b.index; }); + deferred.resolve(columns); + } + }, + /** + * The columns preinit method is used to parse and check the column options supplied from both static content and through the constructor. + * @instance + * @protected + * @param {object} data - The jQuery data object from the root table element. + * @this FooTable.Columns + */ + preinit: function(data){ + var self = this; + /** + * The preinit.ft.columns event is raised before any UI is created and provides the tables jQuery data object for additional options parsing. + * Calling preventDefault on this event will disable the entire plugin. + * @event FooTable.Columns#"preinit.ft.columns" + * @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. + */ + return self.ft.raise('preinit.ft.columns', [data]).then(function(){ + return self.parse(data).then(function(columns){ + self.array = columns; + self.showHeader = F.is.boolean(data.showHeader) ? data.showHeader : self.showHeader; + }); + }); + }, + /** + * Initializes the columns creating the table header if required. + * @instance + * @protected + * @fires FooTable.Columns#"init.ft.columns" + * @this FooTable.Columns + */ + init: function(){ + var self = this; + /** + * The init.ft.columns event is raised after the header row is created/parsed for column data. + * @event FooTable.Columns#"init.ft.columns" + * @param {jQuery.Event} e - The jQuery.Event object for the event. + * @param {FooTable.Table} instance - The instance of the plugin raising the event. + * @param {Array.} columns - The array of {@link FooTable.Column} objects parsed from the options and/or DOM. + */ + return this.ft.raise('init.ft.columns', [ self.array ]).then(function(){ + self.$create(); + }); + }, + /** + * Destroys the columns component removing any UI generated from the table. + * @instance + * @protected + * @fires FooTable.Columns#"destroy.ft.columns" + */ + destroy: function(){ + /** + * The destroy.ft.columns event is raised before its UI is removed. + * Calling preventDefault on this event will prevent the component from being destroyed. + * @event FooTable.Columns#"destroy.ft.columns" + * @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.columns').then(function(){ + if (!self._fromHTML) self.$header.remove(); + }); + }, + /** + * The predraw method called from within the {@link FooTable.Table#draw} method. + * @instance + * @protected + * @this FooTable.Columns + */ + predraw: function(){ + var self = this, first = true; + self.visibleColspan = 0; + self.firstVisibleIndex = 0; + self.lastVisibleIndex = 0; + self.hasHidden = false; + F.arr.each(self.array, function(col){ + col.hidden = !self.ft.breakpoints.visible(col.breakpoints); + if (!col.hidden && col.visible){ + if (first){ + self.firstVisibleIndex = col.index; + first = false; + } + self.lastVisibleIndex = col.index; + self.visibleColspan++; + } + if (col.hidden) self.hasHidden = true; + }); + self.ft.$el.toggleClass('breakpoint', self.hasHidden); + }, + /** + * Performs the actual drawing of the columns, hiding or displaying them depending on there breakpoints. + * @instance + * @protected + * @this FooTable.Columns + */ + draw: function(){ + F.arr.each(this.array, function(col){ + col.$el.css('display', (col.hidden || !col.visible ? 'none' : 'table-cell')); + }); + if (!this.showHeader && F.is.jq(this.$header.parent())){ + this.$header.detach(); + } + }, + /** + * Creates the header row for the table from the parsed column definitions. + * @instance + * @protected + * @this FooTable.Columns + */ + $create: function(){ + var self = this; + self.$header = F.is.jq(self.$header) ? self.$header : $('', {'class': 'footable-header'}); + self.$header.children('th,td').detach(); + F.arr.each(self.array, function(col){ + self.$header.append(col.$el); + }); + if (self.showHeader && !F.is.jq(self.$header.parent())){ + self.ft.$el.children('thead').append(self.$header); + } + }, + /** + * Attempts to return a {@link FooTable.Column} instance when passed the {@link FooTable.Column} instance, the {@link FooTable.Column#name} string or the {@link FooTable.Column#index} number. + * If supplied a function this will return an array by iterating all columns passing the index and column itself to the supplied callback as arguments. + * Returning true in the callback will include the column in the result. + * @instance + * @param {(FooTable.Column|string|number|function)} column - The column to retrieve. + * @returns {(Array.|FooTable.Column|null)} The column if one is found otherwise it returns NULL. + * @example + * var column = columns.get('id'); + * if (column instanceof FooTable.Column){ + * // found the "id" column + * } else { + * // no column with a name of "id" exists + * } + * // to get an array of all hidden columns + * var columns = columns.get(function(col){ + * return col.hidden; + * }); + */ + get: function(column){ + if (column instanceof F.Column) return column; + if (F.is.string(column)) return F.arr.first(this.array, function (col) { return col.name == column; }); + if (F.is.number(column)) return F.arr.first(this.array, function (col) { return col.index == column; }); + if (F.is.fn(column)) return F.arr.get(this.array, column); + return null; + }, + /** + * Takes an array of column names, index's or actual {@link FooTable.Column} and ensures that an array of only {@link FooTable.Column} is returned. + * @instance + * @param {(Array.|Array.|Array.)} columns - The array of column names, index's or {@link FooTable.Column} to check. + * @returns {Array.} + */ + ensure: function(columns){ + var self = this, result = []; + if (!F.is.array(columns)) return result; + F.arr.each(columns, function(name){ + result.push(self.get(name)); + }); + return result; + } + }); + + F.components.register('columns', F.Columns, 900); + +})(jQuery, FooTable); +(function(F){ + /** + * An array containing the column options or a jQuery promise that resolves returning the columns. The index of the definitions must match the index of each column as it should appear in the table. For more information on the options available see the {@link FooTable.Column} object. + * @type {(Array.|jQuery.Promise)} + * @default [] + * @example + * columns: [ + * { name: 'id', title: 'ID', type: 'number' }, + * { name: 'name', title: 'Name', sorted: true, direction: 'ASC' } + * { name: 'age', title: 'Age', type: 'number', breakpoints: 'xs' } + * ] + */ + F.Defaults.prototype.columns = []; + + /** + * Specifies whether or not the column headers should be displayed. + * @type {boolean} + * @default true + */ + F.Defaults.prototype.showHeader = true; +})(FooTable); +(function ($, F) { + F.Rows = F.Component.extend(/** @lends FooTable.Rows */{ + /** + * The rows class contains all the logic for handling rows. + * @constructs + * @extends FooTable.Component + * @param {FooTable.Table} table - The parent {@link FooTable.Table} this component belongs to. + * @returns {FooTable.Rows} + */ + construct: function (table) { + // call the base class constructor + this._super(table, true); + + /** + * This provides a shortcut to the {@link FooTable.Table#options} object. + * @instance + * @protected + * @type {FooTable.Table#options} + */ + this.o = table.o; + /** + * The current working array of {@link FooTable.Row} objects. + * @instance + * @protected + * @type {Array.} + * @default [] + */ + this.array = []; + /** + * The base array of rows parsed from either the DOM or the constructor options. + * The {@link FooTable.Rows#current} member is populated with a shallow clone of this array + * during the predraw operation before any core or custom components are executed. + * @instance + * @protected + * @type {Array.} + * @default [] + */ + this.all = []; + /** + * Whether or not to display a toggle in each row when it contains hidden columns. + * @type {boolean} + * @default true + */ + this.showToggle = table.o.showToggle; + /** + * The CSS selector used to filter row click events. If the event.target property matches the selector the row will be toggled. + * @type {string} + * @default "tr,td,.footable-toggle" + */ + this.toggleSelector = table.o.toggleSelector; + /** + * Specifies which column the row toggle is appended to. Supports only two values; "first" and "last" + * @type {string} + */ + this.toggleColumn = table.o.toggleColumn; + /** + * The text to display when the table has no rows. + * @type {string} + */ + this.emptyString = table.o.empty; + /** + * Whether or not the first rows details are expanded by default when displayed on a device that hides any columns. + * @type {boolean} + */ + this.expandFirst = table.o.expandFirst; + /** + * Whether or not all row details are expanded by default when displayed on a device that hides any columns. + * @type {boolean} + */ + this.expandAll = table.o.expandAll; + /** + * The jQuery object that contains the empty row control. + * @type {jQuery} + */ + this.$empty = null; + this._fromHTML = F.is.emptyArray(table.o.rows) && !F.is.promise(table.o.rows); + }, + /** + * This parses the rows from either the tables rows or the supplied options. + * @instance + * @protected + * @returns {jQuery.Promise} + */ + parse: function(){ + var self = this; + return $.Deferred(function(d){ + var $rows = self.ft.$el.children('tbody').children('tr'); + if (F.is.array(self.o.rows) && self.o.rows.length > 0){ + self.parseFinalize(d, self.o.rows); + } else if (F.is.promise(self.o.rows)){ + self.o.rows.then(function(rows){ + self.parseFinalize(d, rows); + }, function(xhr){ + d.reject(Error('Rows ajax request error: ' + xhr.status + ' (' + xhr.statusText + ')')); + }); + } else if (F.is.jq($rows)){ + self.parseFinalize(d, $rows); + $rows.detach(); + } else { + self.parseFinalize(d, []); + } + }); + }, + /** + * Used to finalize the parsing of rows it is supplied the parse deferred object which must be resolved with an array of {@link FooTable.Row} objects + * or rejected with an error. + * @instance + * @protected + * @param {jQuery.Deferred} deferred - The deferred object used for parsing. + * @param {(Array.|jQuery)} rows - An array of row values and options or the jQuery object containing all rows. + */ + parseFinalize: function(deferred, rows){ + var self = this, result = $.map(rows, function(r){ + return new F.Row(self.ft, self.ft.columns.array, r); + }); + deferred.resolve(result); + }, + /** + * The columns preinit method is used to parse and check the column options supplied from both static content and through the constructor. + * @instance + * @protected + * @param {object} data - The jQuery data object from the root table element. + * @fires FooTable.Rows#"preinit.ft.rows" + */ + preinit: function(data){ + var self = this; + /** + * The preinit.ft.rows event is raised before any UI is created and provides the tables jQuery data object for additional options parsing. + * Calling preventDefault on this event will disable the entire plugin. + * @event FooTable.Rows#"preinit.ft.rows" + * @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. + */ + return self.ft.raise('preinit.ft.rows', [data]).then(function(){ + return self.parse().then(function(rows){ + self.all = rows; + self.array = self.all.slice(0); + self.showToggle = F.is.boolean(data.showToggle) ? data.showToggle : self.showToggle; + self.toggleSelector = F.is.string(data.toggleSelector) ? data.toggleSelector : self.toggleSelector; + self.toggleColumn = F.is.string(data.toggleColumn) ? data.toggleColumn : self.toggleColumn; + if (self.toggleColumn != "first" && self.toggleColumn != "last") self.toggleColumn = "first"; + self.emptyString = F.is.string(data.empty) ? data.empty : self.emptyString; + self.expandFirst = F.is.boolean(data.expandFirst) ? data.expandFirst : self.expandFirst; + self.expandAll = F.is.boolean(data.expandAll) ? data.expandAll : self.expandAll; + }); + }); + }, + /** + * Initializes the rows class using the supplied table and options. + * @instance + * @protected + * @fires FooTable.Rows#"init.ft.rows" + */ + init: function () { + var self = this; + /** + * The init.ft.rows event is raised after the the rows are parsed from either the DOM or the options. + * Calling preventDefault on this event will disable the entire plugin. + * @event FooTable.Rows#"init.ft.rows" + * @param {jQuery.Event} e - The jQuery.Event object for the event. + * @param {FooTable.Table} instance - The instance of the plugin raising the event. + * @param {Array.} rows - The array of {@link FooTable.Row} objects parsed from the DOM or the options. + */ + return self.ft.raise('init.ft.rows', [self.all]).then(function(){ + self.$create(); + }); + }, + /** + * Destroys the rows component removing any UI generated from the table. + * @instance + * @protected + * @fires FooTable.Rows#"destroy.ft.rows" + */ + destroy: function(){ + /** + * The destroy.ft.rows event is raised before its UI is removed. + * Calling preventDefault on this event will prevent the component from being destroyed. + * @event FooTable.Rows#"destroy.ft.rows" + * @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.rows').then(function(){ + F.arr.each(self.array, function(row){ + row.predraw(!self._fromHTML); + }); + }); + }, + /** + * Performs the predraw operations that are required including creating the shallow clone of the {@link FooTable.Rows#array} to work with. + * @instance + * @protected + */ + predraw: function(){ + F.arr.each(this.array, function(row){ + row.predraw(); + }); + this.array = this.all.slice(0); + }, + $create: function(){ + this.$empty = $('', { 'class': 'footable-empty' }).append($('").addClass(this.row.classes.join(" ")).data("__FooTableCell__",this).append(a("")).data("__FooTableRow__",this),this._setClasses(this.$el),this._setStyle(this.$el),"last"==this.ft.rows.toggleColumn&&this.$toggle.addClass("last-column"),this.$details=a("",{"class":"footable-detail-row"}).append(a("
The below shows how this value would be setThe below shows what the default getWidth function would look like.
This example shows retrieving a column by name assuming a column called "id" exists. The columns object is an instance of {@link FooTable.Columns}.The below shows column definitions for a row defined as { id: Number, name: String, age: Number }. The ID column has a fixed width, the table is initially sorted on the Name column and the Age column will be hidden on phones.
').text(this.emptyString)); + }, + /** + * Performs the actual drawing of the table rows. + * @instance + * @protected + */ + draw: function(){ + var self = this, $tbody = self.ft.$el.children('tbody'), first = true; + // if we have rows + if (self.array.length > 0){ + self.$empty.detach(); + // loop through them appending to the tbody and then drawing + F.arr.each(self.array, function(row){ + if ((self.expandFirst && first) || self.expandAll){ + row.expanded = true; + first = false; + } + row.draw($tbody); + }); + } else { + // otherwise display the $empty row + self.$empty.children('td').attr('colspan', self.ft.columns.visibleColspan); + $tbody.append(self.$empty); + } + }, + /** + * Loads a JSON array of row objects into the table + * @instance + * @param {Array.} data - An array of row objects to load. + * @param {boolean} [append=false] - Whether or not to append the new rows to the current rows array or to replace them entirely. + */ + load: function(data, append){ + var self = this, rows = $.map(data, function(r){ + return new F.Row(self.ft, self.ft.columns.array, r); + }); + F.arr.each(this.array, function(row){ + row.predraw(); + }); + this.all = (F.is.boolean(append) ? append : false) ? this.all.concat(rows) : rows; + this.array = this.all.slice(0); + this.ft.draw(); + }, + /** + * Expands all visible rows. + * @instance + */ + expand: function(){ + F.arr.each(this.array, function(row){ + row.expand(); + }); + }, + /** + * Collapses all visible rows. + * @instance + */ + collapse: function(){ + F.arr.each(this.array, function(row){ + row.collapse(); + }); + } + }); + + F.components.register('rows', F.Rows, 800); + +})(jQuery, FooTable); +(function(F){ + /** + * An array of JSON objects containing the row data or a jQuery promise that resolves returning the row data. + * @type {(Array.|jQuery.Promise)} + * @default [] + */ + F.Defaults.prototype.rows = []; + + /** + * A string to display when there are no rows in the table. + * @type {string} + * @default "No results" + */ + F.Defaults.prototype.empty = 'No results'; + + /** + * Whether or not the toggle is appended to each row. + * @type {boolean} + * @default true + */ + F.Defaults.prototype.showToggle = true; + + /** + * The CSS selector used to filter row click events. If the event.target property matches the selector the row will be toggled. + * @type {string} + * @default "tr,td,.footable-toggle" + */ + F.Defaults.prototype.toggleSelector = 'tr,td,.footable-toggle'; + + /** + * Specifies which column to display the row toggle in. The only supported values are "first" or "last". + * @type {string} + * @default "first" + */ + F.Defaults.prototype.toggleColumn = 'first'; + + /** + * Whether or not the first rows details are expanded by default when displayed on a device that hides any columns. + * @type {boolean} + */ + F.Defaults.prototype.expandFirst = false; + + /** + * Whether or not all row details are expanded by default when displayed on a device that hides any columns. + * @type {boolean} + */ + F.Defaults.prototype.expandAll = false; +})(FooTable); +(function(F){ + /** + * Loads a JSON array of row objects into the table + * @param {Array.} data - An array of row objects to load. + * @param {boolean} [append=false] - Whether or not to append the new rows to the current rows array or to replace them entirely. + */ + F.Table.prototype.loadRows = function(data, append){ + this.rows.load(data, append); + }; })(FooTable); \ No newline at end of file diff --git a/admin/custom/footable3/js/footable.core.min.js b/admin/custom/footable3/js/footable.core.min.js index 14e14bc52..c452f54b6 100644 --- a/admin/custom/footable3/js/footable.core.min.js +++ b/admin/custom/footable3/js/footable.core.min.js @@ -1,9 +1,9 @@ /* * 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. */ -!function(a,b){window.console=window.console||{log:function(){},error:function(){}},a.fn.footable=function(a,c){return a=a||{},this.filter("table").each(function(d,e){var f=b.get(e);f instanceof b.Table&&f.destroy(),b.init(e,a,c)})};var c={events:[]};b.__debug__=JSON.parse(localStorage.getItem("footable_debug"))||!1,b.__debug_options__=JSON.parse(localStorage.getItem("footable_debug_options"))||c,b.debug=function(d,e){return b.is["boolean"](d)?(b.__debug__=d,void(b.__debug__?(localStorage.setItem("footable_debug",JSON.stringify(b.__debug__)),b.__debug_options__=a.extend(!0,{},c,e||{}),b.is.hash(e)&&localStorage.setItem("footable_debug_options",JSON.stringify(b.__debug_options__))):(localStorage.removeItem("footable_debug"),localStorage.removeItem("footable_debug_options")))):b.__debug__},b.get=function(b){return a(b).first().data("__FooTable__")},b.init=function(a,c,d){return new b.Table(a,c,d)}}(jQuery,FooTable=window.FooTable||{}),function(a){var b=function(){return!0};a.arr={},a.arr.each=function(b,c){if(a.is.array(b)&&a.is.fn(c))for(var d=0,e=b.length;e>d&&c(b[d],d)!==!1;d++);},a.arr.get=function(b,c){var d=[];if(!a.is.array(b))return d;if(!a.is.fn(c))return b;for(var e=0,f=b.length;f>e;e++)c(b[e],e)&&d.push(b[e]);return d},a.arr.any=function(c,d){if(!a.is.array(c))return!1;d=a.is.fn(d)?d:b;for(var e=0,f=c.length;f>e;e++)if(d(c[e],e))return!0;return!1},a.arr.contains=function(b,c){if(!a.is.array(b)||a.is.undef(c))return!1;for(var d=0,e=b.length;e>d;d++)if(b[d]==c)return!0;return!1},a.arr.first=function(c,d){if(!a.is.array(c))return null;d=a.is.fn(d)?d:b;for(var e=0,f=c.length;f>e;e++)if(d(c[e],e))return c[e];return null},a.arr.map=function(b,c){var d=[],e=null;if(!a.is.array(b)||!a.is.fn(c))return d;for(var f=0,g=b.length;g>f;f++)null!=(e=c(b[f],f))&&d.push(e);return d},a.arr.remove=function(b,c){var d=[],e=[];if(!a.is.array(b)||!a.is.fn(c))return e;for(var f=0,g=b.length;g>f;f++)c(b[f],f,e)&&(d.push(f),e.push(b[f]));for(d.sort(function(a,b){return b-a}),f=0,g=d.length;g>f;f++){var h=d[f]-f;b.splice(h,1)}return e},a.arr["delete"]=function(b,c){var d=-1,e=null;if(!a.is.array(b)||a.is.undef(c))return e;for(var f=0,g=b.length;g>f;f++)if(b[f]==c){d=f,e=b[f];break}return-1!=d&&b.splice(d,1),e},a.arr.replace=function(a,b,c){var d=a.indexOf(b);-1!==d&&(a[d]=c)}}(FooTable),function(a){a.is={},a.is.type=function(a,b){return typeof a===b},a.is.defined=function(a){return"undefined"!=typeof a},a.is.undef=function(a){return"undefined"==typeof a},a.is.array=function(a){return"[object Array]"===Object.prototype.toString.call(a)},a.is.date=function(a){return"[object Date]"===Object.prototype.toString.call(a)&&!isNaN(a.getTime())},a.is["boolean"]=function(a){return"[object Boolean]"===Object.prototype.toString.call(a)},a.is.string=function(a){return"[object String]"===Object.prototype.toString.call(a)},a.is.number=function(a){return"[object Number]"===Object.prototype.toString.call(a)&&!isNaN(a)},a.is.fn=function(b){return a.is.defined(window)&&b===window.alert||"[object Function]"===Object.prototype.toString.call(b)},a.is.error=function(a){return"[object Error]"===Object.prototype.toString.call(a)},a.is.object=function(a){return"[object Object]"===Object.prototype.toString.call(a)},a.is.hash=function(b){return a.is.object(b)&&b.constructor===Object&&!b.nodeType&&!b.setInterval},a.is.element=function(a){return"object"==typeof HTMLElement?a instanceof HTMLElement:a&&"object"==typeof a&&null!==a&&1===a.nodeType&&"string"==typeof a.nodeName},a.is.promise=function(b){return a.is.object(b)&&a.is.fn(b.then)&&a.is.fn(b.promise)},a.is.jq=function(b){return a.is.defined(window.jQuery)&&b instanceof jQuery&&b.length>0},a.is.moment=function(b){return a.is.defined(window.moment)&&a.is.object(b)&&a.is["boolean"](b._isAMomentObject)},a.is.emptyObject=function(b){if(!a.is.hash(b))return!1;for(var c in b)if(b.hasOwnProperty(c))return!1;return!0},a.is.emptyArray=function(b){return a.is.array(b)?0===b.length:!0},a.is.emptyString=function(b){return a.is.string(b)?0===b.length:!0},a.is.mobile=function(a){return/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))}(navigator.userAgent||navigator.vendor||window.opera)}(FooTable),function(a){a.str={},a.str.contains=function(b,c,d){return!a.is.emptyString(b)&&!a.is.emptyString(c)&&c.length<=b.length&&-1!==(d?b.toUpperCase().indexOf(c.toUpperCase()):b.indexOf(c))},a.str.containsWord=function(b,c,d){if(a.is.emptyString(b)||a.is.emptyString(c)||b.lengthf;f++)if(d?e[f].toUpperCase()==c.toUpperCase():e[f]==c)return!0;return!1},a.str.from=function(a,b){return this.contains(a,b)?a.substring(a.indexOf(b)+1):a},a.str.startsWith=function(a,b){return a.slice(0,b.length)==b},a.str.toCamelCase=function(a){return a.toUpperCase()===a?a.toLowerCase():a.replace(/^([A-Z])|[-\s_](\w)/g,function(a,b,c){return c?c.toUpperCase():b.toLowerCase()})},a.str.random=function(b){return b=a.is.emptyString(b)?"":b,b+Math.random().toString(36).substr(2,9)},a.str.escapeRegExp=function(a){return a.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")}}(FooTable),function(a){"use strict";function b(){}Object.create||(Object.create=function(){var b=function(){};return function(c){if(arguments.length>1)throw Error("Second argument not supported");if(!a.is.object(c))throw TypeError("Argument must be an object");b.prototype=c;var d=new b;return b.prototype=null,d}}());var c=/xyz/.test(function(){xyz})?/\b_super\b/:/.*/;b.__extend__=function(b,d,e,f){b[d]=a.is.fn(f)&&c.test(e)?function(a,b){return function(){var a,c;return a=this._super,this._super=f,c=b.apply(this,arguments),this._super=a,c}}(d,e):e},b.extend=function(d,e){function f(b,d,e,f){b[d]=a.is.fn(f)&&c.test(e)?function(a,b,c){return function(){var a,d;return a=this._super,this._super=c,d=b.apply(this,arguments),this._super=a,d}}(d,e,f):e}var g=Array.prototype.slice.call(arguments);if(d=g.shift(),e=g.shift(),a.is.hash(d)){var h=Object.create(this.prototype),i=this.prototype;for(var j in d)"__ctor__"!==j&&f(h,j,d[j],i[j]);var k=a.is.fn(h.__ctor__)?h.__ctor__:function(){if(!a.is.fn(this.construct))throw new SyntaxError('FooTable class objects must be constructed with the "new" keyword.');this.construct.apply(this,arguments)};return h.construct=a.is.fn(h.construct)?h.construct:function(){},k.prototype=h,h.constructor=k,k.extend=b.extend,k}a.is.string(d)&&a.is.fn(e)&&f(this.prototype,d,e,this.prototype[d])},a.Class=b,a.ClassFactory=a.Class.extend({construct:function(){this.registered={}},contains:function(b){return a.is.defined(this.registered[b])},names:function(){var a,b=[];for(a in this.registered)this.registered.hasOwnProperty(a)&&b.push(a);return b},register:function(b,c,d){if(a.is.string(b)&&a.is.fn(c)){var e=this.registered[b];this.registered[b]={name:b,klass:c,priority:a.is.number(d)?d:a.is.defined(e)?e.priority:0}}},load:function(b,c){var d=this,e=Array.prototype.slice.call(arguments),f=[],g=[];for(var h in d.registered)d.registered.hasOwnProperty(h)&&f.push(d.registered[h]);return f.sort(function(a,b){return b.priority-a.priority}),a.arr.each(f,function(b){a.is.fn(b.klass)&&g.push(d._make(b.klass,e))}),g},make:function(b,c,d){var e,f=this,g=Array.prototype.slice.call(arguments);return b=g.shift(),e=f.registered[b],a.is.fn(e.klass)?f._make(e.klass,g):null},_make:function(a,b){function c(){return a.apply(this,b)}return c.prototype=a.prototype,new c}})}(FooTable),function(a,b){b.css2json=function(c){if(b.is.emptyString(c))return{};for(var d,e,f,g={},h=c.split(";"),i=0,j=h.length;j>i;i++)d=h[i].split(":"),e=b.str.toCamelCase(a.trim(d[0])),f=a.trim(d[1]),g[e]=f;return g},b.getFnPointer=function(a){return b.is.emptyString(a)?null:b.is.fn(window[a])?window[a]:null},b.checkFnValue=function(a,c,d){function e(a,c,d){return b.is.fn(c)?function(){return c.apply(a,arguments)}:d}return d=b.is.fn(d)?d:null,b.is.fn(c)?e(a,c,d):b.is.type(c,"string")?e(a,b.getFnPointer(c),d):d}}(jQuery,FooTable),function(a,b){b.Cell=b.Class.extend({construct:function(a,b,c,d){this.ft=a,this.row=b,this.column=c,this.created=!1,this.define(d)},define:function(c){this.$el=b.is.element(c)||b.is.jq(c)?a(c):null,this.$detail=null;var d=b.is.hash(c)&&b.is.hash(c.options)&&b.is.defined(c.value);this.value=this.column.parser.call(this.column,b.is.jq(this.$el)?this.$el:d?c.value:c,this.ft.o),this.o=a.extend(!0,{classes:null,style:null},d?c.options:{}),this.classes=b.is.jq(this.$el)&&this.$el.attr("class")?this.$el.attr("class").match(/\S+/g):b.is.array(this.o.classes)?this.o.classes:b.is.string(this.o.classes)?this.o.classes.match(/\S+/g):[],this.style=b.is.jq(this.$el)&&this.$el.attr("style")?b.css2json(this.$el.attr("style")):b.is.hash(this.o.style)?this.o.style:b.is.string(this.o.style)?b.css2json(this.o.style):{}},$create:function(){this.created||((this.$el=b.is.jq(this.$el)?this.$el:a("")).data("value",this.value).contents().detach().end().append(this.format(this.value)),this._setClasses(this.$el),this._setStyle(this.$el),this.$detail=a("
")).append(a("")),this.created=!0)},collapse:function(){this.created&&(this.$detail.children("th").html(this.column.title),this.$detail.children("td").first().attr("class",this.$el.attr("class")).attr("style",this.$el.attr("style")).css("display","table-cell").append(this.$el.contents().detach()),b.is.jq(this.$detail.parent())||this.$detail.appendTo(this.row.$details.find(".footable-details > tbody")))},restore:function(){if(this.created){if(b.is.jq(this.$detail.parent())){var a=this.$detail.children("td").first();this.$el.attr("class",a.attr("class")).attr("style",a.attr("style")).css("display",this.column.hidden||!this.column.visible?"none":"table-cell").append(a.contents().detach())}this.$detail.detach()}},parse:function(){return this.column.parser.call(this.column,this.$el,this.ft.o)},format:function(a){return this.column.formatter.call(this.column,a,this.ft.o)},val:function(c,d){if(b.is.undef(c))return this.value;var e=this,f=b.is.hash(c)&&b.is.hash(c.options)&&b.is.defined(c.value);if(this.o=a.extend(!0,{classes:e.classes,style:e.style},f?c.options:{}),this.value=f?c.value:c,this.classes=b.is.array(this.o.classes)?this.o.classes:b.is.string(this.o.classes)?this.o.classes.match(/\S+/g):[],this.style=b.is.hash(this.o.style)?this.o.style:b.is.string(this.o.style)?b.css2json(this.o.style):{},this.created){this.$el.data("value",this.value).empty();var g=this.$detail.children("td").first().empty(),h=b.is.jq(this.$detail.parent())?g:this.$el;h.append(this.format(this.value)),this._setClasses(h),this._setStyle(h),(b.is["boolean"](d)?d:!0)&&this.row.draw()}},_setClasses:function(a){var c=!b.is.emptyArray(this.column.classes),d=!b.is.emptyArray(this.classes),e=null;a.removeAttr("class"),(c||d)&&(c&&d?e=this.classes.concat(this.column.classes).join(" "):c?e=this.column.classes.join(" "):d&&(e=this.classes.join(" ")),b.is.emptyString(e)||a.addClass(e))},_setStyle:function(c){var d=!b.is.emptyObject(this.column.style),e=!b.is.emptyObject(this.style),f=null;c.removeAttr("style"),(d||e)&&(d&&e?f=a.extend({},this.column.style,this.style):d?f=this.column.style:e&&(f=this.style),b.is.hash(f)&&c.css(f))}})}(jQuery,FooTable),function(a,b){b.Column=b.Class.extend({construct:function(a,c,d){this.ft=a,this.type=b.is.emptyString(d)?"text":d,this.virtual=b.is["boolean"](c.virtual)?c.virtual:!1,this.$el=b.is.jq(c.$el)?c.$el:null,this.index=b.is.number(c.index)?c.index:-1,this.define(c),this.$create()},define:function(a){this.hidden=b.is["boolean"](a.hidden)?a.hidden:!1,this.visible=b.is["boolean"](a.visible)?a.visible:!0,this.name=b.is.string(a.name)?a.name:null,null==this.name&&(this.name="col"+(a.index+1)),this.title=b.is.string(a.title)?a.title:null,!this.virtual&&null==this.title&&b.is.jq(this.$el)&&(this.title=this.$el.html()),null==this.title&&(this.title="Column "+(a.index+1)),this.style=b.is.hash(a.style)?a.style:b.is.string(a.style)?b.css2json(a.style):{},this.classes=b.is.array(a.classes)?a.classes:b.is.string(a.classes)?a.classes.match(/\S+/g):[],this.parser=b.checkFnValue(this,a.parser,this.parser),this.formatter=b.checkFnValue(this,a.formatter,this.formatter)},$create:function(){(this.$el=!this.virtual&&b.is.jq(this.$el)?this.$el:a("")).html(this.title)},parser:function(c){return b.is.element(c)||b.is.jq(c)?a(c).data("value")||a(c).text():b.is.defined(c)&&null!=c?c+"":null},formatter:function(a){return null==a?"":a},createCell:function(a){var c=b.is.jq(a.$el)?a.$el.children("td,th").get(this.index):null,d=b.is.hash(a.value)?a.value[this.name]:null;return new b.Cell(this.ft,a,this,c||d)}}),b.columns=new b.ClassFactory,b.columns.register("text",b.Column)}(jQuery,FooTable),function(a,b){b.Defaults=function(){this.stopPropagation=!1,this.on=null},b.defaults=new b.Defaults}(jQuery,FooTable),function(a,b){b.Row=b.Class.extend({construct:function(a,b,c){this.ft=a,this.columns=b,this.created=!1,this.define(c),this.val()},define:function(c){this.$el=b.is.element(c)||b.is.jq(c)?a(c):null,this.$toggle=a("",{"class":"footable-toggle fooicon fooicon-plus"});var d=b.is.hash(c),e=d&&b.is.hash(c.options)&&b.is.hash(c.value);this.value=d?e?c.value:c:null,this.o=a.extend(!0,{expanded:!1,classes:null,style:null},e?c.options:{}),this.expanded=b.is.jq(this.$el)?this.$el.data("expanded")||this.o.expanded:this.o.expanded,this.classes=b.is.jq(this.$el)&&this.$el.attr("class")?this.$el.attr("class").match(/\S+/g):b.is.array(this.o.classes)?this.o.classes:b.is.string(this.o.classes)?this.o.classes.match(/\S+/g):[],this.style=b.is.jq(this.$el)&&this.$el.attr("style")?b.css2json(this.$el.attr("style")):b.is.hash(this.o.style)?this.o.style:b.is.string(this.o.style)?b.css2json(this.o.style):{},this.cells=this.createCells()},$create:function(){if(!this.created){(this.$el=b.is.jq(this.$el)?this.$el:a("
",{colspan:this.ft.columns.visibleColspan}).append(a("",{"class":"footable-details "+this.ft.classes.join(" ")}).append("")));var c=this;b.arr.each(c.cells,function(a){a.created||a.$create(),c.$el.append(a.$el)}),c.$el.off("click.ft.row").on("click.ft.row",{self:c},c._onToggle),this.created=!0}},createCells:function(){var a=this;return b.arr.map(a.columns,function(b){return b.createCell(a)})},val:function(c){var d=this;if(!b.is.hash(c))return b.is.hash(this.value)&&!b.is.emptyObject(this.value)||(this.value={},b.arr.each(this.cells,function(a){d.value[a.column.name]=a.val()})),this.value;this.collapse(!1);var e=b.is.hash(c),f=e&&b.is.hash(c.options)&&b.is.hash(c.value);this.o=a.extend(!0,{expanded:d.expanded,classes:d.classes,style:d.style},f?c.options:{}),this.expanded=this.o.expanded,this.classes=b.is.array(this.o.classes)?this.o.classes:b.is.string(this.o.classes)?this.o.classes.match(/\S+/g):[],this.style=b.is.hash(this.o.style)?this.o.style:b.is.string(this.o.style)?b.css2json(this.o.style):{},this.value=e?f?c.value:c:null,b.arr.each(this.cells,function(a){b.is.defined(d.value[a.column.name])&&a.val(d.value[a.column.name],!1)}),this.created&&(this._setClasses(this.$el),this._setStyle(this.$el),this.draw())},_setClasses:function(a){var c=!b.is.emptyArray(this.classes),d=null;a.removeAttr("class"),c&&(d=this.classes.join(" "),b.is.emptyString(d)||a.addClass(d))},_setStyle:function(a){var c=!b.is.emptyObject(this.style),d=null;a.removeAttr("style"),c&&(d=this.style,b.is.hash(d)&&a.css(d))},expand:function(){this.created&&(this.__hidden__=b.arr.map(this.cells,function(a){return a.column.hidden&&a.column.visible?a:null}),this.__hidden__.length>0&&(this.$details.insertAfter(this.$el).children("td").first().attr("colspan",this.ft.columns.visibleColspan),b.arr.each(this.__hidden__,function(a){a.collapse()})),this.$el.attr("data-expanded",!0),this.$toggle.removeClass("fooicon-plus").addClass("fooicon-minus"),this.expanded=!0)},collapse:function(a){this.created&&(b.arr.each(this.__hidden__,function(a){a.restore()}),this.$details.detach(),this.$el.removeAttr("data-expanded"),this.$toggle.removeClass("fooicon-minus").addClass("fooicon-plus"),(b.is["boolean"](a)?a:!0)&&(this.expanded=!1))},predraw:function(){this.created&&(this.expanded&&this.collapse(!1),this.$toggle.detach(),this.$el.detach())},draw:function(a){this.created||this.$create(),b.is.jq(a)&&a.append(this.$el);var c=this;b.arr.each(c.cells,function(a){a.$el.css("display",a.column.hidden||!a.column.visible?"none":"table-cell"),c.ft.rows.showToggle&&c.ft.columns.hasHidden&&("first"==c.ft.rows.toggleColumn&&a.column.index==c.ft.columns.firstVisibleIndex||"last"==c.ft.rows.toggleColumn&&a.column.index==c.ft.columns.lastVisibleIndex)&&a.$el.prepend(c.$toggle)}),this.expanded&&this.expand()},toggle:function(){this.created&&this.ft.columns.hasHidden&&(this.expanded?this.collapse():this.expand())},_onToggle:function(b){var c=b.data.self;a(b.target).is("tr,td,.footable-toggle")&&c.toggle()}})}(jQuery,FooTable),function(a,b){b.instances=[],b.Table=b.Class.extend({construct:function(c,d,e){this._resizeTimeout=null,this.id=b.instances.push(this),this.initialized=!1,this.$el=(b.is.jq(c)?c:a(c)).first(),this.o=a.extend(!0,{},b.defaults,d),this.classes=[],this.breakpoints=b.components.internal.make("breakpoints",this),this.columns=b.components.internal.make("columns",this),this.rows=b.components.internal.make("rows",this),this.components={internal:[this.breakpoints,this.columns,this.rows],core:b.components.core.load(this),custom:b.components.load(this)};var f=this;f._preinit().then(function(){return f._init().then(function(){b.is.fn(e)&&e.call(f,f)})},function(a){b.is.error(a)&&console.error("FooTable: unhandled error thrown during initialization.",a)})},_preinit:function(){var c=this;return this.raise("preinit.ft.table").then(function(){var d=c.$el.attr("class").match(/\S+/g),e=c.$el.data()||{};c.o.ajax=b.checkFnValue(c,e.ajax,c.o.ajax),c.o.stopPropagation=b.is["boolean"](e.stopPropagation)?e.stopPropagation:c.o.stopPropagation;for(var f=0,g=d.length;g>f;f++)b.str.startsWith(d[f],"footable")||c.classes.push(d[f]);var h=a("
",{"class":"footable-loader"}).append(a("",{"class":"fooicon fooicon-loader"}));return c.$el.hide().after(h),c.execute(!1,!1,"preinit",e).always(function(){c.$el.show(),h.remove()})})},_init:function(){var c=this;return c.raise("init.ft.table").then(function(){var d=c.$el.children("thead"),e=c.$el.children("tbody"),f=c.$el.children("tfoot");return c.$el.addClass("footable footable-"+c.id),b.is.hash(c.o.on)&&c.$el.on(c.o.on),0==f.length&&c.$el.append(f=a("
")),0==e.length&&c.$el.append(""),0==d.length&&c.$el.prepend(d=a("")),c.execute(!1,!0,"init").then(function(){return c.$el.data("__FooTable__",c),0==f.children("tr").length&&f.remove(),0==d.children("tr").length&&d.remove(),c.draw().then(function(){a(window).off("resize.ft"+c.id,c._onWindowResize).on("resize.ft"+c.id,{self:c},c._onWindowResize),c.initialized=!0})})})},destroy:function(){var a=this;return a.raise("destroy.ft.table").then(function(){return a.execute(!0,!0,"destroy").then(function(){a.$el.removeData("__FooTable__"),b.is.hash(a.o.on)&&a.$el.off(a.o.on),a.initialized=!1})},function(a){b.is.error(a)&&console.error("FooTable: unhandled error thrown while destroying the plugin.",a)})},raise:function(c,d){var e=this,f=b.__debug__&&(b.is.emptyArray(b.__debug_options__.events)||b.arr.any(b.__debug_options__.events,function(a){return b.str.contains(c,a)}));return d=d||[],d.unshift(this),a.Deferred(function(b){var g=a.Event(c);1==e.o.stopPropagation&&e.$el.one(c,function(a){a.stopPropagation()}),f&&console.log("FooTable:"+c+": ",d),e.$el.trigger(g,d),g.isDefaultPrevented()?(f&&console.log('FooTable: default prevented for the "'+c+'" event.'),b.reject(g)):b.resolve(g)})},use:function(a){for(var b=this.components.internal.concat(this.components.core,this.components.custom),c=0,d=b.length;d>c;c++)if(b[c]instanceof a)return b[c];return null},draw:function(){var a=this;return a.execute(!1,!0,"predraw").then(function(){return a.raise("predraw.ft.table").then(function(){return a.execute(!1,!0,"draw").then(function(){return a.raise("draw.ft.table").then(function(){return a.execute(!1,!0,"postdraw").then(function(){a.raise("postdraw.ft.table")})})})})},function(a){b.is.error(a)&&console.error("FooTable: unhandled error thrown during a draw operation.",a)})},execute:function(a,c,d,e,f){var g=this,h=Array.prototype.slice.call(arguments);a=h.shift(),c=h.shift();var i=g.components.internal.slice(0),j=c?b.arr.get(g.components.core,function(a){return a.enabled}):g.components.core.slice(0),k=c?b.arr.get(g.components.custom,function(a){return a.enabled}):g.components.custom.slice(0);return h.unshift(a?k.reverse():i),g._execute.apply(g,h).then(function(){return h.shift(),h.unshift(a?j.reverse():j),g._execute.apply(g,h).then(function(){return h.shift(),h.unshift(a?i.reverse():k),g._execute.apply(g,h)})},function(a){b.is.error(a)&&console.error('FooTable: unhandled error thrown while executing "'+d+'".',a)})},_execute:function(c,d,e,f){if(!c||!c.length)return a.when();var g,h=this,i=Array.prototype.slice.call(arguments);return c=i.shift(),d=i.shift(),g=c.shift(),b.is.fn(g[d])?a.Deferred(function(a){try{var c=g[d].apply(g,i);if(b.is.promise(c))return c.then(a.resolve,a.reject);a.resolve(c)}catch(e){a.reject(e)}}).then(function(){return h._execute.apply(h,[c,d].concat(i))}):h._execute.apply(h,[c,d].concat(i))},_onWindowResize:function(a){var b=a.data.self;null!=b._resizeTimeout&&clearTimeout(b._resizeTimeout),b._resizeTimeout=setTimeout(function(){b._resizeTimeout=null,b.raise("resize.ft.table").then(function(){b.breakpoints.check()})},300)}})}(jQuery,FooTable),function(a,b){b.is.undef(window.moment)||(b.DateColumn=b.Column.extend({construct:function(a,c){this._super(a,c,"date"),this.formatString=b.is.string(c.formatString)?c.formatString:"MM-DD-YYYY"},parser:function(c){if((b.is.element(c)||b.is.jq(c))&&(c=a(c).data("value")||a(c).text(),b.is.string(c)&&(c=isNaN(c)?c:+c)),b.is.date(c))return moment(c);if(b.is.object(c)&&b.is["boolean"](c._isAMomentObject))return c;if(b.is.string(c)){if(isNaN(c))return moment(c,this.formatString);c=+c}return b.is.number(c)?moment(c):null},formatter:function(a){return b.is.object(a)&&b.is["boolean"](a._isAMomentObject)?a.format(this.formatString):""},filterValue:function(c){if((b.is.element(c)||b.is.jq(c))&&(c=a(c).data("filterValue")||a(c).text()),b.is.hash(c)&&b.is.hash(c.options)&&(b.is.string(c.options.filterValue)&&(c=c.options.filterValue),b.is.defined(c.value)&&(c=c.value)),b.is.object(c)&&b.is["boolean"](c._isAMomentObject))return c.format(this.formatString);if(b.is.string(c)){if(isNaN(c))return c;c=+c}return b.is.number(c)||b.is.date(c)?moment(c).format(this.formatString):b.is.defined(c)&&null!=c?c+"":""}}),b.columns.register("date",b.DateColumn))}(jQuery,FooTable),function(a,b){b.HTMLColumn=b.Column.extend({construct:function(a,b){this._super(a,b,"html")},parser:function(c){if(b.is.string(c)&&(c=a(a.trim(c))),b.is.element(c)&&(c=a(c)),b.is.jq(c)){var d=c.prop("tagName").toLowerCase();return"td"==d||"th"==d?c.data("value")||c.contents():c}return null}}),b.columns.register("html",b.HTMLColumn)}(jQuery,FooTable),function(a,b){b.NumberColumn=b.Column.extend({construct:function(a,c){this._super(a,c,"number"),this.decimalSeparator=b.is.string(c.decimalSeparator)?c.decimalSeparator:".",this.thousandSeparator=b.is.string(c.thousandSeparator)?c.thousandSeparator:".",this.decimalSeparatorRegex=new RegExp(b.str.escapeRegExp(this.decimalSeparator),"g"),this.thousandSeparatorRegex=new RegExp(b.str.escapeRegExp(this.thousandSeparator),"g"),this.cleanRegex=new RegExp("[^0-9"+b.str.escapeRegExp(this.decimalSeparator)+"]","g")},parser:function(c){return(b.is.element(c)||b.is.jq(c))&&(c=a(c).data("value")||a(c).text().replace(this.cleanRegex,"")),b.is.string(c)&&(c=c.replace(this.thousandSeparatorRegex,"").replace(this.decimalSeparatorRegex,"."),c=parseFloat(c)),b.is.number(c)?c:null},formatter:function(a){if(null==a)return"";var b=(a+"").split(".");return 2==b.length&&b[0].length>3&&(b[0]=b[0].replace(/\B(?=(?:\d{3})+(?!\d))/g,this.thousandSeparator)),b.join(this.decimalSeparator)}}),b.columns.register("number",b.NumberColumn)}(jQuery,FooTable),function(a,b){b.Component=b.Class.extend({construct:function(a,c){if(!(a instanceof b.Table))throw new TypeError("The instance parameter must be an instance of FooTable.Table.");this.ft=a,this.enabled=b.is["boolean"](c)?c:!1},preinit:null,init:null,destroy:null,predraw:null,draw:null,postdraw:null}),b.components=new b.ClassFactory,b.components.core=new b.ClassFactory,b.components.internal=new b.ClassFactory}(jQuery,FooTable),function(a,b){b.Breakpoint=b.Class.extend({construct:function(a,b){this.name=a,this.width=b}})}(jQuery,FooTable),function(a,b){b.Breakpoints=b.Component.extend({construct:function(a){this._super(a,!0),this.o=a.o,this.current=null,this.array=[],this.cascade=this.o.cascade,this.useParentWidth=this.o.useParentWidth,this.hidden=null,this._classNames="",this.getWidth=b.checkFnValue(this,this.o.getWidth,this.getWidth)},preinit:function(a){var c=this;return this.ft.raise("preinit.ft.breakpoints",[a]).then(function(){c.cascade=b.is["boolean"](a.cascade)?a.cascade:c.cascade,c.o.breakpoints=b.is.hash(a.breakpoints)?a.breakpoints:c.o.breakpoints,c.getWidth=b.checkFnValue(c,a.getWidth,c.getWidth),null==c.o.breakpoints&&(c.o.breakpoints={xs:480,sm:768,md:992,lg:1200});for(var d in c.o.breakpoints)c.o.breakpoints.hasOwnProperty(d)&&(c.array.push(new b.Breakpoint(d,c.o.breakpoints[d])),c._classNames+="breakpoint-"+d+" ");c.array.sort(function(a,b){return b.width-a.width})})},init:function(){var a=this;return this.ft.raise("init.ft.breakpoints").then(function(){a.current=a.get()})},draw:function(){this.ft.$el.removeClass(this._classNames).addClass("breakpoint-"+this.current.name)},calculate:function(){for(var a,c=this,d=null,e=[],f=null,g=c.getWidth(),h=0,i=c.array.length;i>h;h++)a=c.array[h],(!d&&h==i-1||g>=a.width&&(f instanceof b.Breakpoint?g<=f.width:!0))&&(d=a),d||e.push(a.name),f=a;return e.push(d.name),c.hidden=e.join(" "),d},visible:function(a){if(b.is.emptyString(a))return!0;if("all"===a)return!1;for(var c=a.split(" "),d=0,e=c.length;e>d;d++)if(this.cascade?b.str.containsWord(this.hidden,c[d]):c[d]==this.current.name)return!1;return!0},check:function(){var a=this,c=a.get();c instanceof b.Breakpoint&&c!=a.current&&a.ft.raise("before.ft.breakpoints",[a.current,c]).then(function(){var b=a.current;return a.current=c,a.ft.draw().then(function(){a.ft.raise("after.ft.breakpoints",[a.current,b])})})},get:function(a){return b.is.undef(a)?this.calculate():a instanceof b.Breakpoint?a:b.is.string(a)?b.arr.first(this.array,function(b){return b.name==a}):b.is.number(a)&&a>=0&&af&&(f=a.index)}),f++;for(var g,h,i=0;f>i;i++)g={},b.arr.each(c,function(a){return a.index==i?(g=a,!1):void 0}),h={},b.arr.each(d,function(a){return a.index==i?(h=a,!1):void 0}),e.push(a.extend(!0,{},g,h))}return e}var f,g,h=[],i=[],j=d.ft.$el.find("tr.footable-header");if(0==j.length&&(j=d.ft.$el.find("thead > tr:last:has([data-breakpoints])")),0==j.length&&(j=d.ft.$el.find("tbody > tr:first:has([data-breakpoints])")),j.length>0){var k=j.parent().is("tbody")&&j.children().length==j.children("td").length;k||(d.$header=j.addClass("footable-header")),j.children("td,th").each(function(b,c){f=a(c),g=f.data(),g.index=b,g.$el=f,g.virtual=k,i.push(g)}),k&&(d.showHeader=!1)}b.is.array(d.o.columns)?(b.arr.each(d.o.columns,function(a,b){a.index=b,h.push(a)}),d.parseFinalize(c,e(h,i))):b.is.promise(d.o.columns)?d.o.columns.then(function(a){b.arr.each(a,function(a,b){a.index=b,h.push(a)}),d.parseFinalize(c,e(h,i))},function(a){c.reject(Error("Columns ajax request error: "+a.status+" ("+a.statusText+")"))}):d.parseFinalize(c,e(h,i))})},parseFinalize:function(a,c){var d,e=this,f=[];b.arr.each(c,function(a){(d=b.columns.contains(a.type)?b.columns.make(a.type,e.ft,a):new b.Column(e.ft,a))&&f.push(d)}),b.is.emptyArray(f)?a.reject(Error("No columns supplied.")):(f.sort(function(a,b){return a.index-b.index}),a.resolve(f))},preinit:function(a){var c=this;return c.ft.raise("preinit.ft.columns",[a]).then(function(){return c.parse(a).then(function(d){c.array=d,c.showHeader=b.is["boolean"](a.showHeader)?a.showHeader:c.showHeader})})},init:function(){var a=this;return this.ft.raise("init.ft.columns",[a.array]).then(function(){a.$create()})},predraw:function(){var a=this,c=!0;a.visibleColspan=0,a.firstVisibleIndex=0,a.lastVisibleIndex=0,a.hasHidden=!1,b.arr.each(a.array,function(b){b.hidden=!a.ft.breakpoints.visible(b.breakpoints),!b.hidden&&b.visible&&(c&&(a.firstVisibleIndex=b.index,c=!1),a.lastVisibleIndex=b.index, -a.visibleColspan++),b.hidden&&(a.hasHidden=!0)})},draw:function(){b.arr.each(this.array,function(a){a.$el.css("display",a.hidden||!a.visible?"none":"table-cell")}),!this.showHeader&&b.is.jq(this.$header.parent())&&this.$header.detach()},$create:function(){var c=this;c.$header=b.is.jq(c.$header)?c.$header:a("",{"class":"footable-header"}),c.$header.children("th,td").detach(),b.arr.each(c.array,function(a){c.$header.append(a.$el)}),c.showHeader&&!b.is.jq(c.$header.parent())&&c.ft.$el.children("thead").append(c.$header)},get:function(a){return a instanceof b.Column?a:b.is.string(a)?b.arr.first(this.array,function(b){return b.name==a}):b.is.number(a)?b.arr.first(this.array,function(b){return b.index==a}):b.is.fn(a)?b.arr.get(this.array,a):null},ensure:function(a){var c=this,d=[];return b.is.array(a)?(b.arr.each(a,function(a){d.push(c.get(a))}),d):d}}),b.components.internal.register("columns",b.Columns,5)}(jQuery,FooTable),function(a){a.Defaults.prototype.columns=[],a.Defaults.prototype.showHeader=!0}(FooTable),function(a,b){b.Rows=b.Component.extend({construct:function(a){this._super(a,!0),this.o=a.o,this.array=[],this.all=[],this.showToggle=a.o.showToggle,this.toggleColumn=a.o.toggleColumn,this.emptyString=a.o.empty,this.expandFirst=a.o.expandFirst,this.$empty=null},parse:function(){var c=this;return a.Deferred(function(a){var d=c.ft.$el.children("tbody").children("tr");b.is.jq(d)?(c.parseFinalize(a,d),d.detach()):b.is.array(c.o.rows)&&c.o.rows.length>0?c.parseFinalize(a,c.o.rows):b.is.promise(c.o.rows)?c.o.rows.then(function(b){c.parseFinalize(a,b)},function(b){a.reject(Error("Rows ajax request error: "+b.status+" ("+b.statusText+")"))}):c.parseFinalize(a,[])})},parseFinalize:function(c,d){var e=this,f=a.map(d,function(a){return new b.Row(e.ft,e.ft.columns.array,a)});c.resolve(f)},preinit:function(a){var c=this;return c.ft.raise("preinit.ft.rows",[a]).then(function(){return c.parse().then(function(d){c.all=d,c.array=c.all.slice(0),c.showToggle=b.is["boolean"](a.showToggle)?a.showToggle:c.showToggle,c.toggleColumn=b.is.string(a.toggleColumn)?a.toggleColumn:c.toggleColumn,"first"!=c.toggleColumn&&"last"!=c.toggleColumn&&(c.toggleColumn="first"),c.emptyString=b.is.string(a.empty)?a.empty:c.emptyString,c.expandFirst=b.is["boolean"](a.expandFirst)?a.expandFirst:c.expandFirst})})},init:function(){var a=this;return a.ft.raise("init.ft.rows",[a.all]).then(function(){a.$create()})},predraw:function(){b.arr.each(this.array,function(a){a.predraw()}),this.array=this.all.slice(0)},$create:function(){this.$empty=a("",{"class":"footable-empty"}).append(a("").addClass(this.row.classes.join(" ")).data("__FooTableCell__",this).append(a("")).data("__FooTableRow__",this),this._setClasses(this.$el),this._setStyle(this.$el),"last"==this.ft.rows.toggleColumn&&this.$toggle.addClass("last-column"),this.$details=a("",{"class":"footable-detail-row"}).append(a("
").text(this.emptyString))},draw:function(){var a=this,c=a.ft.$el.children("tbody"),d=!0;a.array.length>0?(a.$empty.detach(),b.arr.each(a.array,function(b){a.expandFirst&&d&&(b.expanded=!0,d=!1),b.draw(c)})):(a.$empty.children("td").attr("colspan",a.ft.columns.visibleColspan),c.append(a.$empty))}}),b.components.internal.register("rows",b.Rows,0)}(jQuery,FooTable),function(a){a.Defaults.prototype.rows=[],a.Defaults.prototype.empty="No results",a.Defaults.prototype.showToggle=!0,a.Defaults.prototype.toggleColumn="first",a.Defaults.prototype.expandFirst=!1}(FooTable); \ No newline at end of file +!function(a,b){window.console=window.console||{log:function(){},error:function(){}},a.fn.footable=function(a,c){return a=a||{},this.filter("table").each(function(d,e){b.init(e,a,c)})};var c={events:[]};b.__debug__=JSON.parse(localStorage.getItem("footable_debug"))||!1,b.__debug_options__=JSON.parse(localStorage.getItem("footable_debug_options"))||c,b.debug=function(d,e){return b.is["boolean"](d)?(b.__debug__=d,void(b.__debug__?(localStorage.setItem("footable_debug",JSON.stringify(b.__debug__)),b.__debug_options__=a.extend(!0,{},c,e||{}),b.is.hash(e)&&localStorage.setItem("footable_debug_options",JSON.stringify(b.__debug_options__))):(localStorage.removeItem("footable_debug"),localStorage.removeItem("footable_debug_options")))):b.__debug__},b.get=function(b){return a(b).first().data("__FooTable__")},b.init=function(a,c,d){var e=b.get(a);return e instanceof b.Table&&e.destroy(),new b.Table(a,c,d)},b.getRow=function(b){var c=a(b).closest("tr");return c.hasClass("footable-detail-row")&&(c=c.prev()),c.data("__FooTableRow__")}}(jQuery,FooTable=window.FooTable||{}),function(a){var b=function(){return!0};a.arr={},a.arr.each=function(b,c){if(a.is.array(b)&&a.is.fn(c))for(var d=0,e=b.length;e>d&&c(b[d],d)!==!1;d++);},a.arr.get=function(b,c){var d=[];if(!a.is.array(b))return d;if(!a.is.fn(c))return b;for(var e=0,f=b.length;f>e;e++)c(b[e],e)&&d.push(b[e]);return d},a.arr.any=function(c,d){if(!a.is.array(c))return!1;d=a.is.fn(d)?d:b;for(var e=0,f=c.length;f>e;e++)if(d(c[e],e))return!0;return!1},a.arr.contains=function(b,c){if(!a.is.array(b)||a.is.undef(c))return!1;for(var d=0,e=b.length;e>d;d++)if(b[d]==c)return!0;return!1},a.arr.first=function(c,d){if(!a.is.array(c))return null;d=a.is.fn(d)?d:b;for(var e=0,f=c.length;f>e;e++)if(d(c[e],e))return c[e];return null},a.arr.map=function(b,c){var d=[],e=null;if(!a.is.array(b)||!a.is.fn(c))return d;for(var f=0,g=b.length;g>f;f++)null!=(e=c(b[f],f))&&d.push(e);return d},a.arr.remove=function(b,c){var d=[],e=[];if(!a.is.array(b)||!a.is.fn(c))return e;for(var f=0,g=b.length;g>f;f++)c(b[f],f,e)&&(d.push(f),e.push(b[f]));for(d.sort(function(a,b){return b-a}),f=0,g=d.length;g>f;f++){var h=d[f]-f;b.splice(h,1)}return e},a.arr["delete"]=function(b,c){var d=-1,e=null;if(!a.is.array(b)||a.is.undef(c))return e;for(var f=0,g=b.length;g>f;f++)if(b[f]==c){d=f,e=b[f];break}return-1!=d&&b.splice(d,1),e},a.arr.replace=function(a,b,c){var d=a.indexOf(b);-1!==d&&(a[d]=c)}}(FooTable),function(a){a.is={},a.is.type=function(a,b){return typeof a===b},a.is.defined=function(a){return"undefined"!=typeof a},a.is.undef=function(a){return"undefined"==typeof a},a.is.array=function(a){return"[object Array]"===Object.prototype.toString.call(a)},a.is.date=function(a){return"[object Date]"===Object.prototype.toString.call(a)&&!isNaN(a.getTime())},a.is["boolean"]=function(a){return"[object Boolean]"===Object.prototype.toString.call(a)},a.is.string=function(a){return"[object String]"===Object.prototype.toString.call(a)},a.is.number=function(a){return"[object Number]"===Object.prototype.toString.call(a)&&!isNaN(a)},a.is.fn=function(b){return a.is.defined(window)&&b===window.alert||"[object Function]"===Object.prototype.toString.call(b)},a.is.error=function(a){return"[object Error]"===Object.prototype.toString.call(a)},a.is.object=function(a){return"[object Object]"===Object.prototype.toString.call(a)},a.is.hash=function(b){return a.is.object(b)&&b.constructor===Object&&!b.nodeType&&!b.setInterval},a.is.element=function(a){return"object"==typeof HTMLElement?a instanceof HTMLElement:a&&"object"==typeof a&&null!==a&&1===a.nodeType&&"string"==typeof a.nodeName},a.is.promise=function(b){return a.is.object(b)&&a.is.fn(b.then)&&a.is.fn(b.promise)},a.is.jq=function(b){return a.is.defined(window.jQuery)&&b instanceof jQuery&&b.length>0},a.is.moment=function(b){return a.is.defined(window.moment)&&a.is.object(b)&&a.is["boolean"](b._isAMomentObject)},a.is.emptyObject=function(b){if(!a.is.hash(b))return!1;for(var c in b)if(b.hasOwnProperty(c))return!1;return!0},a.is.emptyArray=function(b){return a.is.array(b)?0===b.length:!0},a.is.emptyString=function(b){return a.is.string(b)?0===b.length:!0}}(FooTable),function(a){a.str={},a.str.contains=function(b,c,d){return a.is.emptyString(b)||a.is.emptyString(c)?!1:c.length<=b.length&&-1!==(d?b.toUpperCase().indexOf(c.toUpperCase()):b.indexOf(c))},a.str.containsExact=function(b,c,d){return a.is.emptyString(b)||a.is.emptyString(c)||c.length>b.length?!1:new RegExp("\\b"+a.str.escapeRegExp(c)+"\\b",d?"i":"").test(b)},a.str.containsWord=function(b,c,d){if(a.is.emptyString(b)||a.is.emptyString(c)||b.lengthf;f++)if(d?e[f].toUpperCase()==c.toUpperCase():e[f]==c)return!0;return!1},a.str.from=function(b,c){return a.is.emptyString(b)?b:a.str.contains(b,c)?b.substring(b.indexOf(c)+1):b},a.str.startsWith=function(b,c){return a.is.emptyString(b)?b==c:b.slice(0,c.length)==c},a.str.toCamelCase=function(b){return a.is.emptyString(b)?b:b.toUpperCase()===b?b.toLowerCase():b.replace(/^([A-Z])|[-\s_](\w)/g,function(b,c,d){return a.is.string(d)?d.toUpperCase():c.toLowerCase()})},a.str.random=function(b){return b=a.is.emptyString(b)?"":b,b+Math.random().toString(36).substr(2,9)},a.str.escapeRegExp=function(b){return a.is.emptyString(b)?b:b.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")}}(FooTable),function(a){"use strict";function b(){}Object.create||(Object.create=function(){var b=function(){};return function(c){if(arguments.length>1)throw Error("Second argument not supported");if(!a.is.object(c))throw TypeError("Argument must be an object");b.prototype=c;var d=new b;return b.prototype=null,d}}());var c=/xyz/.test(function(){xyz})?/\b_super\b/:/.*/;b.__extend__=function(b,d,e,f){b[d]=a.is.fn(f)&&c.test(e)?function(a,b){return function(){var a,c;return a=this._super,this._super=f,c=b.apply(this,arguments),this._super=a,c}}(d,e):e},b.extend=function(d,e){function f(b,d,e,f){b[d]=a.is.fn(f)&&c.test(e)?function(a,b,c){return function(){var a,d;return a=this._super,this._super=c,d=b.apply(this,arguments),this._super=a,d}}(d,e,f):e}var g=Array.prototype.slice.call(arguments);if(d=g.shift(),e=g.shift(),a.is.hash(d)){var h=Object.create(this.prototype),i=this.prototype;for(var j in d)"__ctor__"!==j&&f(h,j,d[j],i[j]);var k=a.is.fn(h.__ctor__)?h.__ctor__:function(){if(!a.is.fn(this.construct))throw new SyntaxError('FooTable class objects must be constructed with the "new" keyword.');this.construct.apply(this,arguments)};return h.construct=a.is.fn(h.construct)?h.construct:function(){},k.prototype=h,h.constructor=k,k.extend=b.extend,k}a.is.string(d)&&a.is.fn(e)&&f(this.prototype,d,e,this.prototype[d])},a.Class=b,a.ClassFactory=a.Class.extend({construct:function(){this.registered={}},contains:function(b){return a.is.defined(this.registered[b])},names:function(){var a,b=[];for(a in this.registered)this.registered.hasOwnProperty(a)&&b.push(a);return b},register:function(b,c,d){if(a.is.string(b)&&a.is.fn(c)){var e=this.registered[b];this.registered[b]={name:b,klass:c,priority:a.is.number(d)?d:a.is.defined(e)?e.priority:0}}},load:function(b,c,d){var e,f,g=this,h=Array.prototype.slice.call(arguments),i=[],j=[];b=h.shift()||{};for(e in g.registered)if(g.registered.hasOwnProperty(e)){var k=g.registered[e];b.hasOwnProperty(e)&&(f=b[e],a.is.string(f)&&(f=a.getFnPointer(b[e])),a.is.fn(f)&&(k={name:e,klass:f,priority:g.registered[e].priority})),i.push(k)}for(e in b)b.hasOwnProperty(e)&&!g.registered.hasOwnProperty(e)&&(f=b[e],a.is.string(f)&&(f=a.getFnPointer(b[e])),a.is.fn(f)&&i.push({name:e,klass:f,priority:0}));return i.sort(function(a,b){return b.priority-a.priority}),a.arr.each(i,function(b){a.is.fn(b.klass)&&j.push(g._make(b.klass,h))}),j},make:function(b,c,d){var e,f=this,g=Array.prototype.slice.call(arguments);return b=g.shift(),e=f.registered[b],a.is.fn(e.klass)?f._make(e.klass,g):null},_make:function(a,b){function c(){return a.apply(this,b)}return c.prototype=a.prototype,new c}})}(FooTable),function(a,b){b.css2json=function(c){if(b.is.emptyString(c))return{};for(var d,e,f,g={},h=c.split(";"),i=0,j=h.length;j>i;i++)b.is.emptyString(h[i])||(d=h[i].split(":"),b.is.emptyString(d[0])||b.is.emptyString(d[1])||(e=b.str.toCamelCase(a.trim(d[0])),f=a.trim(d[1]),g[e]=f));return g},b.getFnPointer=function(a){if(b.is.emptyString(a))return null;var c=window,d=a.split(".");return b.arr.each(d,function(a){c[a]&&(c=c[a])}),b.is.fn(c)?c:null},b.checkFnValue=function(a,c,d){function e(a,c,d){return b.is.fn(c)?function(){return c.apply(a,arguments)}:d}return d=b.is.fn(d)?d:null,b.is.fn(c)?e(a,c,d):b.is.type(c,"string")?e(a,b.getFnPointer(c),d):d}}(jQuery,FooTable),function(a,b){b.Cell=b.Class.extend({construct:function(a,b,c,d){this.ft=a,this.row=b,this.column=c,this.created=!1,this.define(d)},define:function(c){this.$el=b.is.element(c)||b.is.jq(c)?a(c):null,this.$detail=null;var d=b.is.hash(c)&&b.is.hash(c.options)&&b.is.defined(c.value);this.value=this.column.parser.call(this.column,b.is.jq(this.$el)?this.$el:d?c.value:c,this.ft.o),this.o=a.extend(!0,{classes:null,style:null},d?c.options:{}),this.classes=b.is.jq(this.$el)&&this.$el.attr("class")?this.$el.attr("class").match(/\S+/g):b.is.array(this.o.classes)?this.o.classes:b.is.string(this.o.classes)?this.o.classes.match(/\S+/g):[],this.style=b.is.jq(this.$el)&&this.$el.attr("style")?b.css2json(this.$el.attr("style")):b.is.hash(this.o.style)?this.o.style:b.is.string(this.o.style)?b.css2json(this.o.style):{}},$create:function(){this.created||((this.$el=b.is.jq(this.$el)?this.$el:a("")).data("value",this.value).contents().detach().end().append(this.format(this.value)),this._setClasses(this.$el),this._setStyle(this.$el),this.$detail=a("
")).append(a("")),this.created=!0)},collapse:function(){this.created&&(this.$detail.children("th").html(this.column.title),this.$el.clone().attr("id",this.$el.attr("id")?this.$el.attr("id")+"-detail":void 0).css("display","table-cell").html("").append(this.$el.contents().detach()).replaceAll(this.$detail.children("td").first()),b.is.jq(this.$detail.parent())||this.$detail.appendTo(this.row.$details.find(".footable-details > tbody")))},restore:function(){if(this.created){if(b.is.jq(this.$detail.parent())){var a=this.$detail.children("td").first();this.$el.attr("class",a.attr("class")).attr("style",a.attr("style")).css("display",this.column.hidden||!this.column.visible?"none":"table-cell").append(a.contents().detach())}this.$detail.detach()}},parse:function(){return this.column.parser.call(this.column,this.$el,this.ft.o)},format:function(a){return this.column.formatter.call(this.column,a,this.ft.o)},val:function(c,d){if(b.is.undef(c))return this.value;var e=this,f=b.is.hash(c)&&b.is.hash(c.options)&&b.is.defined(c.value);if(this.o=a.extend(!0,{classes:e.classes,style:e.style},f?c.options:{}),this.value=f?c.value:c,this.classes=b.is.array(this.o.classes)?this.o.classes:b.is.string(this.o.classes)?this.o.classes.match(/\S+/g):[],this.style=b.is.hash(this.o.style)?this.o.style:b.is.string(this.o.style)?b.css2json(this.o.style):{},this.created){this.$el.data("value",this.value).empty();var g=this.$detail.children("td").first().empty(),h=b.is.jq(this.$detail.parent())?g:this.$el;h.append(this.format(this.value)),this._setClasses(h),this._setStyle(h),(b.is["boolean"](d)?d:!0)&&this.row.draw()}},_setClasses:function(a){var c=!b.is.emptyArray(this.column.classes),d=!b.is.emptyArray(this.classes),e=null;a.removeAttr("class"),(c||d)&&(c&&d?e=this.classes.concat(this.column.classes).join(" "):c?e=this.column.classes.join(" "):d&&(e=this.classes.join(" ")),b.is.emptyString(e)||a.addClass(e))},_setStyle:function(c){var d=!b.is.emptyObject(this.column.style),e=!b.is.emptyObject(this.style),f=null;c.removeAttr("style"),(d||e)&&(d&&e?f=a.extend({},this.column.style,this.style):d?f=this.column.style:e&&(f=this.style),b.is.hash(f)&&c.css(f))}})}(jQuery,FooTable),function(a,b){b.Column=b.Class.extend({construct:function(a,c,d){this.ft=a,this.type=b.is.emptyString(d)?"text":d,this.virtual=b.is["boolean"](c.virtual)?c.virtual:!1,this.$el=b.is.jq(c.$el)?c.$el:null,this.index=b.is.number(c.index)?c.index:-1,this.define(c),this.$create()},define:function(a){this.hidden=b.is["boolean"](a.hidden)?a.hidden:!1,this.visible=b.is["boolean"](a.visible)?a.visible:!0,this.name=b.is.string(a.name)?a.name:null,null==this.name&&(this.name="col"+(a.index+1)),this.title=b.is.string(a.title)?a.title:null,!this.virtual&&null==this.title&&b.is.jq(this.$el)&&(this.title=this.$el.html()),null==this.title&&(this.title="Column "+(a.index+1)),this.style=b.is.hash(a.style)?a.style:b.is.string(a.style)?b.css2json(a.style):{},this.classes=b.is.array(a.classes)?a.classes:b.is.string(a.classes)?a.classes.match(/\S+/g):[],this.parser=b.checkFnValue(this,a.parser,this.parser),this.formatter=b.checkFnValue(this,a.formatter,this.formatter)},$create:function(){(this.$el=!this.virtual&&b.is.jq(this.$el)?this.$el:a("")).html(this.title).addClass(this.classes.join(" ")).css(this.style)},parser:function(c){if(b.is.element(c)||b.is.jq(c)){var d=a(c).data("value");return b.is.defined(d)?d:a(c).html()}return b.is.defined(c)&&null!=c?c+"":null},formatter:function(a){return null==a?"":a},createCell:function(a){var c=b.is.jq(a.$el)?a.$el.children("td,th").get(this.index):null,d=b.is.hash(a.value)?a.value[this.name]:null;return new b.Cell(this.ft,a,this,c||d)}}),b.columns=new b.ClassFactory,b.columns.register("text",b.Column)}(jQuery,FooTable),function(a,b){b.Component=b.Class.extend({construct:function(a,c){if(!(a instanceof b.Table))throw new TypeError("The instance parameter must be an instance of FooTable.Table.");this.ft=a,this.enabled=b.is["boolean"](c)?c:!1},preinit:function(a){},init:function(){},destroy:function(){},predraw:function(){},draw:function(){},postdraw:function(){}}),b.components=new b.ClassFactory}(jQuery,FooTable),function(a,b){b.Defaults=function(){this.stopPropagation=!1,this.on=null},b.defaults=new b.Defaults}(jQuery,FooTable),function(a,b){b.Row=b.Class.extend({construct:function(a,b,c){this.ft=a,this.columns=b,this.created=!1,this.define(c)},define:function(c){this.$el=b.is.element(c)||b.is.jq(c)?a(c):null,this.$toggle=a("",{"class":"footable-toggle fooicon fooicon-plus"});var d=b.is.hash(c),e=d&&b.is.hash(c.options)&&b.is.hash(c.value);this.value=d?e?c.value:c:null,this.o=a.extend(!0,{expanded:!1,classes:null,style:null},e?c.options:{}),this.expanded=b.is.jq(this.$el)?this.$el.data("expanded")||this.o.expanded:this.o.expanded,this.classes=b.is.jq(this.$el)&&this.$el.attr("class")?this.$el.attr("class").match(/\S+/g):b.is.array(this.o.classes)?this.o.classes:b.is.string(this.o.classes)?this.o.classes.match(/\S+/g):[],this.style=b.is.jq(this.$el)&&this.$el.attr("style")?b.css2json(this.$el.attr("style")):b.is.hash(this.o.style)?this.o.style:b.is.string(this.o.style)?b.css2json(this.o.style):{},this.cells=this.createCells();var f=this;f.value={},b.arr.each(f.cells,function(a){f.value[a.column.name]=a.val()})},$create:function(){if(!this.created){(this.$el=b.is.jq(this.$el)?this.$el:a("
",{colspan:this.ft.columns.visibleColspan}).append(a("",{"class":"footable-details "+this.ft.classes.join(" ")}).append("")));var c=this;b.arr.each(c.cells,function(a){a.created||a.$create(),c.$el.append(a.$el)}),c.$el.off("click.ft.row").on("click.ft.row",{self:c},c._onToggle),this.created=!0}},createCells:function(){var a=this;return b.arr.map(a.columns,function(b){return b.createCell(a)})},val:function(c,d){var e=this;if(!b.is.hash(c))return b.is.hash(this.value)&&!b.is.emptyObject(this.value)||(this.value={},b.arr.each(this.cells,function(a){e.value[a.column.name]=a.val()})),this.value;this.collapse(!1);var f=b.is.hash(c),g=f&&b.is.hash(c.options)&&b.is.hash(c.value);if(this.o=a.extend(!0,{expanded:e.expanded,classes:e.classes,style:e.style},g?c.options:{}),this.expanded=this.o.expanded,this.classes=b.is.array(this.o.classes)?this.o.classes:b.is.string(this.o.classes)?this.o.classes.match(/\S+/g):[],this.style=b.is.hash(this.o.style)?this.o.style:b.is.string(this.o.style)?b.css2json(this.o.style):{},f)if(g&&(c=c.value),b.is.hash(this.value))for(var h in c)c.hasOwnProperty(h)&&(this.value[h]=c[h]);else this.value=c;else this.value=null;b.arr.each(this.cells,function(a){b.is.defined(e.value[a.column.name])&&a.val(e.value[a.column.name],!1)}),this.created&&(this._setClasses(this.$el),this._setStyle(this.$el),(b.is["boolean"](d)?d:!0)&&this.draw())},_setClasses:function(a){var c=!b.is.emptyArray(this.classes),d=null;a.removeAttr("class"),c&&(d=this.classes.join(" "),b.is.emptyString(d)||a.addClass(d))},_setStyle:function(a){var c=!b.is.emptyObject(this.style),d=null;a.removeAttr("style"),c&&(d=this.style,b.is.hash(d)&&a.css(d))},expand:function(){if(this.created){var a=this;a.ft.raise("expand.ft.row",[a]).then(function(){a.__hidden__=b.arr.map(a.cells,function(a){return a.column.hidden&&a.column.visible?a:null}),a.__hidden__.length>0&&(a.$details.insertAfter(a.$el).children("td").first().attr("colspan",a.ft.columns.visibleColspan),b.arr.each(a.__hidden__,function(a){a.collapse()})),a.$el.attr("data-expanded",!0),a.$toggle.removeClass("fooicon-plus").addClass("fooicon-minus"),a.expanded=!0})}},collapse:function(a){if(this.created){var c=this;c.ft.raise("collapse.ft.row",[c]).then(function(){b.arr.each(c.__hidden__,function(a){a.restore()}),c.$details.detach(),c.$el.removeAttr("data-expanded"),c.$toggle.removeClass("fooicon-minus").addClass("fooicon-plus"),(b.is["boolean"](a)?a:!0)&&(c.expanded=!1)})}},predraw:function(a){this.created&&(this.expanded&&this.collapse(!1),this.$toggle.detach(),a=b.is["boolean"](a)?a:!0,a&&this.$el.detach())},draw:function(a){this.created||this.$create(),b.is.jq(a)&&a.append(this.$el);var c=this;b.arr.each(c.cells,function(a){a.$el.css("display",a.column.hidden||!a.column.visible?"none":"table-cell"),c.ft.rows.showToggle&&c.ft.columns.hasHidden&&("first"==c.ft.rows.toggleColumn&&a.column.index==c.ft.columns.firstVisibleIndex||"last"==c.ft.rows.toggleColumn&&a.column.index==c.ft.columns.lastVisibleIndex)&&a.$el.prepend(c.$toggle),a.$el.add(a.column.$el).removeClass("footable-first-visible footable-last-visible"),a.column.index==c.ft.columns.firstVisibleIndex&&a.$el.add(a.column.$el).addClass("footable-first-visible"),a.column.index==c.ft.columns.lastVisibleIndex&&a.$el.add(a.column.$el).addClass("footable-last-visible")}),this.expanded&&this.expand()},toggle:function(){this.created&&this.ft.columns.hasHidden&&(this.expanded?this.collapse():this.expand())},_onToggle:function(b){var c=b.data.self;a(b.target).is(c.ft.rows.toggleSelector)&&c.toggle()}})}(jQuery,FooTable),function(a,b){b.instances=[],b.Table=b.Class.extend({construct:function(c,d,e){this._resizeTimeout=null,this.id=b.instances.push(this),this.initialized=!1,this.$el=(b.is.jq(c)?c:a(c)).first(),this.$loader=a("
",{"class":"footable-loader"}).append(a("",{"class":"fooicon fooicon-loader"})),this.o=a.extend(!0,{},b.defaults,d),this.data=this.$el.data()||{},this.classes=[],this.components=b.components.load(b.is.hash(this.data.components)?this.data.components:this.o.components,this),this.breakpoints=this.use(FooTable.Breakpoints),this.columns=this.use(FooTable.Columns),this.rows=this.use(FooTable.Rows),this._construct(e)},_construct:function(a){var c=this;this._preinit().then(function(){return c._init()}).always(function(d){return c.$el.show(),b.is.error(d)?void console.error("FooTable: unhandled error thrown during initialization.",d):c.raise("ready.ft.table").then(function(){b.is.fn(a)&&a.call(c,c)})})},_preinit:function(){var a=this;return this.raise("preinit.ft.table",[a.data]).then(function(){var c=(a.$el.attr("class")||"").match(/\S+/g)||[];a.o.ajax=b.checkFnValue(a,a.data.ajax,a.o.ajax),a.o.stopPropagation=b.is["boolean"](a.data.stopPropagation)?a.data.stopPropagation:a.o.stopPropagation;for(var d=0,e=c.length;e>d;d++)b.str.startsWith(c[d],"footable")||a.classes.push(c[d]);return a.$el.hide().after(a.$loader),a.execute(!1,!1,"preinit",a.data)})},_init:function(){var c=this;return c.raise("init.ft.table").then(function(){var d=c.$el.children("thead"),e=c.$el.children("tbody"),f=c.$el.children("tfoot");return c.$el.addClass("footable footable-"+c.id),b.is.hash(c.o.on)&&c.$el.on(c.o.on),0==f.length&&c.$el.append(f=a("
")),0==e.length&&c.$el.append(""),0==d.length&&c.$el.prepend(d=a("")),c.execute(!1,!0,"init").then(function(){return c.$el.data("__FooTable__",c),0==f.children("tr").length&&f.remove(),0==d.children("tr").length&&d.remove(),c.raise("postinit.ft.table").then(function(){return c.draw()}).always(function(){a(window).off("resize.ft"+c.id,c._onWindowResize).on("resize.ft"+c.id,{self:c},c._onWindowResize),c.initialized=!0})})})},destroy:function(){var c=this;return c.raise("destroy.ft.table").then(function(){return c.execute(!0,!0,"destroy").then(function(){c.$el.removeData("__FooTable__").removeClass("footable-"+c.id),b.is.hash(c.o.on)&&c.$el.off(c.o.on),a(window).off("resize.ft"+c.id,c._onWindowResize),c.initialized=!1})}).fail(function(a){b.is.error(a)&&console.error("FooTable: unhandled error thrown while destroying the plugin.",a)})},raise:function(c,d){var e=this,f=b.__debug__&&(b.is.emptyArray(b.__debug_options__.events)||b.arr.any(b.__debug_options__.events,function(a){return b.str.contains(c,a)}));return d=d||[],d.unshift(this),a.Deferred(function(b){var g=a.Event(c);1==e.o.stopPropagation&&e.$el.one(c,function(a){a.stopPropagation()}),f&&console.log("FooTable:"+c+": ",d),e.$el.trigger(g,d),g.isDefaultPrevented()?(f&&console.log('FooTable: default prevented for the "'+c+'" event.'),b.reject(g)):b.resolve(g)})},use:function(a){for(var b=0,c=this.components.length;c>b;b++)if(this.components[b]instanceof a)return this.components[b];return null},draw:function(){var a=this,c=a.$el.clone().insertBefore(a.$el);return a.$el.detach(),a.execute(!1,!0,"predraw").then(function(){return a.raise("predraw.ft.table").then(function(){return a.execute(!1,!0,"draw").then(function(){return a.raise("draw.ft.table").then(function(){return a.execute(!1,!0,"postdraw").then(function(){return a.raise("postdraw.ft.table")})})})})}).fail(function(a){b.is.error(a)&&console.error("FooTable: unhandled error thrown during a draw operation.",a)}).always(function(){c.replaceWith(a.$el),a.$loader.remove()})},execute:function(a,c,d,e,f){var g=this,h=Array.prototype.slice.call(arguments);a=h.shift(),c=h.shift();var i=c?b.arr.get(g.components,function(a){return a.enabled}):g.components.slice(0);return h.unshift(a?i.reverse():i),g._execute.apply(g,h)},_execute:function(c,d,e,f){if(!c||!c.length)return a.when();var g,h=this,i=Array.prototype.slice.call(arguments);return c=i.shift(),d=i.shift(),g=c.shift(),b.is.fn(g[d])?a.Deferred(function(a){try{var c=g[d].apply(g,i);if(b.is.promise(c))return c.then(a.resolve,a.reject);a.resolve(c)}catch(e){a.reject(e)}}).then(function(){return h._execute.apply(h,[c,d].concat(i))}):h._execute.apply(h,[c,d].concat(i))},_onWindowResize:function(a){var b=a.data.self;null!=b._resizeTimeout&&clearTimeout(b._resizeTimeout),b._resizeTimeout=setTimeout(function(){b._resizeTimeout=null,b.raise("resize.ft.table").then(function(){b.breakpoints.check()})},300)}})}(jQuery,FooTable),function(a,b){b.is.undef(window.moment)||(b.DateColumn=b.Column.extend({construct:function(a,c){this._super(a,c,"date"),this.formatString=b.is.string(c.formatString)?c.formatString:"MM-DD-YYYY"},parser:function(c){if(b.is.element(c)||b.is.jq(c)){var d=a(c).data("value");c=b.is.defined(d)?d:a(c).text(),b.is.string(c)&&(c=isNaN(c)?c:+c)}if(b.is.date(c))return moment(c);if(b.is.object(c)&&b.is["boolean"](c._isAMomentObject))return c;if(b.is.string(c)){if(isNaN(c))return moment(c,this.formatString);c=+c}return b.is.number(c)?moment(c):null},formatter:function(a){return b.is.object(a)&&b.is["boolean"](a._isAMomentObject)&&a.isValid()?a.format(this.formatString):""},filterValue:function(c){if((b.is.element(c)||b.is.jq(c))&&(c=a(c).data("filterValue")||a(c).text()),b.is.hash(c)&&b.is.hash(c.options)&&(b.is.string(c.options.filterValue)&&(c=c.options.filterValue),b.is.defined(c.value)&&(c=c.value)),b.is.object(c)&&b.is["boolean"](c._isAMomentObject))return c.format(this.formatString);if(b.is.string(c)){if(isNaN(c))return c;c=+c}return b.is.number(c)||b.is.date(c)?moment(c).format(this.formatString):b.is.defined(c)&&null!=c?c+"":""}}),b.columns.register("date",b.DateColumn))}(jQuery,FooTable),function(a,b){b.HTMLColumn=b.Column.extend({construct:function(a,b){this._super(a,b,"html")},parser:function(c){if(b.is.string(c)&&(c=a(a.trim(c))),b.is.element(c)&&(c=a(c)),b.is.jq(c)){var d=c.prop("tagName").toLowerCase();if("td"==d||"th"==d){var e=c.data("value");return b.is.defined(e)?e:c.contents()}return c}return null}}),b.columns.register("html",b.HTMLColumn)}(jQuery,FooTable),function(a,b){b.NumberColumn=b.Column.extend({construct:function(a,c){this._super(a,c,"number"),this.decimalSeparator=b.is.string(c.decimalSeparator)?c.decimalSeparator:".",this.thousandSeparator=b.is.string(c.thousandSeparator)?c.thousandSeparator:",",this.decimalSeparatorRegex=new RegExp(b.str.escapeRegExp(this.decimalSeparator),"g"),this.thousandSeparatorRegex=new RegExp(b.str.escapeRegExp(this.thousandSeparator),"g"),this.cleanRegex=new RegExp("[^0-9"+b.str.escapeRegExp(this.decimalSeparator)+"]","g")},parser:function(c){if(b.is.element(c)||b.is.jq(c)){var d=a(c).data("value");c=b.is.defined(d)?d:a(c).text().replace(this.cleanRegex,"")}return b.is.string(c)&&(c=c.replace(this.thousandSeparatorRegex,"").replace(this.decimalSeparatorRegex,"."),c=parseFloat(c)),b.is.number(c)?c:null},formatter:function(a){if(null==a)return"";var b=(a+"").split(".");return 2==b.length&&b[0].length>3&&(b[0]=b[0].replace(/\B(?=(?:\d{3})+(?!\d))/g,this.thousandSeparator)),b.join(this.decimalSeparator)}}),b.columns.register("number",b.NumberColumn)}(jQuery,FooTable),function(a,b){b.Breakpoint=b.Class.extend({construct:function(a,b){this.name=a,this.width=b}})}(jQuery,FooTable),function(a,b){b.Breakpoints=b.Component.extend({construct:function(a){this._super(a,!0),this.o=a.o,this.current=null,this.array=[],this.cascade=this.o.cascade,this.useParentWidth=this.o.useParentWidth,this.hidden=null,this._classNames="",this.getWidth=b.checkFnValue(this,this.o.getWidth,this.getWidth)},preinit:function(a){var c=this;return this.ft.raise("preinit.ft.breakpoints",[a]).then(function(){c.cascade=b.is["boolean"](a.cascade)?a.cascade:c.cascade,c.o.breakpoints=b.is.hash(a.breakpoints)?a.breakpoints:c.o.breakpoints,c.getWidth=b.checkFnValue(c,a.getWidth,c.getWidth),null==c.o.breakpoints&&(c.o.breakpoints={xs:480,sm:768,md:992,lg:1200});for(var d in c.o.breakpoints)c.o.breakpoints.hasOwnProperty(d)&&(c.array.push(new b.Breakpoint(d,c.o.breakpoints[d])),c._classNames+="breakpoint-"+d+" ");c.array.sort(function(a,b){return b.width-a.width})})},init:function(){var a=this;return this.ft.raise("init.ft.breakpoints").then(function(){a.current=a.get()})},draw:function(){this.ft.$el.removeClass(this._classNames).addClass("breakpoint-"+this.current.name)},calculate:function(){for(var a,c=this,d=null,e=[],f=null,g=c.getWidth(),h=0,i=c.array.length;i>h;h++)a=c.array[h],(!d&&h==i-1||g>=a.width&&(f instanceof b.Breakpoint?gd;d++)if(this.cascade?b.str.containsWord(this.hidden,c[d]):c[d]==this.current.name)return!1;return!0},check:function(){var a=this,c=a.get();c instanceof b.Breakpoint&&c!=a.current&&a.ft.raise("before.ft.breakpoints",[a.current,c]).then(function(){var b=a.current;return a.current=c,a.ft.draw().then(function(){a.ft.raise("after.ft.breakpoints",[a.current,b])})})},get:function(a){return b.is.undef(a)?this.calculate():a instanceof b.Breakpoint?a:b.is.string(a)?b.arr.first(this.array,function(b){return b.name==a}):b.is.number(a)&&a>=0&&af&&(f=a.index)}),f++;for(var g,h,i=0;f>i;i++)g={},b.arr.each(c,function(a){return a.index==i?(g=a,!1):void 0}),h={},b.arr.each(d,function(a){return a.index==i?(h=a,!1):void 0}),e.push(a.extend(!0,{},g,h))}return e}var f,g,h=[],i=[],j=d.ft.$el.find("tr.footable-header, thead > tr:last:has([data-breakpoints]), tbody > tr:first:has([data-breakpoints]), thead > tr:last, tbody > tr:first").first();if(j.length>0){var k=j.parent().is("tbody")&&j.children().length==j.children("td").length;k||(d.$header=j.addClass("footable-header")),j.children("td,th").each(function(b,c){f=a(c),g=f.data(),g.index=b,g.$el=f,g.virtual=k,i.push(g)}),k&&(d.showHeader=!1)}b.is.array(d.o.columns)&&!b.is.emptyArray(d.o.columns)?(b.arr.each(d.o.columns,function(a,b){a.index=b,h.push(a)}),d.parseFinalize(c,e(h,i))):b.is.promise(d.o.columns)?d.o.columns.then(function(a){b.arr.each(a,function(a,b){a.index=b,h.push(a)}),d.parseFinalize(c,e(h,i))},function(a){c.reject(Error("Columns ajax request error: "+a.status+" ("+a.statusText+")"))}):d.parseFinalize(c,e(h,i))})},parseFinalize:function(a,c){var d,e=this,f=[];b.arr.each(c,function(a){(d=b.columns.contains(a.type)?b.columns.make(a.type,e.ft,a):new b.Column(e.ft,a))&&f.push(d)}),b.is.emptyArray(f)?a.reject(Error("No columns supplied.")):(f.sort(function(a,b){return a.index-b.index}),a.resolve(f))},preinit:function(a){var c=this;return c.ft.raise("preinit.ft.columns",[a]).then(function(){return c.parse(a).then(function(d){c.array=d,c.showHeader=b.is["boolean"](a.showHeader)?a.showHeader:c.showHeader})})},init:function(){var a=this;return this.ft.raise("init.ft.columns",[a.array]).then(function(){a.$create()})},destroy:function(){var a=this;this.ft.raise("destroy.ft.columns").then(function(){a._fromHTML||a.$header.remove()})},predraw:function(){var a=this,c=!0;a.visibleColspan=0,a.firstVisibleIndex=0,a.lastVisibleIndex=0,a.hasHidden=!1,b.arr.each(a.array,function(b){b.hidden=!a.ft.breakpoints.visible(b.breakpoints),!b.hidden&&b.visible&&(c&&(a.firstVisibleIndex=b.index,c=!1),a.lastVisibleIndex=b.index,a.visibleColspan++),b.hidden&&(a.hasHidden=!0)}),a.ft.$el.toggleClass("breakpoint",a.hasHidden)},draw:function(){b.arr.each(this.array,function(a){a.$el.css("display",a.hidden||!a.visible?"none":"table-cell")}),!this.showHeader&&b.is.jq(this.$header.parent())&&this.$header.detach()},$create:function(){var c=this;c.$header=b.is.jq(c.$header)?c.$header:a("",{"class":"footable-header" +}),c.$header.children("th,td").detach(),b.arr.each(c.array,function(a){c.$header.append(a.$el)}),c.showHeader&&!b.is.jq(c.$header.parent())&&c.ft.$el.children("thead").append(c.$header)},get:function(a){return a instanceof b.Column?a:b.is.string(a)?b.arr.first(this.array,function(b){return b.name==a}):b.is.number(a)?b.arr.first(this.array,function(b){return b.index==a}):b.is.fn(a)?b.arr.get(this.array,a):null},ensure:function(a){var c=this,d=[];return b.is.array(a)?(b.arr.each(a,function(a){d.push(c.get(a))}),d):d}}),b.components.register("columns",b.Columns,900)}(jQuery,FooTable),function(a){a.Defaults.prototype.columns=[],a.Defaults.prototype.showHeader=!0}(FooTable),function(a,b){b.Rows=b.Component.extend({construct:function(a){this._super(a,!0),this.o=a.o,this.array=[],this.all=[],this.showToggle=a.o.showToggle,this.toggleSelector=a.o.toggleSelector,this.toggleColumn=a.o.toggleColumn,this.emptyString=a.o.empty,this.expandFirst=a.o.expandFirst,this.expandAll=a.o.expandAll,this.$empty=null,this._fromHTML=b.is.emptyArray(a.o.rows)&&!b.is.promise(a.o.rows)},parse:function(){var c=this;return a.Deferred(function(a){var d=c.ft.$el.children("tbody").children("tr");b.is.array(c.o.rows)&&c.o.rows.length>0?c.parseFinalize(a,c.o.rows):b.is.promise(c.o.rows)?c.o.rows.then(function(b){c.parseFinalize(a,b)},function(b){a.reject(Error("Rows ajax request error: "+b.status+" ("+b.statusText+")"))}):b.is.jq(d)?(c.parseFinalize(a,d),d.detach()):c.parseFinalize(a,[])})},parseFinalize:function(c,d){var e=this,f=a.map(d,function(a){return new b.Row(e.ft,e.ft.columns.array,a)});c.resolve(f)},preinit:function(a){var c=this;return c.ft.raise("preinit.ft.rows",[a]).then(function(){return c.parse().then(function(d){c.all=d,c.array=c.all.slice(0),c.showToggle=b.is["boolean"](a.showToggle)?a.showToggle:c.showToggle,c.toggleSelector=b.is.string(a.toggleSelector)?a.toggleSelector:c.toggleSelector,c.toggleColumn=b.is.string(a.toggleColumn)?a.toggleColumn:c.toggleColumn,"first"!=c.toggleColumn&&"last"!=c.toggleColumn&&(c.toggleColumn="first"),c.emptyString=b.is.string(a.empty)?a.empty:c.emptyString,c.expandFirst=b.is["boolean"](a.expandFirst)?a.expandFirst:c.expandFirst,c.expandAll=b.is["boolean"](a.expandAll)?a.expandAll:c.expandAll})})},init:function(){var a=this;return a.ft.raise("init.ft.rows",[a.all]).then(function(){a.$create()})},destroy:function(){var a=this;this.ft.raise("destroy.ft.rows").then(function(){b.arr.each(a.array,function(b){b.predraw(!a._fromHTML)})})},predraw:function(){b.arr.each(this.array,function(a){a.predraw()}),this.array=this.all.slice(0)},$create:function(){this.$empty=a("",{"class":"footable-empty"}).append(a("'); + self.ft.$el.append($tfoot); + } + self.$row = $('', { '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 ''; + }, + /** + * Creates the hide button for the editing component. + * @instance + * @protected + * @returns {(string|HTMLElement|jQuery)} + */ + $buttonHide: function(){ + return ''; + }, + /** + * Creates the add button for the editing component. + * @instance + * @protected + * @returns {(string|HTMLElement|jQuery)} + */ + $buttonAdd: function(){ + return ' '; + }, + /** + * Creates the edit button for the editing component. + * @instance + * @protected + * @returns {(string|HTMLElement|jQuery)} + */ + $buttonEdit: function(){ + return ' '; + }, + /** + * Creates the delete button for the editing component. + * @instance + * @protected + * @returns {(string|HTMLElement|jQuery)} + */ + $buttonDelete: function(){ + return ''; + }, + /** + * Creates the view button for the editing component. + * @instance + * @protected + * @returns {(string|HTMLElement|jQuery)} + */ + $buttonView: function(){ + return ' '; + }, + /** + * 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 = $('
'); + 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 : $('"),b.ft.$el.append(d)),b.$row=a("",{"class":"footable-editing"}).append(b.$cell).appendTo(d)},$buttonShow:function(){return'"},$buttonHide:function(){return'"},$buttonAdd:function(){return' "},$buttonEdit:function(){return' "},$buttonDelete:function(){return'"},$buttonView:function(){return' "},$rowButtons:function(){return b.is.jq(this._$buttons)?this._$buttons.clone():(this._$buttons=a('
'),this.allowView&&this._$buttons.append(this.$buttonView()),this.allowEdit&&this._$buttons.append(this.$buttonEdit()),this.allowDelete&&this._$buttons.append(this.$buttonDelete()),this._$buttons)},draw:function(){this.$cell.attr("colspan",this.ft.columns.visibleColspan)},_onEditClick:function(c){c.preventDefault();var d=c.data.self,e=a(this).closest("tr").data("__FooTableRow__");e instanceof b.Row&&d.ft.raise("edit.ft.editing",[e]).then(function(){d.callbacks.editRow.call(d.ft,e)})},_onDeleteClick:function(c){c.preventDefault();var d=c.data.self,e=a(this).closest("tr").data("__FooTableRow__");e instanceof b.Row&&d.ft.raise("delete.ft.editing",[e]).then(function(){d.callbacks.deleteRow.call(d.ft,e)})},_onViewClick:function(c){c.preventDefault();var d=c.data.self,e=a(this).closest("tr").data("__FooTableRow__");e instanceof b.Row&&d.ft.raise("view.ft.editing",[e]).then(function(){d.callbacks.viewRow.call(d.ft,e)})},_onAddClick:function(a){a.preventDefault();var b=a.data.self;b.ft.raise("add.ft.editing").then(function(){b.callbacks.addRow.call(b.ft)})},_onShowClick:function(a){a.preventDefault();var b=a.data.self;b.ft.raise("show.ft.editing").then(function(){b.ft.$el.addClass("footable-editing-show"),b.column.visible=!0,b.ft.draw()})},_onHideClick:function(a){a.preventDefault();var b=a.data.self;b.ft.raise("hide.ft.editing").then(function(){b.ft.$el.removeClass("footable-editing-show"),b.column.visible=!1,b.ft.draw()})}}),b.components.register("editing",b.Editing,850)}(jQuery,FooTable),function(a,b){b.EditingColumn=b.Column.extend({construct:function(a,b,c){this._super(a,c,"editing"),this.editing=b},$create:function(){(this.$el=!this.virtual&&b.is.jq(this.$el)?this.$el:a("', {'class': 'footable-filtering'}).prependTo(self.ft.$el.children('thead')); - self.$cell = $(' - * query = "Dave AND Mary" - "Dave" is the left side of the query. - * query = "Dave AND Mary OR John" - "Dave and Mary" is the left side of the query. - */ - this.left = null; - /** - * The right side of the query if one exists. OR takes precedence over AND. - * @type {FooTable.Query} - * @example - * query = "Dave AND Mary" - "Mary" is the right side of the query. - * query = "Dave AND Mary OR John" - "John" is the right side of the query. - */ - this.right = null; - /** - * The parsed parts of the query. This contains the information used to actually perform a match against a string. - * @type {Array} - */ - this.parts = []; - /** - * The type of operand to apply to the results of the individual parts of the query. - * @type {string} - */ - this.operator = null; - this.val(query); - }, - /** - * Gets or sets the value for the query. During set the value is parsed setting all properties as required. - * @param {string} [value] - If supplied the value to set for this query. - * @returns {(string|undefined)} - */ - val: function(value){ - // get - if (F.is.emptyString(value)) return this._value; - - // set - if (F.is.emptyString(this._original)) this._original = value; - else if (this._original == value) return; - - this._value = value; - this._parse(); - }, - /** - * Tests the supplied string against the query. - * @param {string} str - The string to test. - * @returns {boolean} - */ - match: function(str){ - if (F.is.emptyString(this.operator) || this.operator === 'OR') - return this._left(str, false) || this._match(str, false) || this._right(str, false); - if (this.operator === 'AND') - return this._left(str, true) && this._match(str, true) && this._right(str, true); - }, - /** - * Matches this queries parts array against the supplied string. - * @param {string} str - The string to test. - * @param {boolean} def - The default value to return based on the operand. - * @returns {boolean} - * @private - */ - _match: function(str, def){ - var self = this, result = false; - 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 (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 ((!match && !p.negate) || (match && p.negate)) result = false; - return result; - }); - } - return result; - }, - /** - * Matches the left side of the query if one exists with the supplied string. - * @param {string} str - The string to test. - * @param {boolean} def - The default value to return based on the operand. - * @returns {boolean} - * @private - */ - _left: function(str, def){ - return (this.left instanceof F.Query) ? this.left.match(str) : def; - }, - /** - * Matches the right side of the query if one exists with the supplied string. - * @param {string} str - The string to test. - * @param {boolean} def - The default value to return based on the operand. - * @returns {boolean} - * @private - */ - _right: function(str, def){ - return (this.right instanceof F.Query) ? this.right.match(str) : def; - }, - /** - * Parses the private {@link FooTable.Query#_value} property and populates the object. - * @private - */ - _parse: function(){ - if (F.is.emptyString(this._value)) return; - // OR takes precedence so test for it first - if (/\sOR\s/.test(this._value)){ - // 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.right = new F.Query(or[1], this.space, this.connectors); - } 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.right = new F.Query(and[1], this.space, this.connectors); - } else { - // we have no more statements to parse so set the parts array by parsing each part of the remaining query - var self = this; - this.parts = F.arr.map(this._value.match(/(?:[^\s"]+|"[^"]*")+/g), function(str){ - return self._part(str); - }); - } - }, - /** - * Parses a single part of a query into an object to use during matching. - * @param {string} str - The string representation of the part. - * @returns {{query: string, negate: boolean, phrase: boolean, exact: boolean}} - * @private - */ - _part: function(str){ - var p = { - query: str, - negate: false, - phrase: false, - exact: false - }; - // support for NEGATE operand - (minus sign). Remove this first so we can get onto phrase checking - if (F.str.startsWith(p.query, '-')){ - p.query = F.str.from(p.query, '-'); - p.negate = true; - } - // support for PHRASES (exact matches) - if (/^"(.*?)"$/.test(p.query)){ // if surrounded in quotes strip them and nothing else - p.query = p.query.replace(/^"(.*?)"$/, '$1'); - p.phrase = true; - p.exact = true; - } else if (this.connectors && /(?:\w)+?([-_\+\.])(?:\w)+?/.test(p.query)) { // otherwise replace supported phrase connectors (-_+.) with spaces - p.query = p.query.replace(/(?:\w)+?([-_\+\.])(?:\w)+?/g, function(match, p1){ - return match.replace(p1, ' '); - }); - p.phrase = true; - } - return p; - } - }); - -})(FooTable); -(function(F){ - - /** - * The value used by the filtering component during filter operations. Must be a string and can be set using the data-filter-value attribute on the cell itself. - * If this is not supplied it is set to the result of the toString method called on the value for the cell. Added by the {@link FooTable.Filtering} component. - * @type {string} - * @default null - */ - F.Cell.prototype.filterValue = null; - - // this is used to define the filtering specific properties on cell creation - F.Cell.prototype.__filtering_define__ = function(valueOrElement){ - this.filterValue = this.column.filterValue.call(this.column, valueOrElement); - }; - - // this is used to update the filterValue property whenever the cell value is changed - F.Cell.prototype.__filtering_val__ = function(value){ - if (F.is.defined(value)){ - // set only - this.filterValue = this.column.filterValue.call(this.column, value); - } - }; - - // overrides the public define method and replaces it with our own - F.Cell.extend('define', function(valueOrElement){ - this._super(valueOrElement); - this.__filtering_define__(valueOrElement); - }); - // overrides the public val method and replaces it with our own - F.Cell.extend('val', function(value){ - var val = this._super(value); - this.__filtering_val__(value); - return val; - }); -})(FooTable); -(function($, F){ - /** - * Whether or not the column can be used during filtering. Added by the {@link FooTable.Filtering} component. - * @type {boolean} - * @default true - */ - F.Column.prototype.filterable = true; - - /** - * This is supplied either the cell value or jQuery object to parse. A string value must be returned from this method and will be used during filtering operations. - * @param {(*|jQuery)} valueOrElement - The value or jQuery cell object. - * @returns {string} - * @this FooTable.Column - */ - 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 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; - if (F.is.defined(valueOrElement.value)) valueOrElement = valueOrElement.value; - } - if (F.is.defined(valueOrElement) && valueOrElement != null) return valueOrElement+''; // use the native toString of the value - return ''; // otherwise we have no value so return an empty string - }; - - // 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; - }; - - // overrides the public define method and replaces it with our own - F.Column.extend('define', function(definition){ - this._super(definition); // call the base so we don't have to redefine any previously set properties - this.__filtering_define__(definition); // then call our own - }); -})(jQuery, FooTable); -(function(F){ - /** - * An object containing the filtering options for the plugin. Added by the {@link FooTable.Filtering} component. - * @type {object} - * @prop {boolean} enabled=false - Whether or not to allow filtering on the table. - * @prop {({name: string, query: (string|FooTable.Query), columns: (Array.|Array.|Array.)}|Array.)} 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 {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} 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. - */ - F.Defaults.prototype.filtering = { - enabled: false, - filters: [], - delay: 1200, - min: 3, - space: 'AND', - placeholder: 'Search', - position: 'right', - connectors: true - }; -})(FooTable); -(function(F){ - /** - * Checks if the row is filtered using the supplied filters. - * @this FooTable.Row - * @param {Array.} filters - The filters to apply. - * @returns {boolean} - */ - F.Row.prototype.filtered = function(filters){ - var result = true, self = this; - F.arr.each(filters, function(f){ - if ((result = f.matchRow(self)) == false) return false; - }); - 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.|Array.|Array.)} [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 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.Filter = F.Class.extend(/** @lends FooTable.Filter */{ + /** + * The filter object contains the query to filter by and the columns to apply it to. + * @constructs + * @extends FooTable.Class + * @param {string} name - The name for the filter. + * @param {(string|FooTable.Query)} query - The query for the filter. + * @param {Array.} 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, ignoreCase, hidden){ + /** + * The name of the filter. + * @instance + * @type {string} + */ + this.name = name; + /** + * A string specifying how the filter treats space characters. Can be either "OR" or "AND". + * @instance + * @type {string} + */ + this.space = F.is.string(space) && (space == 'OR' || space == 'AND') ? space : 'AND'; + /** + * Whether or not to replace phrase connectors (+.-_) with spaces before executing the query. + * @instance + * @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 = query instanceof F.Query ? query : new F.Query(query, this.space, this.connectors, this.ignoreCase); + /** + * The columns to apply the query to. + * @instance + * @type {Array.} + */ + this.columns = columns; + }, + /** + * Checks if the current filter matches the supplied string. + * If the current query property is a string it will be auto converted to a {@link FooTable.Query} object to perform the match. + * @instance + * @param {string} str - The string to check. + * @returns {boolean} + */ + 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.ignoreCase); + } + return this.query instanceof F.Query ? this.query.match(str) : false; + }, + /** + * Checks if the current filter matches the supplied {@link FooTable.Row}. + * @instance + * @param {FooTable.Row} row - The row to check. + * @returns {boolean} + */ + matchRow: function(row){ + var self = this, text = F.arr.map(row.cells, function(cell){ + return F.arr.contains(self.columns, cell.column) ? cell.filterValue : null; + }).join(' '); + return self.match(text); + } + }); + +})(FooTable); +(function ($, F) { + F.Filtering = F.Component.extend(/** @lends FooTable.Filtering */{ + /** + * The filtering component adds a search input and column selector dropdown to the table allowing users to filter the using space delimited queries. + * @constructs + * @extends FooTable.Component + * @param {FooTable.Table} table - The parent {@link FooTable.Table} object for the component. + * @returns {FooTable.Filtering} + */ + construct: function (table) { + // call the constructor of the base class + this._super(table, table.o.filtering.enabled); + + /* PUBLIC */ + /** + * The filters to apply to the current {@link FooTable.Rows#array}. + * @instance + * @type {Array.} + */ + this.filters = table.o.filtering.filters; + /** + * The delay in milliseconds before the query is auto applied after a change. + * @instance + * @type {number} + */ + this.delay = table.o.filtering.delay; + /** + * The minimum number of characters allowed in the search input before it is auto applied. + * @instance + * @type {number} + */ + this.min = table.o.filtering.min; + /** + * Specifies how whitespace in a filter query is handled. + * @instance + * @type {string} + */ + this.space = table.o.filtering.space; + /** + * Whether or not to replace phrase connectors (+.-_) with spaces before executing the query. + * @instance + * @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} + */ + this.position = table.o.filtering.position; + /** + * The jQuery row object that contains all the filtering specific elements. + * @instance + * @type {jQuery} + */ + this.$row = null; + /** + * The jQuery cell object that contains the search input and column selector. + * @instance + * @type {jQuery} + */ + this.$cell = null; + /** + * The jQuery object of the column selector dropdown. + * @instance + * @type {jQuery} + */ + this.$dropdown = null; + /** + * The jQuery object of the search input. + * @instance + * @type {jQuery} + */ + this.$input = null; + /** + * The jQuery object of the search button. + * @instance + * @type {jQuery} + */ + this.$button = null; + + /* PRIVATE */ + /** + * The timeout ID for the filter changed event. + * @instance + * @private + * @type {?number} + */ + this._filterTimeout = null; + /** + * The regular expression used to check for encapsulating quotations. + * @instance + * @private + * @type {RegExp} + */ + this._exactRegExp = /^"(.*?)"$/; + }, + + /* PROTECTED */ + /** + * Checks the supplied data and options for the filtering component. + * @instance + * @protected + * @param {object} data - The jQuery data object from the parent table. + * @fires FooTable.Filtering#"preinit.ft.filtering" + */ + preinit: function(data){ + var self = this; + /** + * The preinit.ft.filtering 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.Filtering#"preinit.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 {object} data - The jQuery data object of the table raising the event. + */ + 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; + // then check if the data-filtering-enabled attribute has been set + self.enabled = F.is.boolean(data.filtering) + ? data.filtering + : self.enabled; + + // if filtering is not enabled exit early as we don't need to do anything else + if (!self.enabled) return; + + self.space = F.is.string(data.filterSpace) + ? data.filterSpace + : self.space; + + self.min = F.is.number(data.filterMin) + ? data.filterMin + : self.min; + + 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.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); + + if (self.ft.$el.hasClass('footable-filtering-left')) + self.position = 'left'; + if (self.ft.$el.hasClass('footable-filtering-center')) + self.position = 'center'; + if (self.ft.$el.hasClass('footable-filtering-right')) + self.position = 'right'; + + self.position = F.is.string(data.filterPosition) + ? data.filterPosition + : self.position; + },function(){ + self.enabled = false; + }); + }, + /** + * Initializes the filtering component for the plugin. + * @instance + * @protected + * @fires FooTable.Filtering#"init.ft.filtering" + */ + init: function () { + var self = this; + /** + * The init.ft.filtering event is raised before its UI is generated. + * Calling preventDefault on this event will disable the component. + * @event FooTable.Filtering#"init.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. + */ + return self.ft.raise('init.ft.filtering').then(function(){ + self.$create(); + }, function(){ + self.enabled = false; + }); + }, + /** + * Destroys the filtering component removing any UI from the table. + * @instance + * @protected + * @fires FooTable.Filtering#"destroy.ft.filtering" + */ + destroy: function () { + /** + * The destroy.ft.filtering event is raised before its UI is removed. + * Calling preventDefault on this event will prevent the component from being destroyed. + * @event FooTable.Filtering#"destroy.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. + */ + var self = this; + return self.ft.raise('destroy.ft.filtering').then(function(){ + self.ft.$el.removeClass('footable-filtering') + .find('thead > tr.footable-filtering').remove(); + }); + }, + /** + * Creates the filtering UI from the current options setting the various jQuery properties of this component. + * @instance + * @protected + * @this FooTable.Filtering + */ + $create: function () { + var self = this; + // generate the cell that actually contains all the UI. + var $form_grp = $('
', {'class': 'form-group footable-filtering-search'}) + .append($('
', {'class': 'footable-filtering'}).prependTo(self.ft.$el.children('thead')); + self.$cell = $(' + * query = "Dave AND Mary" - "Dave" is the left side of the query. + * query = "Dave AND Mary OR John" - "Dave and Mary" is the left side of the query. + */ + this.left = null; + /** + * The right side of the query if one exists. OR takes precedence over AND. + * @type {FooTable.Query} + * @example + * query = "Dave AND Mary" - "Mary" is the right side of the query. + * query = "Dave AND Mary OR John" - "John" is the right side of the query. + */ + this.right = null; + /** + * The parsed parts of the query. This contains the information used to actually perform a match against a string. + * @type {Array} + */ + this.parts = []; + /** + * The type of operand to apply to the results of the individual parts of the query. + * @type {string} + */ + this.operator = null; + this.val(query); + }, + /** + * Gets or sets the value for the query. During set the value is parsed setting all properties as required. + * @param {string} [value] - If supplied the value to set for this query. + * @returns {(string|undefined)} + */ + val: function(value){ + // get + if (F.is.emptyString(value)) return this._value; + + // set + if (F.is.emptyString(this._original)) this._original = value; + else if (this._original == value) return; + + this._value = value; + this._parse(); + }, + /** + * Tests the supplied string against the query. + * @param {string} str - The string to test. + * @returns {boolean} + */ + match: function(str){ + if (F.is.emptyString(this.operator) || this.operator === 'OR') + return this._left(str, false) || this._match(str, false) || this._right(str, false); + if (this.operator === 'AND') + return this._left(str, true) && this._match(str, true) && this._right(str, true); + }, + /** + * Matches this queries parts array against the supplied string. + * @param {string} str - The string to test. + * @param {boolean} def - The default value to return based on the operand. + * @returns {boolean} + * @private + */ + _match: function(str, def){ + 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){ + 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){ + 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; + }, + /** + * Matches the left side of the query if one exists with the supplied string. + * @param {string} str - The string to test. + * @param {boolean} def - The default value to return based on the operand. + * @returns {boolean} + * @private + */ + _left: function(str, def){ + return (this.left instanceof F.Query) ? this.left.match(str) : def; + }, + /** + * Matches the right side of the query if one exists with the supplied string. + * @param {string} str - The string to test. + * @param {boolean} def - The default value to return based on the operand. + * @returns {boolean} + * @private + */ + _right: function(str, def){ + return (this.right instanceof F.Query) ? this.right.match(str) : def; + }, + /** + * Parses the private {@link FooTable.Query#_value} property and populates the object. + * @private + */ + _parse: function(){ + if (F.is.emptyString(this._value)) return; + // OR takes precedence so test for it first + if (/\sOR\s/.test(this._value)){ + // 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.ignoreCase); + 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.ignoreCase); + 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; + this.parts = F.arr.map(this._value.match(/(?:[^\s"]+|"[^"]*")+/g), function(str){ + return self._part(str); + }); + } + }, + /** + * Parses a single part of a query into an object to use during matching. + * @param {string} str - The string representation of the part. + * @returns {{query: string, negate: boolean, phrase: boolean, exact: boolean}} + * @private + */ + _part: function(str){ + var p = { + query: str, + negate: false, + phrase: 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, '-')){ + p.query = F.str.from(p.query, '-'); + p.negate = true; + } + // support for PHRASES (exact matches) + if (/^"(.*?)"$/.test(p.query)){ // if surrounded in quotes strip them and nothing else + p.query = p.query.replace(/^"(.*?)"$/, '$1'); + p.phrase = true; + p.exact = true; + } else if (this.connectors && /(?:\w)+?([-_\+\.])(?:\w)+?/.test(p.query)) { // otherwise replace supported phrase connectors (-_+.) with spaces + p.query = p.query.replace(/(?:\w)+?([-_\+\.])(?:\w)+?/g, function(match, p1){ + return match.replace(p1, ' '); + }); + p.phrase = true; + } + p.empty = p.phrase && F.is.emptyString(p.query); + return p; + } + }); + +})(FooTable); +(function(F){ + + /** + * The value used by the filtering component during filter operations. Must be a string and can be set using the data-filter-value attribute on the cell itself. + * If this is not supplied it is set to the result of the toString method called on the value for the cell. Added by the {@link FooTable.Filtering} component. + * @type {string} + * @default null + */ + F.Cell.prototype.filterValue = null; + + // this is used to define the filtering specific properties on cell creation + F.Cell.prototype.__filtering_define__ = function(valueOrElement){ + this.filterValue = this.column.filterValue.call(this.column, valueOrElement); + }; + + // this is used to update the filterValue property whenever the cell value is changed + F.Cell.prototype.__filtering_val__ = function(value){ + if (F.is.defined(value)){ + // set only + this.filterValue = this.column.filterValue.call(this.column, value); + } + }; + + // overrides the public define method and replaces it with our own + F.Cell.extend('define', function(valueOrElement){ + this._super(valueOrElement); + this.__filtering_define__(valueOrElement); + }); + // overrides the public val method and replaces it with our own + F.Cell.extend('val', function(value){ + var val = this._super(value); + this.__filtering_val__(value); + return val; + }); +})(FooTable); +(function($, F){ + /** + * Whether or not the column can be used during filtering. Added by the {@link FooTable.Filtering} component. + * @type {boolean} + * @default true + */ + F.Column.prototype.filterable = true; + + /** + * This is supplied either the cell value or jQuery object to parse. A string value must be returned from this method and will be used during filtering operations. + * @param {(*|jQuery)} valueOrElement - The value or jQuery cell object. + * @returns {string} + * @this FooTable.Column + */ + 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)){ + 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; + if (F.is.defined(valueOrElement.value)) valueOrElement = valueOrElement.value; + } + if (F.is.defined(valueOrElement) && valueOrElement != null) return valueOrElement+''; // use the native toString of the value + return ''; // otherwise we have no value so return an empty string + }; + + // 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 + F.Column.extend('define', function(definition){ + this._super(definition); // call the base so we don't have to redefine any previously set properties + this.__filtering_define__(definition); // then call our own + }); +})(jQuery, FooTable); +(function(F){ + /** + * An object containing the filtering options for the plugin. Added by the {@link FooTable.Filtering} component. + * @type {object} + * @prop {boolean} enabled=false - Whether or not to allow filtering on the table. + * @prop {({name: string, query: (string|FooTable.Query), columns: (Array.|Array.|Array.)}|Array.)} 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=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: 1, + space: 'AND', + placeholder: 'Search', + dropdownTitle: null, + position: 'right', + connectors: true, + ignoreCase: true, + exactMatch: false + }; +})(FooTable); +(function(F){ + /** + * Checks if the row is filtered using the supplied filters. + * @this FooTable.Row + * @param {Array.} filters - The filters to apply. + * @returns {boolean} + */ + F.Row.prototype.filtered = function(filters){ + var result = true, self = this; + F.arr.each(filters, function(f){ + if ((result = f.matchRow(self)) == false) return false; + }); + return result; + }; })(FooTable); \ No newline at end of file diff --git a/admin/custom/footable3/js/footable.filtering.min.js b/admin/custom/footable3/js/footable.filtering.min.js index e94650f9b..7f4f63b84 100644 --- a/admin/custom/footable3/js/footable.filtering.min.js +++ b/admin/custom/footable3/js/footable.filtering.min.js @@ -1,8 +1,8 @@ /* * 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. */ -!function(a){a.Filter=a.Class.extend({construct:function(b,c,d,e,f){this.name=b,this.space=!a.is.string(e)||"OR"!=e&&"AND"!=e?"AND":e,this.connectors=a.is["boolean"](f)?f:!0,this.query=new a.Query(c,this.space,this.connectors),this.columns=d},match:function(b){return a.is.string(b)?(a.is.string(this.query)&&(this.query=new a.Query(this.query,this.space,this.connectors)),this.query instanceof a.Query?this.query.match(b):!1):!1},matchRow:function(b){var c=this,d=a.arr.map(b.cells,function(b){return a.arr.contains(c.columns,b.column)?b.filterValue:null}).join(" ");return c.match(d)}})}(FooTable),function(a,b){b.Filtering=b.Component.extend({construct:function(a){this._super(a,a.o.filtering.enabled),this.filters=a.o.filtering.filters,this.delay=a.o.filtering.delay,this.min=a.o.filtering.min,this.space=a.o.filtering.space,this.connectors=a.o.filtering.connectors,this.placeholder=a.o.filtering.placeholder,this.position=a.o.filtering.position,this.$row=null,this.$cell=null,this.$dropdown=null,this.$input=null,this.$button=null,this._filterTimeout=null},preinit:function(a){var c=this;this.ft.raise("preinit.ft.filtering").then(function(){c.ft.$el.hasClass("footable-filtering")&&(c.enabled=!0),c.enabled=b.is["boolean"](a.filtering)?a.filtering:c.enabled,c.enabled&&(c.space=b.is.string(a.filterSpace)?a.filterSpace:c.space,c.min=b.is.number(a.filterMin)?a.filterMin:c.min,c.connectors=b.is.number(a.filterConnectors)?a.filterConnectors:c.connectors,c.delay=b.is.number(a.filterDelay)?a.filterDelay:c.delay,c.placeholder=b.is.number(a.filterPlaceholder)?a.filterPlaceholder:c.placeholder,c.filters=b.is.array(a.filterFilters)?c.ensure(a.filterFilters):c.ensure(c.filters),c.ft.$el.hasClass("footable-filtering-left")&&(c.position="left"),c.ft.$el.hasClass("footable-filtering-center")&&(c.position="center"),c.ft.$el.hasClass("footable-filtering-right")&&(c.position="right"),c.position=b.is.string(a.filterPosition)?a.filterPosition:c.position)},function(){c.enabled=!1})},init:function(){var a=this;this.ft.raise("init.ft.filtering").then(function(){a.$create()},function(){a.enabled=!1})},destroy:function(){var a=this;this.ft.raise("destroy.ft.filtering").then(function(){a.ft.$el.removeClass("footable-filtering").find("thead > tr.footable-filtering").remove()})},$create:function(){var c,d=this,e=a("
",{"class":"form-group"}).append(a("
",{"class":"footable-filtering"}).prependTo(d.ft.$el.children("thead")),d.$cell=a("",{"class":"footable-filtering"}).prependTo(d.ft.$el.children("thead")),d.$cell=a("'); - self.ft.$el.append($tfoot); - } - self.$row = $('', { 'class': 'footable-paging' }).append(self.$cell).appendTo($tfoot); - self.$pagination = $('
    ', { 'class': 'pagination' }).on('click.footable', 'a.footable-page-link', { self: self }, self._onPageClicked); - self.$count = $('', { 'class': 'label label-default' }); - - 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.$cell.append(self.$pagination, $('
    ', {'class': 'divider'}), self.$count); - self._total = self.total; - }, - - /* PUBLIC */ - /** - * Pages to the first page. - * @instance - * @returns {jQuery.Promise} - * @fires FooTable.Paging#"before.ft.paging" - * @fires FooTable.Paging#"after.ft.paging" - */ - first: function(){ - return this._set(1); - }, - /** - * Pages to the previous page. - * @instance - * @returns {jQuery.Promise} - * @fires FooTable.Paging#"before.ft.paging" - * @fires FooTable.Paging#"after.ft.paging" - */ - prev: function(){ - return this._set(this.current - 1 > 0 ? this.current - 1 : 1); - }, - /** - * Pages to the next page. - * @instance - * @returns {jQuery.Promise} - * @fires FooTable.Paging#"before.ft.paging" - * @fires FooTable.Paging#"after.ft.paging" - */ - next: function(){ - return this._set(this.current + 1 < this.total ? this.current + 1 : this.total); - }, - /** - * Pages to the last page. - * @instance - * @returns {jQuery.Promise} - * @fires FooTable.Paging#"before.ft.paging" - * @fires FooTable.Paging#"after.ft.paging" - */ - last: function(){ - return this._set(this.total); - }, - /** - * Pages to the specified page. - * @instance - * @param {number} page - The page number to go to. - * @returns {jQuery.Promise} - * @fires FooTable.Paging#"before.ft.paging" - * @fires FooTable.Paging#"after.ft.paging" - */ - goto: function(page){ - return this._set(page > this.total ? this.total : (page < 1 ? 1 : page)); - }, - /** - * Shows the previous X number of pages in the pagination control where X is the value set by the {@link FooTable.Defaults#paging} - limit option value. - * @instance - */ - prevPages: function(){ - var page = this.$pagination.children('li.footable-page.visible:first').data('page') - 1; - this._setVisible(page, true); - this._setNavigation(false); - }, - /** - * Shows the next X number of pages in the pagination control where X is the value set by the {@link FooTable.Defaults#paging} - limit option value. - * @instance - */ - nextPages: function(){ - var page = this.$pagination.children('li.footable-page.visible:last').data('page') + 1; - this._setVisible(page, false); - this._setNavigation(false); - }, - /** - * Gets or sets the current page size - * @instance - * @param {number} [value] - The new page size to use. - * @returns {(number|undefined)} - */ - pageSize: function(value){ - if (!F.is.number(value)){ - return this.size; - } - this.size = value; - this.total = Math.ceil(this.ft.rows.all.length / this.size); - if (F.is.jq(this.$row)) this.$row.remove(); - this.$create(); - this.ft.draw(); - }, - - /* PRIVATE */ - /** - * Performs the required steps to handle paging including the raising of the {@link FooTable.Paging#"before.ft.paging"} and {@link FooTable.Paging#"after.ft.paging"} events. - * @instance - * @private - * @param {number} page - The page to set. - * @returns {jQuery.Promise} - * @fires FooTable.Paging#"before.ft.paging" - * @fires FooTable.Paging#"after.ft.paging" - */ - _set: function(page){ - var self = this, - pager = new F.Pager(self.total, self.current, self.size, page, page > self.current); - /** - * The before.ft.paging event is raised before a sort is applied and allows listeners to modify the pager or cancel it completely by calling preventDefault on the jQuery.Event object. - * @event FooTable.Paging#"before.ft.paging" - * @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.Pager} pager - The pager that is about to be applied. - */ - return self.ft.raise('before.ft.paging', [pager]).then(function(){ - 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.current = pager.page; - return self.ft.draw().then(function(){ - /** - * The after.ft.paging event is raised after a pager has been applied. - * @event FooTable.Paging#"after.ft.paging" - * @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.Pager} pager - The pager that has been applied. - */ - self.ft.raise('after.ft.paging', [pager]); - }); - }); - }, - /** - * Sets the state for the navigation links of the pagination control and optionally sets the active class state on the current page link. - * @instance - * @private - * @param {boolean} active - Whether or not to set the active class state on the individual page links. - */ - _setNavigation: function(active){ - if (this.current == 1) { - this.$pagination.children('li[data-page="first"],li[data-page="prev"]').addClass('disabled'); - } else { - this.$pagination.children('li[data-page="first"],li[data-page="prev"]').removeClass('disabled'); - } - - if (this.current == this.total) { - this.$pagination.children('li[data-page="next"],li[data-page="last"]').addClass('disabled'); - } else { - this.$pagination.children('li[data-page="next"],li[data-page="last"]').removeClass('disabled'); - } - - if ((this.$pagination.children('li.footable-page.visible:first').data('page') || 1) == 1) { - this.$pagination.children('li[data-page="prev-limit"]').addClass('disabled'); - } else { - this.$pagination.children('li[data-page="prev-limit"]').removeClass('disabled'); - } - - if ((this.$pagination.children('li.footable-page.visible:last').data('page') || this.limit) == this.total) { - this.$pagination.children('li[data-page="next-limit"]').addClass('disabled'); - } else { - this.$pagination.children('li[data-page="next-limit"]').removeClass('disabled'); - } - - if (this.limit > 0 && this.total < this.limit){ - this.$pagination.children('li[data-page="prev-limit"],li[data-page="next-limit"]').hide(); - } else { - this.$pagination.children('li[data-page="prev-limit"],li[data-page="next-limit"]').show(); - } - - if (active){ - this.$pagination.children('li.footable-page').removeClass('active').filter('li[data-page="' + this.current + '"]').addClass('active'); - } - }, - /** - * Sets the visible page using the supplied parameters. - * @instance - * @private - * @param {number} page - The page to make visible. - * @param {boolean} right - If set to true the supplied page will be the right most visible pagination link. - */ - _setVisible: function(page, right){ - if (this.limit > 0 && this.total > this.limit){ - if (!this.$pagination.children('li.footable-page[data-page="'+page+'"]').hasClass('visible')){ - var start = 0, end = 0; - if (right == true){ - end = page > this.total ? this.total : page; - start = end - this.limit; - } else { - start = page < 1 ? 0 : page - 1; - end = start + this.limit; - } - if (start < 0){ - start = 0; - end = this.limit > this.total ? this.total : this.limit; - } - if (end > this.total){ - end = this.total; - start = this.total - this.limit < 0 ? 0 : this.total - this.limit; - } - this.$pagination.children('li.footable-page').removeClass('visible').slice(start, end).addClass('visible'); - } - } 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. - * @instance - * @private - * @param {jQuery.Event} e - The event object for the event. - */ - _onPageClicked: function(e){ - e.preventDefault(); - if ($(e.target).closest('li').is('.active,.disabled')) return; - - var self = e.data.self, page = $(this).data('page'); - switch(page){ - case 'first': self.first(); - return; - case 'prev': self.prev(); - return; - case 'next': self.next(); - return; - case 'last': self.last(); - return; - case 'prev-limit': self.prevPages(); - return; - case 'next-limit': self.nextPages(); - return; - default: self._set(page); - return; - } - } - }); - - F.components.core.register('paging', F.Paging, 0); - -})(jQuery, FooTable); -(function(F){ - /** - * An object containing the paging options for the plugin. Added by the {@link FooTable.Paging} component. - * @type {object} - * @prop {boolean} enabled=false - Whether or not to allow paging on the table. - * @prop {string} countFormat="{CP} of {TP}" - A string format used to generate the page count text. - * @prop {number} current=1 - The page number to display. - * @prop {number} limit=5 - The maximum number of page links to display at once. - * @prop {string} position="center" - The string used to specify the alignment of the pagination control. - * @prop {number} size=10 - The number of rows displayed per page. - * @prop {object} strings - An object containing the strings used by the paging buttons. - * @prop {string} strings.first="«" - The string used for the 'first' button. - * @prop {string} strings.prev="‹" - The string used for the 'previous' button. - * @prop {string} strings.next="›" - The string used for the 'next' button. - * @prop {string} strings.last="»" - The string used for the 'last' button. - * @prop {string} strings.prevPages="..." - The string used for the 'previous X pages' button. - * @prop {string} strings.nextPages="..." - The string used for the 'next X pages' button. - */ - F.Defaults.prototype.paging = { - enabled: false, - countFormat: '{CP} of {TP}', - current: 1, - limit: 5, - position: 'center', - size: 10, - strings: { - first: '«', - prev: '‹', - next: '›', - last: '»', - prevPages: '...', - nextPages: '...' - } - }; -})(FooTable); -(function(F){ - /** - * Navigates to the specified page number. Added by the {@link FooTable.Paging} component. - * @instance - * @param {number} num - The page number to go to. - * @returns {jQuery.Promise} - * @fires FooTable.Paging#paging_changing - * @fires FooTable.Paging#paging_changed - * @see FooTable.Paging#goto - */ - F.Table.prototype.gotoPage = function(num){ - return this.use(F.Paging).goto(num); - }; - - /** - * Navigates to the next page. Added by the {@link FooTable.Paging} component. - * @instance - * @returns {jQuery.Promise} - * @fires FooTable.Paging#paging_changing - * @fires FooTable.Paging#paging_changed - * @see FooTable.Paging#next - */ - F.Table.prototype.nextPage = function(){ - return this.use(F.Paging).next(); - }; - - /** - * Navigates to the previous page. Added by the {@link FooTable.Paging} component. - * @instance - * @returns {jQuery.Promise} - * @fires FooTable.Paging#paging_changing - * @fires FooTable.Paging#paging_changed - * @see FooTable.Paging#prev - */ - F.Table.prototype.prevPage = function(){ - return this.use(F.Paging).prev(); - }; - - /** - * Navigates to the first page. Added by the {@link FooTable.Paging} component. - * @instance - * @returns {jQuery.Promise} - * @fires FooTable.Paging#paging_changing - * @fires FooTable.Paging#paging_changed - * @see FooTable.Paging#first - */ - F.Table.prototype.firstPage = function(){ - return this.use(F.Paging).first(); - }; - - /** - * Navigates to the last page. Added by the {@link FooTable.Paging} component. - * @instance - * @returns {jQuery.Promise} - * @fires FooTable.Paging#paging_changing - * @fires FooTable.Paging#paging_changed - * @see FooTable.Paging#last - */ - F.Table.prototype.lastPage = function(){ - return this.use(F.Paging).last(); - }; - - /** - * Shows the next X number of pages in the pagination control where X is the value set by the {@link FooTable.Defaults#paging} - limit.size option value. Added by the {@link FooTable.Paging} component. - * @instance - * @see FooTable.Paging#nextPages - */ - F.Table.prototype.nextPages = function(){ - return this.use(F.Paging).nextPages(); - }; - - /** - * Shows the previous X number of pages in the pagination control where X is the value set by the {@link FooTable.Defaults#paging} - limit.size option value. Added by the {@link FooTable.Paging} component. - * @instance - * @see FooTable.Paging#prevPages - */ - F.Table.prototype.prevPages = function(){ - return this.use(F.Paging).prevPages(); - }; - - /** - * Gets or sets the current page size - * @instance - * @param {number} [value] - The new page size to use. - * @returns {(number|undefined)} - * @see FooTable.Paging#pageSize - */ - F.Table.prototype.pageSize = function(value){ - return this.use(F.Paging).pageSize(value); - }; +/* +* 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.Pager = F.Class.extend(/** @lends FooTable.Pager */{ + /** + * The pager object contains the page number and direction to page to. + * @constructs + * @extends FooTable.Class + * @param {number} total - The total number of pages available. + * @param {number} current - The current page number. + * @param {number} size - The number of rows per page. + * @param {number} page - The page number to goto. + * @param {boolean} forward - A boolean indicating the direction of paging, TRUE = forward, FALSE = back. + * @returns {FooTable.Pager} + */ + construct: function(total, current, size, page, forward){ + /** + * The total number of pages available. + * @type {number} + */ + this.total = total; + /** + * The current page number. + * @type {number} + */ + this.current = current; + /** + * The number of rows per page. + * @type {number} + */ + this.size = size; + /** + * The page number to goto. + * @type {number} + */ + this.page = page; + /** + * A boolean indicating the direction of paging, TRUE = forward, FALSE = back. + * @type {boolean} + */ + this.forward = forward; + } + }); + +})(jQuery, FooTable); +(function($, F){ + F.Paging = F.Component.extend(/** @lends FooTable.Paging */{ + /** + * The paging component adds a pagination control to the table allowing users to navigate table rows via pages. + * @constructs + * @extends FooTable.Component + * @param {FooTable.Table} table - The parent {@link FooTable.Table} object for the component. + * @returns {FooTable.Filtering} + */ + construct: function(table){ + // call the base constructor + this._super(table, table.o.paging.enabled); + + /* PROTECTED */ + /** + * An object containing the strings used by the paging buttons. + * @type {{ first: string, prev: string, next: string, last: string }} + */ + this.strings = table.o.paging.strings; + + /* PUBLIC */ + /** + * The current page number to display. + * @instance + * @type {number} + */ + this.current = table.o.paging.current; + /** + * The number of rows to display per page. + * @instance + * @type {number} + */ + 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; + /** + * The total number of pages. + * @instance + * @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 + * @type {jQuery} + */ + this.$row = null; + /** + * The jQuery cell object that contains the pagination control and total count. + * @instance + * @type {jQuery} + */ + 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 */ + /** + * Used to hold the number of page links created. + * @instance + * @type {number} + * @private + */ + this._createdLinks = 0; + }, + + /* PROTECTED */ + /** + * Checks the supplied data and options for the paging component. + * @instance + * @protected + * @param {object} data - The jQuery data object from the parent table. + * @fires FooTable.Paging#"preinit.ft.paging" + */ + preinit: function(data){ + var self = this; + /** + * The preinit.ft.paging 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.Paging#"preinit.ft.paging" + * @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.paging', [data]).then(function(){ + if (self.ft.$el.hasClass('footable-paging')) + self.enabled = true; + self.enabled = F.is.boolean(data.paging) + ? data.paging + : self.enabled; + + if (!self.enabled) return; + + self.size = F.is.number(data.pagingSize) + ? data.pagingSize + : self.size; + + self.current = F.is.number(data.pagingCurrent) + ? data.pagingCurrent + : self.current; + + self.limit = F.is.number(data.pagingLimit) + ? data.pagingLimit + : self.limit; + + if (self.ft.$el.hasClass('footable-paging-left')) + self.position = 'left'; + if (self.ft.$el.hasClass('footable-paging-center')) + self.position = 'center'; + if (self.ft.$el.hasClass('footable-paging-right')) + self.position = 'right'; + + self.position = F.is.string(data.pagingPosition) + ? data.pagingPosition + : self.position; + + self.countFormat = F.is.string(data.pagingCountFormat) + ? data.pagingCountFormat + : self.countFormat; + + self.total = Math.ceil(self.ft.rows.all.length / self.size); + }, function(){ + self.enabled = false; + }); + }, + /** + * Initializes the paging component for the plugin using the supplied table and options. + * @instance + * @protected + * @fires FooTable.Paging#"init.ft.paging" + */ + init: function(){ + /** + * The init.ft.paging event is raised before its UI is generated. + * Calling preventDefault on this event will disable the component. + * @event FooTable.Paging#"init.ft.paging" + * @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.paging').then(function(){ + self.$create(); + }, function(){ + self.enabled = false; + }); + }, + /** + * Destroys the paging component removing any UI generated from the table. + * @instance + * @protected + * @fires FooTable.Paging#"destroy.ft.paging" + */ + destroy: function () { + /** + * The destroy.ft.paging event is raised before its UI is removed. + * Calling preventDefault on this event will prevent the component from being destroyed. + * @event FooTable.Paging#"destroy.ft.paging" + * @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.paging').then(function(){ + self.ft.$el.removeClass('footable-paging') + .find('tfoot > tr.footable-paging').remove(); + self.detached = true; + self._createdLinks = 0; + }); + }, + /** + * Performs the actual paging against the {@link FooTable.Rows#current} array removing all rows that are not on the current visible page. + * @instance + * @protected + */ + 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.totalRows = this.ft.rows.array.length; + 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. + * @instance + * @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 = $('
'); + this.ft.$el.append($tfoot); + } + this.$row.appendTo($tfoot); + this.detached = false; + } + this.$cell.attr('colspan', this.ft.columns.visibleColspan); + 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. + * @instance + * @protected + */ + $create: function(){ + this._createdLinks = 0; + var position = 'footable-paging-center'; + switch (this.position){ + case 'left': position = 'footable-paging-left'; break; + case 'right': position = 'footable-paging-right'; break; + } + this.ft.$el.addClass('footable-paging').addClass(position); + this.$cell = $(''); + this.ft.$el.append($tfoot); + } + this.$row = $('', { 'class': 'footable-paging' }).append(this.$cell).appendTo($tfoot); + this.$pagination = $('"),c.ft.$el.append(f)),c.$row=a("",{"class":"footable-paging"}).append(c.$cell).appendTo(f),c.$pagination=a("
    ",{"class":"pagination"}).on("click.footable","a.footable-page-link",{self:c},c._onPageClicked),c.$count=a("",{"class":"label label-default"}),c.$pagination.empty(),d&&(c.$pagination.append(e("first",c.strings.first,"footable-page-nav")),c.$pagination.append(e("prev",c.strings.prev,"footable-page-nav")),c.limit>0&&c.limit0&&c.limit",{"class":"divider"}),c.$count),c._total=c.total}},first:function(){return this._set(1)},prev:function(){return this._set(this.current-1>0?this.current-1:1)},next:function(){return this._set(this.current+1this.total?this.total:1>a?1:a)},prevPages:function(){var a=this.$pagination.children("li.footable-page.visible:first").data("page")-1;this._setVisible(a,!0),this._setNavigation(!1)},nextPages:function(){var a=this.$pagination.children("li.footable-page.visible:last").data("page")+1;this._setVisible(a,!1),this._setNavigation(!1)},pageSize:function(a){return b.is.number(a)?(this.size=a,this.total=Math.ceil(this.ft.rows.all.length/this.size),b.is.jq(this.$row)&&this.$row.remove(),this.$create(),void this.ft.draw()):this.size},_set:function(c){var d=this,e=new b.Pager(d.total,d.current,d.size,c,c>d.current);return d.ft.raise("before.ft.paging",[e]).then(function(){return e.page=e.page>e.total?e.total:e.page,e.page=e.page<1?1:e.page,d.current==c?a.when():(d._previous=d.current,d.current=e.page,d.ft.draw().then(function(){d.ft.raise("after.ft.paging",[e])}))})},_setNavigation:function(a){1==this.current?this.$pagination.children('li[data-page="first"],li[data-page="prev"]').addClass("disabled"):this.$pagination.children('li[data-page="first"],li[data-page="prev"]').removeClass("disabled"),this.current==this.total?this.$pagination.children('li[data-page="next"],li[data-page="last"]').addClass("disabled"):this.$pagination.children('li[data-page="next"],li[data-page="last"]').removeClass("disabled"),1==(this.$pagination.children("li.footable-page.visible:first").data("page")||1)?this.$pagination.children('li[data-page="prev-limit"]').addClass("disabled"):this.$pagination.children('li[data-page="prev-limit"]').removeClass("disabled"),(this.$pagination.children("li.footable-page.visible:last").data("page")||this.limit)==this.total?this.$pagination.children('li[data-page="next-limit"]').addClass("disabled"):this.$pagination.children('li[data-page="next-limit"]').removeClass("disabled"),this.limit>0&&this.total0&&this.total>this.limit){if(!this.$pagination.children('li.footable-page[data-page="'+a+'"]').hasClass("visible")){var c=0,d=0;1==b?(d=a>this.total?this.total:a,c=d-this.limit):(c=1>a?0:a-1,d=c+this.limit),0>c&&(c=0,d=this.limit>this.total?this.total:this.limit),d>this.total&&(d=this.total,c=this.total-this.limit<0?0:this.total-this.limit),this.$pagination.children("li.footable-page").removeClass("visible").slice(c,d).addClass("visible")}}else this.$pagination.children("li.footable-page").removeClass("visible").slice(0,this.total).addClass("visible");var e=this.size*(a-1)+1,f=this.size*a;0==this.ft.rows.array.length?(e=0,f=0):f=f>this._total?this._total:f,this._setCount(a,this.total,e,f,this._total)},_setCount:function(a,b,c,d,e){this.$count.text(this.countFormat.replace(/\{CP}/g,a).replace(/\{TP}/g,b).replace(/\{PF}/g,c).replace(/\{PL}/g,d).replace(/\{TR}/g,e))},_onPageClicked:function(b){if(b.preventDefault(),!a(b.target).closest("li").is(".active,.disabled")){var c=b.data.self,d=a(this).data("page");switch(d){case"first":return void c.first();case"prev":return void c.prev();case"next":return void c.next();case"last":return void c.last();case"prev-limit":return void c.prevPages();case"next-limit":return void c.nextPages();default:return void c._set(d)}}}}),b.components.core.register("paging",b.Paging,0)}(jQuery,FooTable),function(a){a.Defaults.prototype.paging={enabled:!1,countFormat:"{CP} of {TP}",current:1,limit:5,position:"center",size:10,strings:{first:"«",prev:"‹",next:"›",last:"»",prevPages:"...",nextPages:"..."}}}(FooTable),function(a){a.Table.prototype.gotoPage=function(b){return this.use(a.Paging)["goto"](b)},a.Table.prototype.nextPage=function(){return this.use(a.Paging).next()},a.Table.prototype.prevPage=function(){return this.use(a.Paging).prev()},a.Table.prototype.firstPage=function(){return this.use(a.Paging).first()},a.Table.prototype.lastPage=function(){return this.use(a.Paging).last()},a.Table.prototype.nextPages=function(){return this.use(a.Paging).nextPages()},a.Table.prototype.prevPages=function(){return this.use(a.Paging).prevPages()},a.Table.prototype.pageSize=function(b){return this.use(a.Paging).pageSize(b)}}(FooTable); \ No newline at end of file +!function(a,b){b.Pager=b.Class.extend({construct:function(a,b,c,d,e){this.total=a,this.current=b,this.size=c,this.page=d,this.forward=e}})}(jQuery,FooTable),function(a,b){b.Paging=b.Component.extend({construct:function(a){this._super(a,a.o.paging.enabled),this.strings=a.o.paging.strings,this.current=a.o.paging.current,this.size=a.o.paging.size,this.limit=a.o.paging.limit,this.position=a.o.paging.position,this.countFormat=a.o.paging.countFormat,this.total=-1,this.totalRows=0,this.previous=-1,this.formattedCount=null,this.$row=null,this.$cell=null,this.$pagination=null,this.$count=null,this.detached=!0,this._createdLinks=0},preinit:function(a){var c=this;this.ft.raise("preinit.ft.paging",[a]).then(function(){c.ft.$el.hasClass("footable-paging")&&(c.enabled=!0),c.enabled=b.is["boolean"](a.paging)?a.paging:c.enabled,c.enabled&&(c.size=b.is.number(a.pagingSize)?a.pagingSize:c.size,c.current=b.is.number(a.pagingCurrent)?a.pagingCurrent:c.current,c.limit=b.is.number(a.pagingLimit)?a.pagingLimit:c.limit,c.ft.$el.hasClass("footable-paging-left")&&(c.position="left"),c.ft.$el.hasClass("footable-paging-center")&&(c.position="center"),c.ft.$el.hasClass("footable-paging-right")&&(c.position="right"),c.position=b.is.string(a.pagingPosition)?a.pagingPosition:c.position,c.countFormat=b.is.string(a.pagingCountFormat)?a.pagingCountFormat:c.countFormat,c.total=Math.ceil(c.ft.rows.all.length/c.size))},function(){c.enabled=!1})},init:function(){var a=this;this.ft.raise("init.ft.paging").then(function(){a.$create()},function(){a.enabled=!1})},destroy:function(){var a=this;this.ft.raise("destroy.ft.paging").then(function(){a.ft.$el.removeClass("footable-paging").find("tfoot > tr.footable-paging").remove(),a.detached=!0,a._createdLinks=0})},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.totalRows=this.ft.rows.array.length,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)},draw:function(){if(this.total<=1)this.detached||(this.$row.detach(),this.detached=!0);else{if(this.detached){var b=this.ft.$el.children("tfoot");0==b.length&&(b=a("
"),this.ft.$el.append(b)),this.$row.appendTo(b),this.detached=!1}this.$cell.attr("colspan",this.ft.columns.visibleColspan),this._createLinks(),this._setVisible(this.current,this.current>this.previous),this._setNavigation(!0),this.$count.text(this.formattedCount)}},$create:function(){this._createdLinks=0;var b="footable-paging-center";switch(this.position){case"left":b="footable-paging-left";break;case"right":b="footable-paging-right"}this.ft.$el.addClass("footable-paging").addClass(b),this.$cell=a(""),this.ft.$el.append(c)),this.$row=a("",{"class":"footable-paging"}).append(this.$cell).appendTo(c),this.$pagination=a(" - * "sorter": function(a, b){ - * if (a is less than b by some ordering criterion) { - * return -1; - * } - * if (a is greater than b by the ordering criterion) { - * return 1; - * } - * // a must be equal to b - * return 0; - * } - */ - F.Column.prototype.sorter = function(a, b){ - if (typeof a === 'string') a = a.toLowerCase(); - if (typeof b === 'string') b = b.toLowerCase(); - if (a === b) return 0; - if (a < b) return -1; - return 1; - }; - - /** - * This is supplied either the cell value or jQuery object to parse. A value must be returned from this method and will be used during sorting operations. - * @param {(*|jQuery)} valueOrElement - The value or jQuery cell object. - * @returns {*} - * @this FooTable.Column - */ - 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 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; - if (F.is.defined(valueOrElement.value)) valueOrElement = valueOrElement.value; - } - if (F.is.defined(valueOrElement) && valueOrElement != null) return valueOrElement; - return null; - }; - - // this is used to define the sorting specific properties on column creation - F.Column.prototype.__sorting_define__ = function(definition){ - this.sorter = F.checkFnValue(this, definition.sorter, this.sorter); - 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; - }; - - // overrides the public define method and replaces it with our own - F.Column.extend('define', function(definition){ - this._super(definition); - this.__sorting_define__(definition); - }); - -})(jQuery, FooTable); -(function(F){ - /** - * An object containing the sorting options for the plugin. Added by the {@link FooTable.Sorting} component. - * @type {object} - * @prop {boolean} enabled=false - Whether or not to allow sorting on the table. - */ - F.Defaults.prototype.sorting = { - enabled: false - }; -})(FooTable); -(function($, F){ - - F.HTMLColumn.extend('__sorting_define__', function(definition){ - this._super(definition); - this.sortUse = F.is.string(definition.sortUse) && $.inArray(definition.sortUse, ['html','text']) !== -1 ? definition.sortUse : 'html'; - }); - - /** - * This is supplied either the cell value or jQuery object to parse. A value must be returned from this method and will be used during sorting operations. - * @param {(*|jQuery)} valueOrElement - The value or jQuery cell object. - * @returns {*} - * @this FooTable.HTMLColumn - */ - 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]()); - } - // 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; - if (F.is.defined(valueOrElement.value)) valueOrElement = valueOrElement.value; - } - if (F.is.defined(valueOrElement) && valueOrElement != null) return valueOrElement; - return null; - }; - -})(jQuery, FooTable); -(function(F){ - /** - * Sort the table using the specified column and direction. Added by the {@link FooTable.Sorting} component. - * @instance - * @param {(string|number|FooTable.Column)} column - The column name, index or the actual {@link FooTable.Column} object to sort by. - * @param {string} [direction="ASC"] - The direction to sort by, either ASC or DESC. - * @returns {jQuery.Promise} - * @fires FooTable.Sorting#"change.ft.sorting" - * @fires FooTable.Sorting#"changed.ft.sorting" - * @see FooTable.Sorting#sort - */ - F.Table.prototype.sort = function(column, direction){ - return this.use(F.Sorting).sort(column, direction); - }; +/* +* 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.Sorter = F.Class.extend(/** @lends FooTable.Sorter */{ + /** + * The sorter object contains the column and direction to sort by. + * @constructs + * @extends FooTable.Class + * @param {FooTable.Column} column - The column to sort. + * @param {string} direction - The direction to sort by. + * @returns {FooTable.Sorter} + */ + construct: function(column, direction){ + /** + * The column to sort. + * @type {FooTable.Column} + */ + this.column = column; + /** + * The direction to sort by. + * @type {string} + */ + this.direction = direction; + } + }); + +})(jQuery, FooTable); +(function ($, F) { + F.Sorting = F.Component.extend(/** @lends FooTable.Sorting */{ + /** + * The sorting component adds a small sort button to specified column headers allowing users to sort those columns in the table. + * @constructs + * @extends FooTable.Component + * @param {FooTable.Table} table - The parent {@link FooTable.Table} object for the component. + * @returns {FooTable.Sorting} + */ + construct: function (table) { + // call the constructor of the base class + this._super(table, table.o.sorting.enabled); + + /* PROTECTED */ + /** + * This provides a shortcut to the {@link FooTable.Table#options}.[sorting]{@link FooTable.Defaults#sorting} object. + * @instance + * @protected + * @type {object} + */ + this.o = table.o.sorting; + /** + * The current sorted column. + * @instance + * @type {FooTable.Column} + */ + this.column = null; + /** + * Whether or not to allow sorting to occur, should be set using the {@link FooTable.Sorting#toggleAllowed} method. + * @instance + * @type {boolean} + */ + 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., column: string, direction: ?string}} + */ + this.initial = null; + }, + + /* PROTECTED */ + /** + * Checks the supplied data and options for the sorting component. + * @instance + * @protected + * @param {object} data - The jQuery data object from the parent table. + * @fires FooTable.Sorting#"preinit.ft.sorting" + * @this FooTable.Sorting + */ + preinit: function(data){ + var self = this; + /** + * The preinit.ft.sorting 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.Sorting#"preinit.ft.sorting" + * @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.sorting', [data]).then(function(){ + if (self.ft.$el.hasClass('footable-sorting')) + self.enabled = true; + self.enabled = F.is.boolean(data.sorting) + ? data.sorting + : self.enabled; + if (!self.enabled) return; + self.column = F.arr.first(self.ft.columns.array, function(col){ return col.sorted; }); + }, function(){ + self.enabled = false; + }); + }, + /** + * Initializes the sorting component for the plugin using the supplied table and options. + * @instance + * @protected + * @fires FooTable.Sorting#"init.ft.sorting" + * @this FooTable.Sorting + */ + init: function () { + /** + * The init.ft.sorting event is raised before its UI is generated. + * Calling preventDefault on this event will disable the component. + * @event FooTable.Sorting#"init.ft.sorting" + * @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.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($('', {'class': 'fooicon fooicon-sort'})); + } + }); + self.ft.$el.on('click.footable', '.footable-sortable', { self: self }, self._onSortClicked); + }, function(){ + self.enabled = false; + }); + }, + /** + * Destroys the sorting component removing any UI generated from the table. + * @instance + * @protected + * @fires FooTable.Sorting#"destroy.ft.sorting" + */ + destroy: function () { + /** + * The destroy.ft.sorting event is raised before its UI is removed. + * Calling preventDefault on this event will prevent the component from being destroyed. + * @event FooTable.Sorting#"destroy.ft.sorting" + * @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.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 footable-asc footable-desc') + .find('span.fooicon').remove(); + }); + }, + /** + * Performs the actual sorting against the {@link FooTable.Rows#current} array. + * @instance + * @protected + */ + predraw: function () { + if (!this.column) return; + var self = this, col = self.column; + self.ft.rows.array.sort(function (a, b) { + return col.direction == 'DESC' + ? col.sorter(b.cells[col.index].sortValue, a.cells[col.index].sortValue) + : col.sorter(a.cells[col.index].sortValue, b.cells[col.index].sortValue); + }); + }, + /** + * Updates the sorting UI setting the state of the sort buttons. + * @instance + * @protected + */ + draw: function () { + if (!this.column) return; + var self = this, + $sortable = self.ft.$el.find('thead > tr > .footable-sortable'), + $active = self.column.$el; + + $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 == 'DESC' ? 'footable-desc' : 'footable-asc') + .children('.fooicon').addClass(self.column.direction == 'DESC' ? 'fooicon-sort-desc' : 'fooicon-sort-asc'); + }, + + /* PUBLIC */ + /** + * Sets the sorting options and calls the {@link FooTable.Table#draw} method to perform the actual sorting. + * @instance + * @param {(string|number|FooTable.Column)} column - The column name, index or the actual {@link FooTable.Column} object to sort by. + * @param {string} [direction="ASC"] - The direction to sort by, either ASC or DESC. + * @returns {jQuery.Promise} + * @fires FooTable.Sorting#"before.ft.sorting" + * @fires FooTable.Sorting#"after.ft.sorting" + */ + 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 */ + /** + * Performs the required steps to handle sorting including the raising of the {@link FooTable.Sorting#"before.ft.sorting"} and {@link FooTable.Sorting#"after.ft.sorting"} events. + * @instance + * @private + * @param {(string|number|FooTable.Column)} column - The column name, index or the actual {@link FooTable.Column} object to sort by. + * @param {string} [direction="ASC"] - The direction to sort by, either ASC or DESC. + * @returns {jQuery.Promise} + * @fires FooTable.Sorting#"before.ft.sorting" + * @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)); + /** + * The before.ft.sorting event is raised before a sort is applied and allows listeners to modify the sorter or cancel it completely by calling preventDefault on the jQuery.Event object. + * @event FooTable.Sorting#"before.ft.sorting" + * @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.Sorter} sorter - The sorter that is about to be applied. + */ + return self.ft.raise('before.ft.sorting', [sorter]).then(function(){ + F.arr.each(self.ft.columns.array, function(col){ + if (col != self.column) col.direction = null; + }); + self.column = self.ft.columns.get(sorter.column); + if (self.column) self.column.direction = F.Sorting.dir(sorter.direction); + return self.ft.draw().then(function(){ + /** + * The after.ft.sorting event is raised after a sorter has been applied. + * @event FooTable.Sorting#"after.ft.sorting" + * @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.Sorter} sorter - The sorter that has been applied. + */ + self.ft.raise('after.ft.sorting', [sorter]); + }); + }); + }, + /** + * Handles the sort button clicked event. + * @instance + * @private + * @param {jQuery.Event} e - The event object for the event. + */ + _onSortClicked: function (e) { + var self = e.data.self, $header = $(this).closest('th,td'), + direction = $header.is('.footable-asc, .footable-desc') + ? ($header.hasClass('footable-desc') ? 'ASC' : 'DESC') + : 'ASC'; + self._sort($header.index(), direction); + } + }); + + /** + * Checks the supplied string is a valid direction and if not returns ASC as default. + * @static + * @protected + * @param {string} str - The string to check. + */ + F.Sorting.dir = function(str){ + return F.is.string(str) && (str == 'ASC' || str == 'DESC') ? str : 'ASC'; + }; + + F.components.register('sorting', F.Sorting, 600); + +})(jQuery, FooTable); +(function(F){ + + /** + * The value used by the sorting component during sort operations. Can be set using the data-sort-value attribute on the cell itself. + * If this is not supplied it is set to the result of the toString method called on the value for the cell. Added by the {@link FooTable.Sorting} component. + * @type {string} + * @default null + */ + F.Cell.prototype.sortValue = null; + + // this is used to define the sorting specific properties on cell creation + F.Cell.prototype.__sorting_define__ = function(valueOrElement){ + this.sortValue = this.column.sortValue.call(this.column, valueOrElement); + }; + + // this is used to update the sortValue property whenever the cell value is changed + F.Cell.prototype.__sorting_val__ = function(value){ + if (F.is.defined(value)){ + // set only + this.sortValue = this.column.sortValue.call(this.column, value); + } + }; + + // overrides the public define method and replaces it with our own + F.Cell.extend('define', function(valueOrElement){ + this._super(valueOrElement); + this.__sorting_define__(valueOrElement); + }); + // overrides the public val method and replaces it with our own + F.Cell.extend('val', function(value){ + var val = this._super(value); + this.__sorting_val__(value); + return val; + }); +})(FooTable); +(function($, F){ + /** + * The direction to sort if the {@link FooTable.Column#sorted} property is set to true. Can be "ASC", "DESC" or NULL. Added by the {@link FooTable.Sorting} component. + * @type {string} + * @default null + */ + F.Column.prototype.direction = null; + /** + * Whether or not the column can be sorted. Added by the {@link FooTable.Sorting} component. + * @type {boolean} + * @default true + */ + F.Column.prototype.sortable = true; + /** + * Whether or not the column is sorted. Added by the {@link FooTable.Sorting} component. + * @type {boolean} + * @default false + */ + F.Column.prototype.sorted = false; + + /** + * This is supplied two values from the column for a comparison to be made and the result returned. Added by the {@link FooTable.Sorting} component. + * @param {*} a - The first value to be compared. + * @param {*} b - The second value to compare to the first. + * @returns {number} + * @example + * "sorter": function(a, b){ + * if (a is less than b by some ordering criterion) { + * return -1; + * } + * if (a is greater than b by the ordering criterion) { + * return 1; + * } + * // a must be equal to b + * return 0; + * } + */ + F.Column.prototype.sorter = function(a, b){ + if (typeof a === 'string') a = a.toLowerCase(); + if (typeof b === 'string') b = b.toLowerCase(); + if (a === b) return 0; + if (a < b) return -1; + return 1; + }; + + /** + * This is supplied either the cell value or jQuery object to parse. A value must be returned from this method and will be used during sorting operations. + * @param {(*|jQuery)} valueOrElement - The value or jQuery cell object. + * @returns {*} + * @this FooTable.Column + */ + 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)){ + 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; + if (F.is.defined(valueOrElement.value)) valueOrElement = valueOrElement.value; + } + if (F.is.defined(valueOrElement) && valueOrElement != null) return valueOrElement; + return null; + }; + + // this is used to define the sorting specific properties on column creation + F.Column.prototype.__sorting_define__ = function(definition){ + this.sorter = F.checkFnValue(this, definition.sorter, this.sorter); + 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 + F.Column.extend('define', function(definition){ + this._super(definition); + this.__sorting_define__(definition); + }); + +})(jQuery, FooTable); +(function(F){ + /** + * An object containing the sorting options for the plugin. Added by the {@link FooTable.Sorting} component. + * @type {object} + * @prop {boolean} enabled=false - Whether or not to allow sorting on the table. + */ + F.Defaults.prototype.sorting = { + enabled: false + }; +})(FooTable); +(function($, F){ + + F.HTMLColumn.extend('__sorting_define__', function(definition){ + this._super(definition); + this.sortUse = F.is.string(definition.sortUse) && $.inArray(definition.sortUse, ['html','text']) !== -1 ? definition.sortUse : 'html'; + }); + + /** + * This is supplied either the cell value or jQuery object to parse. A value must be returned from this method and will be used during sorting operations. + * @param {(*|jQuery)} valueOrElement - The value or jQuery cell object. + * @returns {*} + * @this FooTable.HTMLColumn + */ + 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)){ + 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)){ + if (F.is.string(valueOrElement.options.sortValue)) return valueOrElement.options.sortValue; + if (F.is.defined(valueOrElement.value)) valueOrElement = valueOrElement.value; + } + if (F.is.defined(valueOrElement) && valueOrElement != null) return valueOrElement; + return null; + }; + +})(jQuery, FooTable); +(function(F){ + /** + * Sort the table using the specified column and direction. Added by the {@link FooTable.Sorting} component. + * @instance + * @param {(string|number|FooTable.Column)} column - The column name, index or the actual {@link FooTable.Column} object to sort by. + * @param {string} [direction="ASC"] - The direction to sort by, either ASC or DESC. + * @returns {jQuery.Promise} + * @fires FooTable.Sorting#"change.ft.sorting" + * @fires FooTable.Sorting#"changed.ft.sorting" + * @see FooTable.Sorting#sort + */ + F.Table.prototype.sort = function(column, direction){ + return this.use(F.Sorting).sort(column, direction); + }; })(FooTable); \ No newline at end of file diff --git a/admin/custom/footable3/js/footable.sorting.min.js b/admin/custom/footable3/js/footable.sorting.min.js index 1d5092e1c..c73f1185b 100644 --- a/admin/custom/footable3/js/footable.sorting.min.js +++ b/admin/custom/footable3/js/footable.sorting.min.js @@ -1,8 +1,8 @@ /* * 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. */ -!function(a,b){b.Sorter=b.Class.extend({construct:function(a,b){this.column=a,this.direction=b}})}(jQuery,FooTable),function(a,b){b.Sorting=b.Component.extend({construct:function(a){this._super(a,a.o.sorting.enabled),this.o=a.o.sorting,this.column=null,this._changed=!1},preinit:function(a){var c=this;this.ft.raise("preinit.ft.sorting",[a]).then(function(){c.ft.$el.hasClass("footable-sorting")&&(c.enabled=!0),c.enabled=b.is["boolean"](a.sorting)?a.sorting:c.enabled,c.enabled&&(c.column=b.arr.first(c.ft.columns.array,function(a){return a.sorted}))},function(){c.enabled=!1})},init:function(){var c=this;this.ft.raise("init.ft.sorting").then(function(){b.arr.each(c.ft.columns.array,function(b){b.sortable&&b.$el.addClass("footable-sortable").append(a("",{"class":"fooicon fooicon-sort"}))}),c.ft.$el.on("click.footable",".footable-sortable",{self:c},c._onSortClicked)},function(){c.enabled=!1})},destroy:function(){var a=this;this.ft.raise("destroy.ft.paging").then(function(){a.ft.$el.off("click.footable",".footable-sortable",a._onSortClicked),a.ft.$el.children("thead").children("tr.footable-header").children(".footable-sortable").removeClass("footable-sortable").find("span.fooicon").remove()})},predraw:function(){if(this.column){var a=this,b=a.column;a.ft.rows.array.sort(function(a,c){return"ASC"==b.direction?b.sorter(a.cells[b.index].sortValue,c.cells[b.index].sortValue):b.sorter(c.cells[b.index].sortValue,a.cells[b.index].sortValue)})}},draw:function(){if(this.column){var a=this,b=a.ft.$el.find("thead > tr > .footable-sortable"),c=a.column.$el;b.removeClass("footable-asc footable-desc").children(".fooicon").removeClass("fooicon-sort fooicon-sort-asc fooicon-sort-desc"),b.not(c).children(".fooicon").addClass("fooicon-sort"),c.addClass("ASC"==a.column.direction?"footable-asc":"footable-desc").children(".fooicon").addClass("ASC"==a.column.direction?"fooicon-sort-asc":"fooicon-sort-desc")}},sort:function(a,b){return this._sort(a,b)},_sort:function(a,c){var d=this,e=new b.Sorter(d.ft.columns.get(a),b.Sorting.dir(c));return d.ft.raise("before.ft.sorting",[e]).then(function(){return b.arr.each(d.ft.columns.array,function(a){a!=d.column&&(a.direction=null)}),d.column=d.ft.columns.get(e.column),d.column&&(d.column.direction=b.Sorting.dir(e.direction)),d.ft.draw().then(function(){d.ft.raise("after.ft.sorting",[e])})})},_onSortClicked:function(b){b.preventDefault();var c=b.data.self,d=a(this).closest("th,td"),e=d.is(".footable-asc, .footable-desc")?d.hasClass("footable-desc")?"ASC":"DESC":"ASC";c._sort(d.index(),e)}}),b.Sorting.dir=function(a){return!b.is.string(a)||"ASC"!=a&&"DESC"!=a?"ASC":a},b.components.core.register("sorting",b.Sorting,5)}(jQuery,FooTable),function(a){a.Cell.prototype.sortValue=null,a.Cell.prototype.__sorting_define__=function(a){this.sortValue=this.column.sortValue.call(this.column,a)},a.Cell.prototype.__sorting_val__=function(b){a.is.defined(b)&&(this.sortValue=this.column.sortValue.call(this.column,b))},a.Cell.extend("define",function(a){this._super(a),this.__sorting_define__(a)}),a.Cell.extend("val",function(a){var b=this._super(a);return this.__sorting_val__(a),b})}(FooTable),function(a,b){b.Column.prototype.direction=null,b.Column.prototype.sortable=!0,b.Column.prototype.sorted=!1,b.Column.prototype.sorter=function(a,b){return"string"==typeof a&&(a=a.toLowerCase()),"string"==typeof b&&(b=b.toLowerCase()),a===b?0:b>a?-1:1},b.Column.prototype.sortValue=function(c){if(b.is.element(c)||b.is.jq(c))return a(c).data("sortValue")||this.parser(c);if(b.is.hash(c)&&b.is.hash(c.options)){if(b.is.string(c.options.sortValue))return c.options.sortValue;b.is.defined(c.value)&&(c=c.value)}return b.is.defined(c)&&null!=c?c:null},b.Column.prototype.__sorting_define__=function(a){this.sorter=b.checkFnValue(this,a.sorter,this.sorter),this.direction=b.is.type(a.direction,"string")?b.Sorting.dir(a.direction):null,this.sortable=b.is["boolean"](a.sortable)?a.sortable:!0,this.sorted=b.is["boolean"](a.sorted)?a.sorted:!1},b.Column.extend("define",function(a){this._super(a),this.__sorting_define__(a)})}(jQuery,FooTable),function(a){a.Defaults.prototype.sorting={enabled:!1}}(FooTable),function(a,b){b.HTMLColumn.extend("__sorting_define__",function(c){this._super(c),this.sortUse=b.is.string(c.sortUse)&&-1!==a.inArray(c.sortUse,["html","text"])?c.sortUse:"html"}),b.HTMLColumn.prototype.sortValue=function(c){if(b.is.element(c)||b.is.jq(c))return a(c).data("sortValue")||a.trim(a(c)[this.sortUse]());if(b.is.hash(c)&&b.is.hash(c.options)){if(b.is.string(c.options.sortValue))return c.options.sortValue;b.is.defined(c.value)&&(c=c.value)}return b.is.defined(c)&&null!=c?c:null}}(jQuery,FooTable),function(a){a.Table.prototype.sort=function(b,c){return this.use(a.Sorting).sort(b,c)}}(FooTable); \ No newline at end of file +!function(a,b){b.Sorter=b.Class.extend({construct:function(a,b){this.column=a,this.direction=b}})}(jQuery,FooTable),function(a,b){b.Sorting=b.Component.extend({construct:function(a){this._super(a,a.o.sorting.enabled),this.o=a.o.sorting,this.column=null,this.allowed=!0,this.initial=null},preinit:function(a){var c=this;this.ft.raise("preinit.ft.sorting",[a]).then(function(){c.ft.$el.hasClass("footable-sorting")&&(c.enabled=!0),c.enabled=b.is["boolean"](a.sorting)?a.sorting:c.enabled,c.enabled&&(c.column=b.arr.first(c.ft.columns.array,function(a){return a.sorted}))},function(){c.enabled=!1})},init:function(){var c=this;this.ft.raise("init.ft.sorting").then(function(){if(!c.initial){var d=!!c.column;c.initial={isset:d,rows:c.ft.rows.all.slice(0),column:d?c.column.name:null,direction:d?c.column.direction:null}}b.arr.each(c.ft.columns.array,function(b){b.sortable&&b.$el.addClass("footable-sortable").append(a("",{"class":"fooicon fooicon-sort"}))}),c.ft.$el.on("click.footable",".footable-sortable",{self:c},c._onSortClicked)},function(){c.enabled=!1})},destroy:function(){var a=this;this.ft.raise("destroy.ft.paging").then(function(){a.ft.$el.off("click.footable",".footable-sortable",a._onSortClicked),a.ft.$el.children("thead").children("tr.footable-header").children(".footable-sortable").removeClass("footable-sortable footable-asc footable-desc").find("span.fooicon").remove()})},predraw:function(){if(this.column){var a=this,b=a.column;a.ft.rows.array.sort(function(a,c){return"DESC"==b.direction?b.sorter(c.cells[b.index].sortValue,a.cells[b.index].sortValue):b.sorter(a.cells[b.index].sortValue,c.cells[b.index].sortValue)})}},draw:function(){if(this.column){var a=this,b=a.ft.$el.find("thead > tr > .footable-sortable"),c=a.column.$el;b.removeClass("footable-asc footable-desc").children(".fooicon").removeClass("fooicon-sort fooicon-sort-asc fooicon-sort-desc"),b.not(c).children(".fooicon").addClass("fooicon-sort"),c.addClass("DESC"==a.column.direction?"footable-desc":"footable-asc").children(".fooicon").addClass("DESC"==a.column.direction?"fooicon-sort-desc":"fooicon-sort-asc")}},sort:function(a,b){return this._sort(a,b)},toggleAllowed:function(a){a=b.is["boolean"](a)?a:!this.allowed,this.allowed=a,this.ft.$el.toggleClass("footable-sorting-disabled",!this.allowed)},hasChanged:function(){return!(!this.initial||!this.column||this.column.name===this.initial.column&&(this.column.direction===this.initial.direction||null===this.initial.direction&&"ASC"===this.column.direction))},reset:function(){this.initial&&(this.initial.isset?this.sort(this.initial.column,this.initial.direction):(this.column&&(this.column.$el.removeClass("footable-asc footable-desc"),this.column=null),this.ft.rows.all=this.initial.rows,this.ft.draw()))},_sort:function(c,d){if(!this.allowed)return a.Deferred().reject("sorting disabled");var e=this,f=new b.Sorter(e.ft.columns.get(c),b.Sorting.dir(d));return e.ft.raise("before.ft.sorting",[f]).then(function(){return b.arr.each(e.ft.columns.array,function(a){a!=e.column&&(a.direction=null)}),e.column=e.ft.columns.get(f.column),e.column&&(e.column.direction=b.Sorting.dir(f.direction)),e.ft.draw().then(function(){e.ft.raise("after.ft.sorting",[f])})})},_onSortClicked:function(b){var c=b.data.self,d=a(this).closest("th,td"),e=d.is(".footable-asc, .footable-desc")?d.hasClass("footable-desc")?"ASC":"DESC":"ASC";c._sort(d.index(),e)}}),b.Sorting.dir=function(a){return!b.is.string(a)||"ASC"!=a&&"DESC"!=a?"ASC":a},b.components.register("sorting",b.Sorting,600)}(jQuery,FooTable),function(a){a.Cell.prototype.sortValue=null,a.Cell.prototype.__sorting_define__=function(a){this.sortValue=this.column.sortValue.call(this.column,a)},a.Cell.prototype.__sorting_val__=function(b){a.is.defined(b)&&(this.sortValue=this.column.sortValue.call(this.column,b))},a.Cell.extend("define",function(a){this._super(a),this.__sorting_define__(a)}),a.Cell.extend("val",function(a){var b=this._super(a);return this.__sorting_val__(a),b})}(FooTable),function(a,b){b.Column.prototype.direction=null,b.Column.prototype.sortable=!0,b.Column.prototype.sorted=!1,b.Column.prototype.sorter=function(a,b){return"string"==typeof a&&(a=a.toLowerCase()),"string"==typeof b&&(b=b.toLowerCase()),a===b?0:b>a?-1:1},b.Column.prototype.sortValue=function(c){if(b.is.element(c)||b.is.jq(c)){var d=a(c).data("sortValue");return b.is.defined(d)?d:this.parser(c)}if(b.is.hash(c)&&b.is.hash(c.options)){if(b.is.string(c.options.sortValue))return c.options.sortValue;b.is.defined(c.value)&&(c=c.value)}return b.is.defined(c)&&null!=c?c:null},b.Column.prototype.__sorting_define__=function(a){this.sorter=b.checkFnValue(this,a.sorter,this.sorter),this.direction=b.is.type(a.direction,"string")?b.Sorting.dir(a.direction):null,this.sortable=b.is["boolean"](a.sortable)?a.sortable:!0,this.sorted=b.is["boolean"](a.sorted)?a.sorted:!1,this.sortValue=b.checkFnValue(this,a.sortValue,this.sortValue)},b.Column.extend("define",function(a){this._super(a),this.__sorting_define__(a)})}(jQuery,FooTable),function(a){a.Defaults.prototype.sorting={enabled:!1}}(FooTable),function(a,b){b.HTMLColumn.extend("__sorting_define__",function(c){this._super(c),this.sortUse=b.is.string(c.sortUse)&&-1!==a.inArray(c.sortUse,["html","text"])?c.sortUse:"html"}),b.HTMLColumn.prototype.sortValue=function(c){if(b.is.element(c)||b.is.jq(c)){var d=a(c).data("sortValue");return b.is.defined(d)?d:a.trim(a(c)[this.sortUse]())}if(b.is.hash(c)&&b.is.hash(c.options)){if(b.is.string(c.options.sortValue))return c.options.sortValue;b.is.defined(c.value)&&(c=c.value)}return b.is.defined(c)&&null!=c?c:null}}(jQuery,FooTable),function(a){a.Table.prototype.sort=function(b,c){return this.use(a.Sorting).sort(b,c)}}(FooTable); \ No newline at end of file diff --git a/admin/custom/footable3/js/footable.state.js b/admin/custom/footable3/js/footable.state.js new file mode 100644 index 000000000..20584ea8a --- /dev/null +++ b/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); \ No newline at end of file diff --git a/admin/custom/footable3/js/footable.state.min.js b/admin/custom/footable3/js/footable.state.min.js new file mode 100644 index 000000000..d542d9672 --- /dev/null +++ b/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); \ No newline at end of file diff --git a/admin/helpers/compiler.php b/admin/helpers/compiler.php index 64f0878a3..f744c298b 100644 --- a/admin/helpers/compiler.php +++ b/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); } @@ -241,6 +257,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() { @@ -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 %s
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 %s 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 %s 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'); } } 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 %s 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 %s 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'); } } else @@ -724,12 +820,12 @@ class Compiler extends Infusion protected function loadEscapedCode($file, $target, $lineBites) { // escape the code - $code = explode("\n", $target['code']); - $code = "\n// " .implode("\n// ",$code). "\n"; + $code = explode(PHP_EOL, $target['code']); + $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) diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php index bd5d79c74..571d93424 100644 --- a/admin/helpers/compiler/a_Get.php +++ b/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 .= "\n--"; - $dump .= "\n\nINSERT INTO `#__[[[component]]]_".$view."` ("; + $dump .= PHP_EOL."-- Dumping data for table `#__[[[component]]]_".$view."`"; + $dump .= PHP_EOL."--"; + $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')); - $query->where($db->quoteName('a.component') . ' = '. (int) $this->componentData->id); + 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.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'); - $query->order($db->quoteName('a.from_line') . ' ASC'); // <--- insrue we always add code from top of file $db->setQuery($query); $db->execute(); if ($db->getNumRows()) @@ -2616,12 +2633,16 @@ class Get foreach($this->customCode as $nr => &$customCode) { $customCode['code'] = base64_decode($customCode['code']); - $customCode['hashtarget'] = explode("__", $customCode['hashtarget']); - if ($customCode['type'] == 1 && strpos($customCode['hashendtarget'], '__') !== false) + if (isset($customCode['hashtarget'])) { - $customCode['hashendtarget'] = explode("__", $customCode['hashendtarget']); + $customCode['hashtarget'] = explode("__", $customCode['hashtarget']); + if ($customCode['type'] == 1 && strpos($customCode['hashendtarget'], '__') !== false) + { + $customCode['hashendtarget'] = explode("__", $customCode['hashendtarget']); + } } } + return true; } return false; } @@ -2642,12 +2663,20 @@ 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){ - $query->values(implode(',', $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(); @@ -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; - $_type = (int) ($type === 1 || $type === 3) ? 1 : 2; + $i = (int) ($type == 3 ||$type == 4) ? 2 : 1; + $_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//////////////////////////////////////////", - 'end' => "\t\t//////////////////////////////////////////"); + 'start' => "/*////////////////////////////////////////*/", + 'end' => "/*////////////////////////////////////////*/"); } break; case 2: @@ -3000,8 +3058,8 @@ class Get else { return array( - 'start' => "\t\t//////////////////////////////////////////", - 'end' => "\t\t//////////////////////////////////////////"); + 'start' => "/*////////////////////////////////////////*/", + 'end' => "/*////////////////////////////////////////*/"); } break; } diff --git a/admin/helpers/compiler/b_Structure.php b/admin/helpers/compiler/b_Structure.php index 8e457e931..67ebb68bb 100644 --- a/admin/helpers/compiler/b_Structure.php +++ b/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".$lastFolder.""; + $this->fileContentStatic['###EXSTRA_MEDIA_FOLDERS###'] .= PHP_EOL."\t\t".$lastFolder.""; } // 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".$lastFolder.""; + $this->fileContentStatic['###EXSTRA_SITE_FOLDERS###'] .= PHP_EOL."\t\t".$lastFolder.""; } // 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".$lastFolder.""; + $this->fileContentStatic['###EXSTRA_ADMIN_FOLDERS###'] .= PHP_EOL."\t\t\t".$lastFolder.""; } // make we have not duplicates $key_pointer = ComponentbuilderHelper::safeString($custom['folder']).'_f'.$pointer_tracker; diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php index 1109c7a82..fc2ef7844 100644 --- a/admin/helpers/compiler/c_Fields.php +++ b/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"; + $fieldSet[] = PHP_EOL."\t"; $fieldSet[] = "\t'; $fieldSet[] = "\t\t" . '
'; @@ -634,7 +634,7 @@ class Fields extends Structure $fieldSet[] = "\t"; } // 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"; - $fieldSet .= "\n\t" . $taber . "\tsetLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->"; + $fieldSet .= PHP_EOL."\t" . $taber . "\t $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" . ''; + $optionSet .= PHP_EOL."\t" . $taber . "\t\t" . ''; $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" . ''; + $optionSet .= PHP_EOL."\t\t" . $taber . "\t" . ''; $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" . ''; + $optionSet .= PHP_EOL."\t\t" . $taber . "\t" . ''; $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" . ''; + $optionSet .= PHP_EOL."\t\t" . $taber . "\t" . ''; $optionArray[$value] = $langValue; } } @@ -868,41 +868,41 @@ class Fields extends Structure if (ComponentbuilderHelper::checkString($optionSet)) { $fieldSet .= '>'; - $fieldSet .= "\n\t\t\t" . $taber . ""; + $fieldSet .= PHP_EOL."\t\t\t" . $taber . ""; $fieldSet .= $optionSet; - $fieldSet .= "\n\t\t" . $taber . ""; + $fieldSet .= PHP_EOL."\t\t" . $taber . ""; } 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 . ""; - $fieldSet .= "\n\t\t" . $taber . "/>"; + $fieldSet .= PHP_EOL."\t\t\t" . $taber . ""; + $fieldSet .= PHP_EOL."\t\t" . $taber . "/>"; } } elseif ($setType === 'plain') { // now add to the field set - $fieldSet .= "\n\t\t" . $taber . ""; - $fieldSet .= "\n\t\t" . $taber . "setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->"; + $fieldSet .= PHP_EOL."\t\t" . $taber . " $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"; - $fieldSet .= "\n\t\tsetLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". A None Database Field. (joomla) -->"; + $fieldSet .= PHP_EOL."\t\t $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"; - $fieldSet .= "\n\t\tsetLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->"; + $fieldSet .= PHP_EOL."\t\t $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" . ''; - $fieldSet .= "\n\t\t\t\t" . '"; + $fieldSet .= PHP_EOL."\t\t\t"; + $fieldSet .= PHP_EOL."\t\t"; } } elseif ($setType === 'custom') { // now add to the field set - $fieldSet .= "\n\t\t" . $taber . ""; - $fieldSet .= "\n\t\t" . $taber . "setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (custom) -->"; + $fieldSet .= PHP_EOL."\t\t" . $taber . " $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); } } } diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index b2804d210..b1dbb5d04 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.0 + @version 2.3.0 @created 30th April, 2015 @package Component Builder @subpackage compiler.php @@ -105,7 +105,7 @@ class Interpretation extends Fields // the text for the file ###BAKING### $this->fileContentDynamic['emailer_'.$component]['###BAKING###'] = ''; // <<-- to insure it gets updated // return the code need to load the abstract class - return "\nJLoader::register('".$component."Email', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/".$component."email.php'); "; + return PHP_EOL."JLoader::register('".$component."Email', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/".$component."email.php'); "; } } return ''; @@ -125,7 +125,7 @@ class Interpretation extends Fields $this->fileContentStatic['###HELPER_SITE_LICENSE_LOCK###'] = $this->setHelperLincenseLock($_VDM,'site'); $this->fileContentStatic['###HELPER_LICENSE_LOCK###'] = $this->setHelperLincenseLock($_VDM,'admin'); $this->fileContentStatic['###LICENSE_LOCKED_INT###'] = $this->setInitLincenseLock($_VDM); - $this->fileContentStatic['###LICENSE_LOCKED_DEFINED###'] = "\n\n".'defined(\''.$_VDM.'\') or die(JText::_(\'NIE_REG_NIE\'));'; + $this->fileContentStatic['###LICENSE_LOCKED_DEFINED###'] = PHP_EOL.PHP_EOL.'defined(\''.$_VDM.'\') or die(JText::_(\'NIE_REG_NIE\'));'; } } else @@ -167,7 +167,7 @@ class Interpretation extends Fields public function checkStatmentLicenseLocked($boolMethod, $thIIS = '$this') { - $statment[] = "\n\t\tif (!".$thIIS."->".$boolMethod."())"; + $statment[] = PHP_EOL."\t\tif (!".$thIIS."->".$boolMethod."())"; $statment[] = "\t\t{"; $statment[] = "\t\t\t\$app = JFactory::getApplication();"; $statment[] = "\t\t\t\$app->enqueueMessage(JText::_('NIE_REG_NIE'), 'error');"; @@ -175,16 +175,16 @@ class Interpretation extends Fields $statment[] = "\t\t\treturn false;"; $statment[] = "\t\t}"; // return the genuine mentod statement - return implode("\n", $statment); + return implode(PHP_EOL, $statment); } public function setBoolLincenseLock($boolMethod,$globalbool) { - $bool[] = "\n\n\t/**"; + $bool[] = PHP_EOL.PHP_EOL."\t/**"; $bool[] = "\t* The private bool."; $bool[] = "\t**/"; $bool[] = "\tprivate $".$globalbool.";"; - $bool[] = "\n\t/**"; + $bool[] = PHP_EOL."\t/**"; $bool[] = "\t* Check if this install has a license."; $bool[] = "\t**/"; $bool[] = "\tpublic function ".$boolMethod."()"; @@ -207,12 +207,12 @@ class Interpretation extends Fields $bool[] = "\t\treturn false;"; $bool[] = "\t}"; // return the genuine mentod statement - return implode("\n", $bool); + return implode(PHP_EOL, $bool); } public function setHelperLincenseLock($_VDM,$target) { - $helper[] = "\n\n\t/**"; + $helper[] = PHP_EOL.PHP_EOL."\t/**"; $helper[] = "\t* Check if this install has a license."; $helper[] = "\t**/"; $helper[] = "\tpublic static function isGenuine()"; @@ -230,12 +230,12 @@ class Interpretation extends Fields $helper[] = "\t\treturn false;"; $helper[] = "\t}"; // return the genuine mentod statement - return implode("\n", $helper); + return implode(PHP_EOL, $helper); } public function setInitLincenseLock($_VDM) { - $init[] = "\nif (!defined('".$_VDM."'))"; + $init[] = PHP_EOL."if (!defined('".$_VDM."'))"; $init[] = "{"; $init[] = "\t\$allow = ".$this->fileContentStatic['###Component###']."Helper::isGenuine();"; $init[] = "\tif (\$allow)"; @@ -244,7 +244,7 @@ class Interpretation extends Fields $init[] = "\t}"; $init[] = "}"; // return the initializing statement - return implode("\n", $init); + return implode(PHP_EOL, $init); } public function setVDMCryption() @@ -270,7 +270,7 @@ class Interpretation extends Fields $encrypt[] = "/**"; $encrypt[] = "* ".$this->setLine(__LINE__)."VDM Class "; $encrypt[] = "**/"; - $encrypt[] = "\nclass VDM"; + $encrypt[] = PHP_EOL."class VDM"; $encrypt[] = "{"; $encrypt[] = "\tpublic \$_key = false;"; $encrypt[] = "\tpublic \$_is = false;"; @@ -306,7 +306,7 @@ class Interpretation extends Fields $encrypt[] = "\t\t\$Vc2rayehw4f0 = unserialize(base64_decode('czozNjoibW9kdWxlcy9zZXJ2ZXJzL2xpY2Vuc2luZy92ZXJpZnkucGhwIjs='));"; $encrypt[] = "\t\t\$Vlpolphukogz = false;"; $encrypt[] = "\t\tif (\$V2uekt2wcgwk) {"; - $encrypt[] = "\t\t\t\$V2uekt2wcgwk = str_replace(\"".'\n'."\", '', \$V2uekt2wcgwk);"; + $encrypt[] = "\t\t\t\$V2uekt2wcgwk = str_replace(\"".'".PHP_EOL."'."\", '', \$V2uekt2wcgwk);"; $encrypt[] = "\t\t\t\$Vm5cxjdc43g4 = substr(\$V2uekt2wcgwk, 0, strlen(\$V2uekt2wcgwk) - 32);"; $encrypt[] = "\t\t\t\$Vbgx0efeu2sy = substr(\$V2uekt2wcgwk, strlen(\$V2uekt2wcgwk) - 32);"; $encrypt[] = "\t\t\tif (\$Vbgx0efeu2sy == md5(\$Vm5cxjdc43g4 . \$Viioj50xuqu2['geheim'])) {"; @@ -367,7 +367,7 @@ class Interpretation extends Fields $encrypt[] = "\t\t\t} else {"; $encrypt[] = "\t\t\t\t\$Vrpmu4bvnmkp = fsockopen(\$Viioj50xuqu2['kasier'], 80, \$Vc0t5kmpwkwk, \$Va3g41fnofhu, 5);"; $encrypt[] = "\t\t\t\tif (\$Vrpmu4bvnmkp) {"; - $encrypt[] = "\t\t\t\t\t\$Vznkm0a0me1y = \"\r\n\";"; + $encrypt[] = "\t\t\t\t\t\$Vznkm0a0me1y = \"\r".PHP_EOL."\";"; $encrypt[] = "\t\t\t\t\t\$V2sgyscukmgiop = \"POST \".\$Viioj50xuqu2['kasier'] . \$Vc2rayehw4f0 . \" HTTP/1.0\" . \$Vznkm0a0me1y;"; $encrypt[] = "\t\t\t\t\t\$V2sgyscukmgiop .= \"Host: \".\$Viioj50xuqu2['kasier'] . \$Vznkm0a0me1y;"; $encrypt[] = "\t\t\t\t\t\$V2sgyscukmgiop .= \"Content-type: application/x-www-form-urlencoded\" . \$Vznkm0a0me1y;"; @@ -419,7 +419,7 @@ class Interpretation extends Fields $encrypt[] = "\t\t\t\t\$Vqojefyeohg5ing = md5(\$Vo4tezfgcf3e . \$Viioj50xuqu2['geheim']) . \$Vqojefyeohg5ing;"; $encrypt[] = "\t\t\t\t\$Vqojefyeohg5ing = strrev(\$Vqojefyeohg5ing);"; $encrypt[] = "\t\t\t\t\$Vqojefyeohg5ing = \$Vqojefyeohg5ing . md5(\$Vqojefyeohg5ing . \$Viioj50xuqu2['geheim']);"; - $encrypt[] = "\t\t\t\t\$Vqojefyeohg5ing = wordwrap(\$Vqojefyeohg5ing, 80, \"".'\n'."\", true);"; + $encrypt[] = "\t\t\t\t\$Vqojefyeohg5ing = wordwrap(\$Vqojefyeohg5ing, 80, \"".'".PHP_EOL."'."\", true);"; $encrypt[] = "\t\t\t\t\$Vwasqoybpyed['eiegrendel'] = \$Vqojefyeohg5ing;"; $encrypt[] = "\t\t\t}"; $encrypt[] = "\t\t\t\$Vwasqoybpyed['nuut'] = true;"; @@ -430,7 +430,7 @@ class Interpretation extends Fields $encrypt[] = "}"; // return the help methods - return implode("\n",$encrypt); + return implode(PHP_EOL,$encrypt); } } return ''; @@ -450,7 +450,7 @@ class Interpretation extends Fields // the text for the file ###VDM_ENCRYPTION_BODY### $this->fileContentDynamic['encrypt']['###VDM_ENCRYPTION_BODY###'] = $this->setVDMCryption(); // ###ENCRYPT_FILE### - $this->fileContentStatic['###ENCRYPT_FILE###'] = "\n\t\t\tvdm.php"; + $this->fileContentStatic['###ENCRYPT_FILE###'] = PHP_EOL."\t\t\tvdm.php"; } // get component name $component = $this->fileContentStatic['###component###']; @@ -458,7 +458,7 @@ class Interpretation extends Fields $function = array(); if (isset($this->basicEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->basicEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->advancedEncryptionBuilder)) { - $function[] = "\n\n\tpublic static function getCryptKey(\$type, \$default = null)"; + $function[] = PHP_EOL.PHP_EOL."\tpublic static function getCryptKey(\$type, \$default = null)"; $function[] = "\t{"; $function[] = "\t\t//".$this->setLine(__LINE__)." Get the global params"; $function[] = "\t\t\$params = JComponentHelper::getParams('com_".$component."', true);"; @@ -469,8 +469,8 @@ class Interpretation extends Fields $function[] = "\t\t\t{"; $function[] = "\t\t\t\t//".$this->setLine(__LINE__)." load the file"; $function[] = "\t\t\t\tJLoader::import( 'vdm', JPATH_COMPONENT_ADMINISTRATOR);"; - $function[] = "\n\t\t\t\t\$the = new VDM(\$advanced_key);"; - $function[] = "\n\t\t\t\treturn \$the->_key;"; + $function[] = PHP_EOL."\t\t\t\t\$the = new VDM(\$advanced_key);"; + $function[] = PHP_EOL."\t\t\t\treturn \$the->_key;"; $function[] = "\t\t\t}"; $function[] = "\t\t}"; $function[] = "\t\telseif ('basic' === \$type)"; @@ -486,7 +486,7 @@ class Interpretation extends Fields } elseif (isset($this->advancedEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->advancedEncryptionBuilder)) { - $function[] = "\n\n\tpublic static function getCryptKey(\$type, \$default = null)"; + $function[] = PHP_EOL.PHP_EOL."\tpublic static function getCryptKey(\$type, \$default = null)"; $function[] = "\t{"; $function[] = "\t\tif ('advanced' === \$type)"; $function[] = "\t\t{"; @@ -497,8 +497,8 @@ class Interpretation extends Fields $function[] = "\t\t\t{"; $function[] = "\t\t\t\t//".$this->setLine(__LINE__)." load the file"; $function[] = "\t\t\t\tJLoader::import( 'vdm', JPATH_COMPONENT_ADMINISTRATOR);"; - $function[] = "\n\t\t\t\t\$the = new VDM(\$advanced_key);"; - $function[] = "\n\t\t\t\treturn \$the->_key;"; + $function[] = PHP_EOL."\t\t\t\t\$the = new VDM(\$advanced_key);"; + $function[] = PHP_EOL."\t\t\t\treturn \$the->_key;"; $function[] = "\t\t\t}"; $function[] = "\t\t}"; $function[] = "\t\treturn false;"; @@ -506,7 +506,7 @@ class Interpretation extends Fields } elseif (isset($this->basicEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->basicEncryptionBuilder)) { - $function[] = "\n\n\tpublic static function getCryptKey(\$type, \$default = null)"; + $function[] = PHP_EOL.PHP_EOL."\tpublic static function getCryptKey(\$type, \$default = null)"; $function[] = "\t{"; $function[] = "\t\tif ('basic' === \$type)"; $function[] = "\t\t{"; @@ -522,7 +522,7 @@ class Interpretation extends Fields $function[] = "\t}"; } // return the help methods - return implode("\n",$function); + return implode(PHP_EOL,$function); } return ''; } @@ -592,7 +592,7 @@ class Interpretation extends Fields $name = str_replace('.xml', '', substr($this->componentData->update_server, strrpos($this->componentData->update_server, '/') + 1)); $target = array('admin' => $name); $this->buildDynamique($target,'update_server'); - $this->fileContentDynamic[$name]['###UPDATE_SERVER_XML###'] = implode("\n", $updateXML); + $this->fileContentDynamic[$name]['###UPDATE_SERVER_XML###'] = implode(PHP_EOL, $updateXML); // set the Update server file name $this->updateServerFileName = $name; @@ -603,11 +603,11 @@ class Interpretation extends Fields { // ###UPDATESERVER### $updateServer = array(); - $updateServer[] = "\n\t"; + $updateServer[] = PHP_EOL."\t"; $updateServer[] = "\t\t".''.$this->componentData->update_server.''; $updateServer[] = "\t"; // return the array to string - $updateServer = implode("\n", $updateServer); + $updateServer = implode(PHP_EOL, $updateServer); } // add update server details to component XML file $this->fileContentStatic['###UPDATESERVER###'] = $updateServer; @@ -616,7 +616,7 @@ class Interpretation extends Fields public function noHelp() { $help = array(); - $help[] = "\n\n\t/**"; + $help[] = PHP_EOL.PHP_EOL."\t/**"; $help[] = "\t* Can be used to build help urls."; $help[] = "\t**/"; $help[] = "\tpublic static function getHelpUrl(\$view)"; @@ -624,7 +624,7 @@ class Interpretation extends Fields $help[] = "\t\treturn false;"; $help[] = "\t}"; // return the no help method - return implode("\n",$help); + return implode(PHP_EOL,$help); } public function checkHelp($viewName_single) @@ -660,7 +660,7 @@ class Interpretation extends Fields $target = 'site_view'; } $help = array(); - $help[] = "\n\n\t/**"; + $help[] = PHP_EOL.PHP_EOL."\t/**"; $help[] = "\t* Load the Component Help URLs."; $help[] = "\t**/"; $help[] = "\tpublic static function getHelpUrl(\$view)"; @@ -714,14 +714,14 @@ class Interpretation extends Fields $help[] = "\t\t}"; $help[] = "\t\treturn false;"; $help[] = "\t}"; - $help[] = "\n\t/**"; + $help[] = PHP_EOL."\t/**"; $help[] = "\t* Get the Article Link."; $help[] = "\t**/"; $help[] = "\tprotected static function loadArticleLink(\$id)"; $help[] = "\t{"; $help[] = "\t\treturn JURI::root().'index.php?option=com_content&view=article&id='.\$id.'&tmpl=component&layout=modal';"; $help[] = "\t}"; - $help[] = "\n\t/**"; + $help[] = PHP_EOL."\t/**"; $help[] = "\t* Get the Help Text Link."; $help[] = "\t**/"; $help[] = "\tprotected static function loadHelpTextLink(\$id)"; @@ -730,7 +730,7 @@ class Interpretation extends Fields $help[] = "\t\treturn 'index.php?option=com_".$this->fileContentStatic['###component###']."&task=help.getText&id=' . (int) \$id . '&token=' . \$token;"; $help[] = "\t}"; // return the help methods - return implode("\n",$help); + return implode(PHP_EOL,$help); } public function setExelHelperMethods() @@ -738,7 +738,7 @@ class Interpretation extends Fields if ($this->addEximport) { $exel = array(); - $exel[] = "\n\n\t/**"; + $exel[] = PHP_EOL.PHP_EOL."\t/**"; $exel[] = "\t * Prepares the xml document"; $exel[] = "\t */"; $exel[] = "\tpublic static function xls(\$rows,\$fileName = null,\$title = null,\$subjectTab = null,\$creator = '".$this->fileContentStatic['###COMPANYNAME###']."',\$description = null,\$category = null,\$keywords = null,\$modified = null)"; @@ -916,7 +916,7 @@ class Interpretation extends Fields $exel[] = "\t\treturn false;"; $exel[] = "\t}"; // return the help methods - return implode("\n",$exel); + return implode(PHP_EOL,$exel); } return ''; } @@ -926,7 +926,7 @@ class Interpretation extends Fields if ($add) { $method = array(); - $method[] = "\n\n\t/**"; + $method[] = PHP_EOL.PHP_EOL."\t/**"; $method[] = "\t* Greate user and update given table"; $method[] = "\t*/"; $method[] = "\tpublic static function createUser(\$new)"; @@ -984,7 +984,7 @@ class Interpretation extends Fields $method[] = "\t\treturn \$model->getError();"; $method[] = "\t}"; - $method[] = "\n\tprotected static function setParams(\$component,\$target,\$value)"; + $method[] = PHP_EOL."\tprotected static function setParams(\$component,\$target,\$value)"; $method[] = "\t{"; $method[] = "\t\t//".$this->setLine(__LINE__)." Get the params and set the new values"; $method[] = "\t\t\$params = JComponentHelper::getParams(\$component);"; @@ -1007,7 +1007,7 @@ class Interpretation extends Fields $method[] = "\t\treturn \$was;"; $method[] = "\t}"; - $method[] = "\n\t/**"; + $method[] = PHP_EOL."\t/**"; $method[] = "\t* Update user values"; $method[] = "\t*/"; $method[] = "\tpublic static function updateUser(\$new)"; @@ -1057,7 +1057,7 @@ class Interpretation extends Fields $method[] = "\t}"; // return the help method - return implode("\n",$method); + return implode(PHP_EOL,$method); } return ''; } @@ -1077,23 +1077,23 @@ class Interpretation extends Fields $this->langContent['adminsys'][$lang.'_DESC'] = $view['settings']->description; //start loading xml $xml = ''; - $xml .= "\n".''; - $xml .= "\n\t".''; - $xml .= "\n\t\t".''; - $xml .= "\n\t\t\t".''; - $xml .= "\n\t\t".''; - $xml .= "\n\t".''; + $xml .= PHP_EOL.''; + $xml .= PHP_EOL."\t".''; + $xml .= PHP_EOL."\t\t".''; + $xml .= PHP_EOL."\t\t\t".''; + $xml .= PHP_EOL."\t\t".''; + $xml .= PHP_EOL."\t".''; if (isset($this->hasIdRequest[$view['settings']->code])) { $requestField = str_replace($view['settings']->code.'_request_id', 'id', $this->hasIdRequest[$view['settings']->code]); - $xml .= "\n\t".''; - $xml .= "\n\t".''; - $xml .= "\n\t\t".'
'; - $xml .= "\n\t\t\t".$requestField; - $xml .= "\n\t\t".'
'; - $xml .= "\n\t".''; + $xml .= PHP_EOL."\t".''; + $xml .= PHP_EOL."\t".''; + $xml .= PHP_EOL."\t\t".'
fileContentStatic['###component###'].'/models/fields">'; + $xml .= PHP_EOL."\t\t\t".$requestField; + $xml .= PHP_EOL."\t\t".'
'; + $xml .= PHP_EOL."\t".''; } if (isset($this->frontEndParams) && isset($this->frontEndParams[$view['settings']->name])) { @@ -1102,15 +1102,15 @@ class Interpretation extends Fields // now load the fields if (ComponentbuilderHelper::checkArray($params)) { - $xml .= "\n\t".''; - $xml .= "\n\t".''; - $xml .= "\n\t\t".'
'; + $xml .= PHP_EOL."\t".''; + $xml .= PHP_EOL."\t".''; + $xml .= PHP_EOL."\t\t".'
'; $xml .= implode("\t\t\t",$params); - $xml .= "\n\t\t".'
'; - $xml .= "\n\t".''; + $xml .= PHP_EOL."\t\t".'
'; + $xml .= PHP_EOL."\t".''; } } - $xml .= "\n".''; + $xml .= PHP_EOL.''; } return $xml; } @@ -1125,7 +1125,7 @@ class Interpretation extends Fields if (strpos($field,'Option Set. -->') !== false && strpos($field,$menuSetter) === false) { // we add the global option - $field = str_replace('Option Set. -->', $this->setLine(__LINE__).' Global & Option Set. -->'."\n\t\t\t".'', $field); + $field = str_replace('Option Set. -->', $this->setLine(__LINE__).' Global & Option Set. -->'.PHP_EOL."\t\t\t".'', $field); // update the default to be global $field = preg_replace('/default=".+"/', 'default=""', $field); // update the default to be filter @@ -1161,22 +1161,22 @@ class Interpretation extends Fields $this->customViewQueryChecker[$this->target][] = $checker; if (ComponentbuilderHelper::checkString($the_get['selection']['type'])) { - $getItem = "\n\n\t".$tab."\t//".$this->setLine(__LINE__)." Get from ".$the_get['selection']['table']." as ".$the_get['as']; + $getItem = PHP_EOL.PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get from ".$the_get['selection']['table']." as ".$the_get['as']; } else { - $getItem = "\n\n\t".$tab."\t//".$this->setLine(__LINE__)." Get data"; + $getItem = PHP_EOL.PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get data"; } // set the selection - $getItem .= "\n\t".$tab."\t".$the_get['selection']['select']; + $getItem .= PHP_EOL."\t".$tab."\t".$the_get['selection']['select']; if (($nr == 0 && (!isset($the_get['join_field']) || !ComponentbuilderHelper::checkString($the_get['join_field'])) && (isset($the_get['selection']['type']) && ComponentbuilderHelper::checkString($the_get['selection']['type']))) || ($type === 'custom' && (isset($the_get['selection']['type']) && ComponentbuilderHelper::checkString($the_get['selection']['type'])))) { - $getItem .= "\n\t".$tab."\t".'$query->from('.$the_get['selection']['from'].');'; + $getItem .= PHP_EOL."\t".$tab."\t".'$query->from('.$the_get['selection']['from'].');'; } elseif (isset($the_get['join_field']) && ComponentbuilderHelper::checkString($the_get['join_field']) && isset($the_get['selection']['type']) && ComponentbuilderHelper::checkString($the_get['selection']['type'])) { - $getItem .= "\n\t".$tab."\t\$query->join('".$the_get['type']; + $getItem .= PHP_EOL."\t".$tab."\t\$query->join('".$the_get['type']; $getItem .= "', (".$the_get['selection']['from']; $getItem .= ") . ' ON (' . \$db->quoteName('".$the_get['on_field']; $getItem .= "') . ' ".$the_get['operator']; @@ -1226,97 +1226,97 @@ class Interpretation extends Fields { case 4: // COM_COMPONENTBUILDER_DYNAMIC_GET_USER_GROUPS - $filter .= "\n\n\t".$tab."\t//".$this->setLine(__LINE__)." filter ".$as." based on user groups"; - $filter .= "\n\t".$tab."\t\$remove = (count(array_intersect((array) \$this->groups, (array) ".$string."->".$field."))) ? false : true;"; - $filter .= "\n\t".$tab."\tif (\$remove)"; - $filter .= "\n\t".$tab."\t{"; + $filter .= PHP_EOL.PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." filter ".$as." based on user groups"; + $filter .= PHP_EOL."\t".$tab."\t\$remove = (count(array_intersect((array) \$this->groups, (array) ".$string."->".$field."))) ? false : true;"; + $filter .= PHP_EOL."\t".$tab."\tif (\$remove)"; + $filter .= PHP_EOL."\t".$tab."\t{"; if ($removeString == $string) { - $filter .= "\n\t".$tab."\t\t//".$this->setLine(__LINE__)." Remove ".$string." if user not in groups"; - $filter .= "\n\t".$tab."\t\t".$string." = null;"; - $filter .= "\n\t".$tab."\t\treturn false;"; + $filter .= PHP_EOL."\t".$tab."\t\t//".$this->setLine(__LINE__)." Remove ".$string." if user not in groups"; + $filter .= PHP_EOL."\t".$tab."\t\t".$string." = null;"; + $filter .= PHP_EOL."\t".$tab."\t\treturn false;"; } else { - $filter .= "\n\t".$tab."\t\t//".$this->setLine(__LINE__)." Unset ".$string." if user not in groups"; - $filter .= "\n\t".$tab."\t\tunset(".$removeString.");"; - $filter .= "\n\t".$tab."\t\tcontinue;"; + $filter .= PHP_EOL."\t".$tab."\t\t//".$this->setLine(__LINE__)." Unset ".$string." if user not in groups"; + $filter .= PHP_EOL."\t".$tab."\t\tunset(".$removeString.");"; + $filter .= PHP_EOL."\t".$tab."\t\tcontinue;"; } - $filter .= "\n\t".$tab."\t}"; + $filter .= PHP_EOL."\t".$tab."\t}"; break; case 9: // COM_COMPONENTBUILDER_DYNAMIC_GET_ARRAY_VALUE - $filter .= "\n\n\t".$tab."\tif (".$this->fileContentStatic['###Component###']."Helper::checkArray(".$string."->".$field."))"; - $filter .= "\n\t".$tab."\t{"; + $filter .= PHP_EOL.PHP_EOL."\t".$tab."\tif (".$this->fileContentStatic['###Component###']."Helper::checkArray(".$string."->".$field."))"; + $filter .= PHP_EOL."\t".$tab."\t{"; - $filter .= "\n\t".$tab."\t\t//".$this->setLine(__LINE__)." do your thing here"; + $filter .= PHP_EOL."\t".$tab."\t\t//".$this->setLine(__LINE__)." do your thing here"; - $filter .= "\n\t".$tab."\t}"; - $filter .= "\n\t".$tab."\telse"; - $filter .= "\n\t".$tab."\t{"; + $filter .= PHP_EOL."\t".$tab."\t}"; + $filter .= PHP_EOL."\t".$tab."\telse"; + $filter .= PHP_EOL."\t".$tab."\t{"; if ($removeString == $string) { - $filter .= "\n\t".$tab."\t\t//".$this->setLine(__LINE__)." Remove ".$string." if not array."; - $filter .= "\n\t".$tab."\t\t".$string." = null;"; + $filter .= PHP_EOL."\t".$tab."\t\t//".$this->setLine(__LINE__)." Remove ".$string." if not array."; + $filter .= PHP_EOL."\t".$tab."\t\t".$string." = null;"; } else { - $filter .= "\n\t".$tab."\t\t//".$this->setLine(__LINE__)." Unset ".$string." if not array."; - $filter .= "\n\t".$tab."\t\tunset(".$removeString.");"; - $filter .= "\n\t".$tab."\t\tcontinue;"; + $filter .= PHP_EOL."\t".$tab."\t\t//".$this->setLine(__LINE__)." Unset ".$string." if not array."; + $filter .= PHP_EOL."\t".$tab."\t\tunset(".$removeString.");"; + $filter .= PHP_EOL."\t".$tab."\t\tcontinue;"; } - $filter .= "\n\t".$tab."\t}"; + $filter .= PHP_EOL."\t".$tab."\t}"; break; case 10: // COM_COMPONENTBUILDER_DYNAMIC_GET_REPEATABLE_VALUE - $filter .= "\n\n\t".$tab."\t//".$this->setLine(__LINE__)." filter ".$as." based on repeatable value"; - $filter .= "\n\t".$tab."\tif (".$this->fileContentStatic['###Component###']."Helper::checkString(".$string."->".$field."))"; - $filter .= "\n\t".$tab."\t{"; + $filter .= PHP_EOL.PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." filter ".$as." based on repeatable value"; + $filter .= PHP_EOL."\t".$tab."\tif (".$this->fileContentStatic['###Component###']."Helper::checkString(".$string."->".$field."))"; + $filter .= PHP_EOL."\t".$tab."\t{"; - $filter .= "\n\t\t".$tab."\t\$array = json_decode(".$string."->".$field.",true);"; - $filter .= "\n\t\t".$tab."\tif (".$this->fileContentStatic['###Component###']."Helper::checkArray(\$array))"; - $filter .= "\n\t\t".$tab."\t{"; + $filter .= PHP_EOL."\t\t".$tab."\t\$array = json_decode(".$string."->".$field.",true);"; + $filter .= PHP_EOL."\t\t".$tab."\tif (".$this->fileContentStatic['###Component###']."Helper::checkArray(\$array))"; + $filter .= PHP_EOL."\t\t".$tab."\t{"; - $filter .= "\n\t\t".$tab."\t\t//".$this->setLine(__LINE__)." do your thing here"; + $filter .= PHP_EOL."\t\t".$tab."\t\t//".$this->setLine(__LINE__)." do your thing here"; - $filter .= "\n\t\t".$tab."\t}"; - $filter .= "\n\t".$tab."\t\telse"; - $filter .= "\n\t".$tab."\t\t{"; + $filter .= PHP_EOL."\t\t".$tab."\t}"; + $filter .= PHP_EOL."\t".$tab."\t\telse"; + $filter .= PHP_EOL."\t".$tab."\t\t{"; if ($removeString == $string) { - $filter .= "\n\t".$tab."\t\t\t//".$this->setLine(__LINE__)." Remove ".$string." if not array."; - $filter .= "\n\t".$tab."\t\t\t".$string." = null;"; + $filter .= PHP_EOL."\t".$tab."\t\t\t//".$this->setLine(__LINE__)." Remove ".$string." if not array."; + $filter .= PHP_EOL."\t".$tab."\t\t\t".$string." = null;"; } else { - $filter .= "\n\t".$tab."\t\t\t//".$this->setLine(__LINE__)." Unset ".$string." if not array."; - $filter .= "\n\t".$tab."\t\t\tunset(".$removeString.");"; - $filter .= "\n\t".$tab."\t\t\tcontinue;"; + $filter .= PHP_EOL."\t".$tab."\t\t\t//".$this->setLine(__LINE__)." Unset ".$string." if not array."; + $filter .= PHP_EOL."\t".$tab."\t\t\tunset(".$removeString.");"; + $filter .= PHP_EOL."\t".$tab."\t\t\tcontinue;"; } - $filter .= "\n\t".$tab."\t\t}"; + $filter .= PHP_EOL."\t".$tab."\t\t}"; - $filter .= "\n\t".$tab."\t}"; - $filter .= "\n\t".$tab."\telse"; - $filter .= "\n\t".$tab."\t{"; + $filter .= PHP_EOL."\t".$tab."\t}"; + $filter .= PHP_EOL."\t".$tab."\telse"; + $filter .= PHP_EOL."\t".$tab."\t{"; if ($removeString == $string) { - $filter .= "\n\t".$tab."\t\t//".$this->setLine(__LINE__)." Remove ".$string." if not string."; - $filter .= "\n\t".$tab."\t\t".$string." = null;"; + $filter .= PHP_EOL."\t".$tab."\t\t//".$this->setLine(__LINE__)." Remove ".$string." if not string."; + $filter .= PHP_EOL."\t".$tab."\t\t".$string." = null;"; } else { - $filter .= "\n\t".$tab."\t\t//".$this->setLine(__LINE__)." Unset ".$string." if not string."; - $filter .= "\n\t".$tab."\t\tunset(".$removeString.");"; - $filter .= "\n\t".$tab."\t\tcontinue;"; + $filter .= PHP_EOL."\t".$tab."\t\t//".$this->setLine(__LINE__)." Unset ".$string." if not string."; + $filter .= PHP_EOL."\t".$tab."\t\tunset(".$removeString.");"; + $filter .= PHP_EOL."\t".$tab."\t\tcontinue;"; } - $filter .= "\n\t".$tab."\t}"; + $filter .= PHP_EOL."\t".$tab."\t}"; break; } } @@ -1335,36 +1335,36 @@ class Interpretation extends Fields { if ($array['decode'] === 'json') { - $if = "\n\t".$tab."\tif (".$this->fileContentStatic['###Component###']."Helper::checkJson(".$string."->".$field."))\n\t".$tab."\t{"; + $if = PHP_EOL."\t".$tab."\tif (".$this->fileContentStatic['###Component###']."Helper::checkJson(".$string."->".$field."))".PHP_EOL."\t".$tab."\t{"; // json_decode $decoder = $string."->".$field." = json_decode(".$string."->".$field.", true);"; // TODO Use the type of field to prepare it even more for use in the view } elseif ($array['decode'] === 'base64') { - $if = "\n\t".$tab."\tif (!empty(".$string."->".$field.") && ".$string."->".$field." === base64_encode(base64_decode(".$string."->".$field.")))\n\t".$tab."\t{"; + $if = PHP_EOL."\t".$tab."\tif (!empty(".$string."->".$field.") && ".$string."->".$field." === base64_encode(base64_decode(".$string."->".$field.")))".PHP_EOL."\t".$tab."\t{"; // base64_decode $decoder = $string."->".$field." = base64_decode(".$string."->".$field.");"; // TODO Use the type of field to prepare it even more for use in the view } elseif ($array['decode'] === 'basic_encryption') { - $if = "\n\t".$tab."\tif (!empty(".$string."->".$field.") && \$basickey && !is_numeric(".$string."->".$field.") && ".$string."->".$field." === base64_encode(base64_decode(".$string."->".$field.", true)))\n\t".$tab."\t{"; + $if = PHP_EOL."\t".$tab."\tif (!empty(".$string."->".$field.") && \$basickey && !is_numeric(".$string."->".$field.") && ".$string."->".$field." === base64_encode(base64_decode(".$string."->".$field.", true)))".PHP_EOL."\t".$tab."\t{"; // basic decryption $decoder = $string."->".$field." = rtrim(\$basic->decryptString(".$string."->".$field."), ".'"\0"'.");"; $this->siteDecrypt['basic'][$code] = true; } elseif ($array['decode'] === 'advance_encryption') { - $if = "\n\t".$tab."\tif (!empty(".$string."->".$field.") && \$advancedkey && !is_numeric(".$string."->".$field.") && ".$string."->".$field." === base64_encode(base64_decode(".$string."->".$field.", true)))\n\t".$tab."\t{"; + $if = PHP_EOL."\t".$tab."\tif (!empty(".$string."->".$field.") && \$advancedkey && !is_numeric(".$string."->".$field.") && ".$string."->".$field." === base64_encode(base64_decode(".$string."->".$field.", true)))".PHP_EOL."\t".$tab."\t{"; // advanced decryption $decoder = $string."->".$field." = rtrim(\$advanced->decryptString(".$string."->".$field."), ".'"\0"'.");"; $this->siteDecrypt['advanced'][$code] = true; } // build decoder string - $fieldDecode .= $if."\n\t".$tab."\t\t//".$this->setLine(__LINE__)." Decode ".$field; - $fieldDecode .= "\n\t".$tab."\t\t".$decoder."\n\t".$tab."\t}"; + $fieldDecode .= $if.PHP_EOL."\t".$tab."\t\t//".$this->setLine(__LINE__)." Decode ".$field; + $fieldDecode .= PHP_EOL."\t".$tab."\t\t".$decoder.PHP_EOL."\t".$tab."\t}"; } } return $fieldDecode; @@ -1378,10 +1378,10 @@ class Interpretation extends Fields if (strpos($get['selection']['select'], $field) !== false) { // build decoder string - $fieldUikit .= "\n\t".$tab."\t//".$this->setLine(__LINE__)." Make sure the content prepare plugins fire on ".$field."."; - $fieldUikit .= "\n\t".$tab."\t".$string."->".$field." = JHtml::_('content.prepare',".$string."->".$field.");"; - $fieldUikit .= "\n\t".$tab."\t//".$this->setLine(__LINE__)." Checking if ".$field." has uikit components that must be loaded."; - $fieldUikit .= "\n\t".$tab."\t\$this->uikitComp = ".$this->fileContentStatic['###Component###']."Helper::getUikitComp(".$string."->".$field.",\$this->uikitComp);"; + $fieldUikit .= PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Make sure the content prepare plugins fire on ".$field."."; + $fieldUikit .= PHP_EOL."\t".$tab."\t".$string."->".$field." = JHtml::_('content.prepare',".$string."->".$field.");"; + $fieldUikit .= PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Checking if ".$field." has uikit components that must be loaded."; + $fieldUikit .= PHP_EOL."\t".$tab."\t\$this->uikitComp = ".$this->fileContentStatic['###Component###']."Helper::getUikitComp(".$string."->".$field.",\$this->uikitComp);"; } } return $fieldUikit; @@ -1399,8 +1399,8 @@ class Interpretation extends Fields if ($this->checkJoint($default,$get,$asBucket)) { // build custom join string - $otherJoin = "\n\t###TAB###\t//".$this->setLine(__LINE__)." set ".$default['valueName']." to the ###STRING### object."; - $otherJoin .= "\n\t###TAB###\t###STRING###->".$default['valueName']." = \$this->get".$default['methodName']."(###STRING###->".$this->getAsLookup[$get['key']][$get['on_field']].");"; + $otherJoin = PHP_EOL."\t###TAB###\t//".$this->setLine(__LINE__)." set ".$default['valueName']." to the ###STRING### object."; + $otherJoin .= PHP_EOL."\t###TAB###\t###STRING###->".$default['valueName']." = \$this->get".$default['methodName']."(###STRING###->".$this->getAsLookup[$get['key']][$get['on_field']].");"; // load to other join if (!isset($this->otherJoin[$this->target][$default['code']][$this->siteDynamicGet[$this->target][$default['code']][$default['as']][$default['join_field']]][$default['valueName']])) { @@ -1411,8 +1411,8 @@ class Interpretation extends Fields else { // build custom join string - $customJoin .= "\n\t".$tab."\t//".$this->setLine(__LINE__)." set ".$default['valueName']." to the ".$string." object."; - $customJoin .= "\n\t".$tab."\t".$string."->".$default['valueName']." = \$this->get".$default['methodName']."(".$string."->".$this->getAsLookup[$get['key']][$get['on_field']].");"; + $customJoin .= PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." set ".$default['valueName']." to the ".$string." object."; + $customJoin .= PHP_EOL."\t".$tab."\t".$string."->".$default['valueName']." = \$this->get".$default['methodName']."(".$string."->".$this->getAsLookup[$get['key']][$get['on_field']].");"; } } return $customJoin; @@ -1454,15 +1454,15 @@ class Interpretation extends Fields { case 1: // COM_COMPONENTBUILDER_DYNAMIC_GET_ID - $string = "\n\t".$tab."\t\$query->where('".$ter['table_key'] . " " . $ter['operator'] . " ' . (int) \$pk);"; + $string = PHP_EOL."\t".$tab."\t\$query->where('".$ter['table_key'] . " " . $ter['operator'] . " ' . (int) \$pk);"; break; case 2: // COM_COMPONENTBUILDER_DYNAMIC_GET_USER - $string = "\n\t".$tab."\t\$query->where('".$ter['table_key'] . " " . $ter['operator'] . " ' . (int) \$this->userId);"; + $string = PHP_EOL."\t".$tab."\t\$query->where('".$ter['table_key'] . " " . $ter['operator'] . " ' . (int) \$this->userId);"; break; case 3: // COM_COMPONENTBUILDER_DYNAMIC_GET_ACCESS_LEVEL - $string = "\n\t".$tab."\t\$query->where('".$ter['table_key'] . " " . $ter['operator'] . " (' . implode(',', \$this->levels) . ')');"; + $string = PHP_EOL."\t".$tab."\t\$query->where('".$ter['table_key'] . " " . $ter['operator'] . " (' . implode(',', \$this->levels) . ')');"; break; case 4: // COM_COMPONENTBUILDER_DYNAMIC_GET_USER_GROUPS @@ -1474,7 +1474,7 @@ class Interpretation extends Fields } else { - $string = "\n\t".$tab."\t\$query->where('".$ter['table_key'] . " " . $ter['operator'] . " (' . implode(',', \$this->groups) . ')');"; + $string = PHP_EOL."\t".$tab."\t\$query->where('".$ter['table_key'] . " " . $ter['operator'] . " (' . implode(',', \$this->groups) . ')');"; } break; case 5: @@ -1493,33 +1493,33 @@ class Interpretation extends Fields // COM_COMPONENTBUILDER_DYNAMIC_GET_FUNCTIONVAR if ($ter['operator'] === 'IN' || $ter['operator'] === 'NOT IN') { - $string = "\n\t\t".$tab."//".$this->setLine(__LINE__)." Check if " . $ter['state_key'] . " is an array with values."; - $string .= "\n\t\t".$tab."\$array = " . $ter['state_key'].";"; - $string .= "\n\t\t".$tab."if (isset(\$array) && ".$this->fileContentStatic['###Component###']."Helper::checkArray(\$array))"; - $string .= "\n\t\t".$tab."{"; - $string .= "\n\t\t".$tab."\t\$query->where('".$ter['table_key'] . " " . $ter['operator'] . " (' . implode(',', \$array) . ')');"; - $string .= "\n\t\t".$tab."}"; - $string .= "\n\t\t".$tab."else"; - $string .= "\n\t\t".$tab."{"; - $string .= "\n\t\t".$tab."\treturn false;"; - $string .= "\n\t\t".$tab."}"; + $string = PHP_EOL."\t\t".$tab."//".$this->setLine(__LINE__)." Check if " . $ter['state_key'] . " is an array with values."; + $string .= PHP_EOL."\t\t".$tab."\$array = " . $ter['state_key'].";"; + $string .= PHP_EOL."\t\t".$tab."if (isset(\$array) && ".$this->fileContentStatic['###Component###']."Helper::checkArray(\$array))"; + $string .= PHP_EOL."\t\t".$tab."{"; + $string .= PHP_EOL."\t\t".$tab."\t\$query->where('".$ter['table_key'] . " " . $ter['operator'] . " (' . implode(',', \$array) . ')');"; + $string .= PHP_EOL."\t\t".$tab."}"; + $string .= PHP_EOL."\t\t".$tab."else"; + $string .= PHP_EOL."\t\t".$tab."{"; + $string .= PHP_EOL."\t\t".$tab."\treturn false;"; + $string .= PHP_EOL."\t\t".$tab."}"; } else { - $string = "\n\t\t".$tab."//".$this->setLine(__LINE__)." Check if " . $ter['state_key'] . " is a string or numeric value."; - $string .= "\n\t\t".$tab."\$checkValue = " . $ter['state_key'].";"; - $string .= "\n\t\t".$tab."if (isset(\$checkValue) && ".$this->fileContentStatic['###Component###']."Helper::checkString(\$checkValue))"; - $string .= "\n\t\t".$tab."{"; - $string .= "\n\t\t".$tab."\t\$query->where('".$ter['table_key'] . " " . $ter['operator'] . " ' . \$db->quote(\$checkValue));"; - $string .= "\n\t\t".$tab."}"; - $string .= "\n\t\t".$tab."elseif (is_numeric(\$checkValue))"; - $string .= "\n\t\t".$tab."{"; - $string .= "\n\t\t".$tab."\t\$query->where('".$ter['table_key'] . " " . $ter['operator'] . " ' . \$checkValue);"; - $string .= "\n\t\t".$tab."}"; - $string .= "\n\t\t".$tab."else"; - $string .= "\n\t\t".$tab."{"; - $string .= "\n\t\t".$tab."\treturn false;"; - $string .= "\n\t\t".$tab."}"; + $string = PHP_EOL."\t\t".$tab."//".$this->setLine(__LINE__)." Check if " . $ter['state_key'] . " is a string or numeric value."; + $string .= PHP_EOL."\t\t".$tab."\$checkValue = " . $ter['state_key'].";"; + $string .= PHP_EOL."\t\t".$tab."if (isset(\$checkValue) && ".$this->fileContentStatic['###Component###']."Helper::checkString(\$checkValue))"; + $string .= PHP_EOL."\t\t".$tab."{"; + $string .= PHP_EOL."\t\t".$tab."\t\$query->where('".$ter['table_key'] . " " . $ter['operator'] . " ' . \$db->quote(\$checkValue));"; + $string .= PHP_EOL."\t\t".$tab."}"; + $string .= PHP_EOL."\t\t".$tab."elseif (is_numeric(\$checkValue))"; + $string .= PHP_EOL."\t\t".$tab."{"; + $string .= PHP_EOL."\t\t".$tab."\t\$query->where('".$ter['table_key'] . " " . $ter['operator'] . " ' . \$checkValue);"; + $string .= PHP_EOL."\t\t".$tab."}"; + $string .= PHP_EOL."\t\t".$tab."else"; + $string .= PHP_EOL."\t\t".$tab."{"; + $string .= PHP_EOL."\t\t".$tab."\treturn false;"; + $string .= PHP_EOL."\t\t".$tab."}"; } break; case 9: @@ -1542,7 +1542,7 @@ class Interpretation extends Fields list($dump,$as) = array_map('trim', explode('(',$as)); $field = trim(str_replace(')', '', $field)); } - $string = "\n\t".$tab."\t\$query->where('".$ter['table_key'] . " " . $ter['operator'] . " ". $ter['state_key']."');"; + $string = PHP_EOL."\t".$tab."\t\$query->where('".$ter['table_key'] . " " . $ter['operator'] . " ". $ter['state_key']."');"; break; } // only add if the filter is set @@ -1577,11 +1577,11 @@ class Interpretation extends Fields // sort where if ($as === 'a' || (isset($this->siteMainGet[$this->target][$code][$as]) && ComponentbuilderHelper::checkString($this->siteMainGet[$this->target][$code][$as]))) { - $ordering .= "\n\t".$tab."\t".$string; + $ordering .= PHP_EOL."\t".$tab."\t".$string; } else { - $this->otherOrder[$this->target][$code][$as][$field] = "\n\t\t".$string; + $this->otherOrder[$this->target][$code][$as][$field] = PHP_EOL."\t\t".$string; } } } @@ -1631,13 +1631,13 @@ class Interpretation extends Fields $tabe = $tab; } $string = "if (isset(" . $whe['value_key']. ") && ".$this->fileContentStatic['###Component###']."Helper::checkArray(" . $whe['value_key']. "))"; - $string .= "\n\t".$tabe."\t{"; - $string .= "\n\t".$tabe."\t\t\$query->where('".$whe['table_key']." ".$whe['operator'].$value; - $string .= "\n\t".$tabe."\t}"; - $string .= "\n\t".$tabe."\telse"; - $string .= "\n\t".$tabe."\t{"; - $string .= "\n\t".$tabe."\t\treturn false;"; - $string .= "\n\t".$tabe."\t}"; + $string .= PHP_EOL."\t".$tabe."\t{"; + $string .= PHP_EOL."\t".$tabe."\t\t\$query->where('".$whe['table_key']." ".$whe['operator'].$value; + $string .= PHP_EOL."\t".$tabe."\t}"; + $string .= PHP_EOL."\t".$tabe."\telse"; + $string .= PHP_EOL."\t".$tabe."\t{"; + $string .= PHP_EOL."\t".$tabe."\t\treturn false;"; + $string .= PHP_EOL."\t".$tabe."\t}"; } else @@ -1647,11 +1647,11 @@ class Interpretation extends Fields // sort where if ($as === 'a' || (isset($this->siteMainGet[$this->target][$code][$as]) && ComponentbuilderHelper::checkString($this->siteMainGet[$this->target][$code][$as]))) { - $wheres .= "\n\t".$tab."\t".$string; + $wheres .= PHP_EOL."\t".$tab."\t".$string; } elseif ($as !== 'a') { - $this->otherWhere[$this->target][$code][$as][$field] = "\n\t\t".$string; + $this->otherWhere[$this->target][$code][$as][$field] = PHP_EOL."\t\t".$string; } } } @@ -1683,7 +1683,7 @@ class Interpretation extends Fields // only add if the filter is set if (ComponentbuilderHelper::checkString($value)) { - $globals .= "\n\t".$tab."\t//".$this->setLine(__LINE__)." set the global " . $glo['name'] . " value.\n\t".$tab."\t".$value; + $globals .= PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." set the global " . $glo['name'] . " value.".PHP_EOL."\t".$tab."\t".$value; } } } @@ -1737,7 +1737,7 @@ class Interpretation extends Fields $redirectMessage = "\t\t\t//".$this->setLine(__LINE__)." redirect away to the home page if no access allowed."; $redirectString = 'JURI::root()'; } - $accessCheck[] = "\n\t\t//".$this->setLine(__LINE__)." check if this user has permission to access item"; + $accessCheck[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." check if this user has permission to access item"; $accessCheck[] = "\t\tif (!".$userString."->authorise('site.".$view['settings']->code.".access', 'com_".$this->fileContentStatic['###component###']."'))"; $accessCheck[] = "\t\t{"; $accessCheck[] = "\t\t\t\$app = JFactory::getApplication();"; @@ -1754,7 +1754,7 @@ class Interpretation extends Fields $accessCheck[] = "\t\t}"; // return the access check - return implode("\n",$accessCheck); + return implode(PHP_EOL,$accessCheck); } return ''; } @@ -1773,10 +1773,10 @@ class Interpretation extends Fields $this->siteDecrypt['basic'][$code] = false; $this->siteDecrypt['advanced'][$code] = false; - $getItem = "\n\t".$tab."\t//".$this->setLine(__LINE__)." Get a db connection."; - $getItem .= "\n\t".$tab."\t\$db = JFactory::getDbo();"; - $getItem .= "\n\n".$tab."\t\t//".$this->setLine(__LINE__)." Create a new query object."; - $getItem .= "\n\t".$tab."\t\$query = \$db->getQuery(true);"; + $getItem = PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get a db connection."; + $getItem .= PHP_EOL."\t".$tab."\t\$db = JFactory::getDbo();"; + $getItem .= PHP_EOL.PHP_EOL.$tab."\t\t//".$this->setLine(__LINE__)." Create a new query object."; + $getItem .= PHP_EOL."\t".$tab."\t\$query = \$db->getQuery(true);"; // set main get query $getItem .= $this->setCustomViewQuery($get->main_get,$code,$tab); // setup filters @@ -1786,22 +1786,22 @@ class Interpretation extends Fields // setup ordering $getItem .= $this->setCustomViewOrder($get->order,$code,$tab); // get ready to get query - $getItem .= "\n\n".$tab."\t\t//".$this->setLine(__LINE__)." Reset the query using our newly populated query object."; - $getItem .= "\n\t".$tab."\t\$db->setQuery(\$query);"; - $getItem .= "\n\t".$tab."\t//".$this->setLine(__LINE__)." Load the results as a stdClass object."; - $getItem .= "\n\t".$tab."\t\$data = \$db->loadObject();"; - $getItem .= "\n\n".$tab."\t\tif (empty(\$data))"; - $getItem .= "\n\t".$tab."\t{"; + $getItem .= PHP_EOL.PHP_EOL.$tab."\t\t//".$this->setLine(__LINE__)." Reset the query using our newly populated query object."; + $getItem .= PHP_EOL."\t".$tab."\t\$db->setQuery(\$query);"; + $getItem .= PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Load the results as a stdClass object."; + $getItem .= PHP_EOL."\t".$tab."\t\$data = \$db->loadObject();"; + $getItem .= PHP_EOL.PHP_EOL.$tab."\t\tif (empty(\$data))"; + $getItem .= PHP_EOL."\t".$tab."\t{"; if ($type === 'main') { - $getItem .= "\n\t".$tab."\t\t\$app = JFactory::getApplication();"; + $getItem .= PHP_EOL."\t".$tab."\t\t\$app = JFactory::getApplication();"; $langKeyWord = $this->langPrefix.'_'.ComponentbuilderHelper::safeString('Not found or access denied','U'); if (!isset($this->langContent[$this->lang][$langKeyWord])) { $this->langContent[$this->lang][$langKeyWord] = 'Not found, or access denied.'; } - $getItem .= "\n\t".$tab."\t\t//".$this->setLine(__LINE__)." If no data is found redirect to default page and show warning."; - $getItem .= "\n\t".$tab."\t\t\$app->enqueueMessage(JText::_('".$langKeyWord."'), 'warning');"; + $getItem .= PHP_EOL."\t".$tab."\t\t//".$this->setLine(__LINE__)." If no data is found redirect to default page and show warning."; + $getItem .= PHP_EOL."\t".$tab."\t\t\$app->enqueueMessage(JText::_('".$langKeyWord."'), 'warning');"; if ('site' === $this->target) { // check that the default and the redirect page is not the same @@ -1813,19 +1813,19 @@ class Interpretation extends Fields { $redirectString = 'JURI::root()'; } - $getItem .= "\n\t".$tab."\t\t\$app->redirect(".$redirectString.");"; + $getItem .= PHP_EOL."\t".$tab."\t\t\$app->redirect(".$redirectString.");"; } else { - $getItem .= "\n\t".$tab."\t\t\$app->redirect('index.php?option=com_".$this->fileContentStatic['###component###']."');"; + $getItem .= PHP_EOL."\t".$tab."\t\t\$app->redirect('index.php?option=com_".$this->fileContentStatic['###component###']."');"; } - $getItem .= "\n\t".$tab."\t\treturn false;"; + $getItem .= PHP_EOL."\t".$tab."\t\treturn false;"; } else { - $getItem .= "\n\t".$tab."\t\treturn false;"; + $getItem .= PHP_EOL."\t".$tab."\t\treturn false;"; } - $getItem .= "\n\t".$tab."\t}"; + $getItem .= PHP_EOL."\t".$tab."\t}"; if (ComponentbuilderHelper::checkArray($get->main_get)) { $asBucket = array(); @@ -1870,17 +1870,17 @@ class Interpretation extends Fields $script = ''; if (isset($this->siteDecrypt['basic'][$code]) && $this->siteDecrypt['basic'][$code]) { - $script .= "\n\n\t".$tab."\t//".$this->setLine(__LINE__)." Get the basic encription."; - $script .= "\n\t".$tab."\t\$basickey = ".$Component."Helper::getCryptKey('basic');"; - $script .= "\n\t".$tab."\t//".$this->setLine(__LINE__)." Get the encription object."; - $script .= "\n\t".$tab."\t\$basic = new FOFEncryptAes(\$basickey, 128);"; + $script .= PHP_EOL.PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get the basic encription."; + $script .= PHP_EOL."\t".$tab."\t\$basickey = ".$Component."Helper::getCryptKey('basic');"; + $script .= PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get the encription object."; + $script .= PHP_EOL."\t".$tab."\t\$basic = new FOFEncryptAes(\$basickey, 128);"; } if (isset($this->siteDecrypt['advanced'][$code]) && $this->siteDecrypt['advanced'][$code]) { - $script .= "\n\n\t".$tab."\t//".$this->setLine(__LINE__)." Get the advanced encription."; - $script .= "\n\t".$tab."\t\$advancedkey = ".$Component."Helper::getCryptKey('advanced');"; - $script .= "\n\t".$tab."\t//".$this->setLine(__LINE__)." Get the encription object."; - $script .= "\n\t".$tab."\t\$advanced = new FOFEncryptAes(\$advancedkey, 256);"; + $script .= PHP_EOL.PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get the advanced encription."; + $script .= PHP_EOL."\t".$tab."\t\$advancedkey = ".$Component."Helper::getCryptKey('advanced');"; + $script .= PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get the encription object."; + $script .= PHP_EOL."\t".$tab."\t\$advanced = new FOFEncryptAes(\$advancedkey, 256);"; } $getItem = $script . $getItem; } @@ -1891,24 +1891,24 @@ class Interpretation extends Fields // set calculations if ($get->addcalculation == 1) { - $get->php_calculation = (array) explode("\n",$get->php_calculation); - $getItem .= "\n\t".$tab."\t".implode("\n\t".$tab."\t",$get->php_calculation); + $get->php_calculation = (array) explode(PHP_EOL,$get->php_calculation); + $getItem .= PHP_EOL."\t".$tab."\t".implode(PHP_EOL."\t".$tab."\t",$get->php_calculation); } if ($type === 'custom') { // return the object - $getItem .= "\n\n\t".$tab."\t//".$this->setLine(__LINE__)." return data object."; - $getItem .= "\n\t".$tab."\treturn \$data;"; + $getItem .= PHP_EOL.PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." return data object."; + $getItem .= PHP_EOL."\t".$tab."\treturn \$data;"; } else { // set the object - $getItem .= "\n\n\t".$tab."\t//".$this->setLine(__LINE__)." set data object to item."; - $getItem .= "\n\t".$tab."\t\$this->_item[\$pk] = \$data;"; + $getItem .= PHP_EOL.PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." set data object to item."; + $getItem .= PHP_EOL."\t".$tab."\t\$this->_item[\$pk] = \$data;"; } return $getItem; } - return "\n\t".$tab."\t//".$this->setLine(__LINE__)."add your custom code here."; + return PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)."add your custom code here."; } public function setCustomViewCustomMethods($main_view,$code) @@ -1928,47 +1928,47 @@ class Interpretation extends Fields if ($view->gettype == 3) { // ###SITE_GET_ITEM### <<>> - $main .= "\n\n\t\tif (!isset(\$this->initSet) || !\$this->initSet)"; - $main .= "\n\t\t{"; - $main .= "\n\t\t\t\$this->user\t\t= JFactory::getUser();"; - $main .= "\n\t\t\t\$this->userId\t\t= \$this->user->get('id');"; - $main .= "\n\t\t\t\$this->guest\t\t= \$this->user->get('guest');"; - $main .= "\n\t\t\t\$this->groups\t\t= \$this->user->get('groups');"; - $main .= "\n\t\t\t\$this->authorisedGroups\t= \$this->user->getAuthorisedGroups();"; - $main .= "\n\t\t\t\$this->levels\t\t= \$this->user->getAuthorisedViewLevels();"; - $main .= "\n\t\t\t\$this->initSet\t\t= true;"; - $main .= "\n\t\t}"; + $main .= PHP_EOL.PHP_EOL."\t\tif (!isset(\$this->initSet) || !\$this->initSet)"; + $main .= PHP_EOL."\t\t{"; + $main .= PHP_EOL."\t\t\t\$this->user\t\t= JFactory::getUser();"; + $main .= PHP_EOL."\t\t\t\$this->userId\t\t= \$this->user->get('id');"; + $main .= PHP_EOL."\t\t\t\$this->guest\t\t= \$this->user->get('guest');"; + $main .= PHP_EOL."\t\t\t\$this->groups\t\t= \$this->user->get('groups');"; + $main .= PHP_EOL."\t\t\t\$this->authorisedGroups\t= \$this->user->getAuthorisedGroups();"; + $main .= PHP_EOL."\t\t\t\$this->levels\t\t= \$this->user->getAuthorisedViewLevels();"; + $main .= PHP_EOL."\t\t\t\$this->initSet\t\t= true;"; + $main .= PHP_EOL."\t\t}"; $main .= $this->setCustomViewGetItem($view, $view->code,'','custom'); $type = 'mixed item data object on success, false on failure.'; } elseif ($view->gettype == 4) { - $main .= "\n\n\t\tif (!isset(\$this->initSet) || !\$this->initSet)"; - $main .= "\n\t\t{"; - $main .= "\n\t\t\t\$this->user\t\t= JFactory::getUser();"; - $main .= "\n\t\t\t\$this->userId\t\t= \$this->user->get('id');"; - $main .= "\n\t\t\t\$this->guest\t\t= \$this->user->get('guest');"; - $main .= "\n\t\t\t\$this->groups\t\t= \$this->user->get('groups');"; - $main .= "\n\t\t\t\$this->authorisedGroups\t= \$this->user->getAuthorisedGroups();"; - $main .= "\n\t\t\t\$this->levels\t\t= \$this->user->getAuthorisedViewLevels();"; - $main .= "\n\t\t\t\$this->initSet\t\t= true;"; - $main .= "\n\t\t}"; - $main .= "\n\n\t\t//".$this->setLine(__LINE__)." Get the global params"; - $main .= "\n\t\t\$globalParams = JComponentHelper::getParams('com_".$this->fileContentStatic['###component###']."', true);"; + $main .= PHP_EOL.PHP_EOL."\t\tif (!isset(\$this->initSet) || !\$this->initSet)"; + $main .= PHP_EOL."\t\t{"; + $main .= PHP_EOL."\t\t\t\$this->user\t\t= JFactory::getUser();"; + $main .= PHP_EOL."\t\t\t\$this->userId\t\t= \$this->user->get('id');"; + $main .= PHP_EOL."\t\t\t\$this->guest\t\t= \$this->user->get('guest');"; + $main .= PHP_EOL."\t\t\t\$this->groups\t\t= \$this->user->get('groups');"; + $main .= PHP_EOL."\t\t\t\$this->authorisedGroups\t= \$this->user->getAuthorisedGroups();"; + $main .= PHP_EOL."\t\t\t\$this->levels\t\t= \$this->user->getAuthorisedViewLevels();"; + $main .= PHP_EOL."\t\t\t\$this->initSet\t\t= true;"; + $main .= PHP_EOL."\t\t}"; + $main .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the global params"; + $main .= PHP_EOL."\t\t\$globalParams = JComponentHelper::getParams('com_".$this->fileContentStatic['###component###']."', true);"; // ###SITE_GET_LIST_QUERY### <<>> $main .= $this->setCustomViewListQuery($view, $view->code, false); // load the object list - $main .= "\n\n\t\t//".$this->setLine(__LINE__)." Reset the query using our newly populated query object."; - $main .= "\n\t\t\$db->setQuery(\$query);"; - $main .= "\n\t\t\$items = \$db->loadObjectList();"; - $main .= "\n\n\t\tif (empty(\$items))"; - $main .= "\n\t\t{"; - $main .= "\n\t\t\treturn false;"; - $main .= "\n\t\t}"; + $main .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Reset the query using our newly populated query object."; + $main .= PHP_EOL."\t\t\$db->setQuery(\$query);"; + $main .= PHP_EOL."\t\t\$items = \$db->loadObjectList();"; + $main .= PHP_EOL.PHP_EOL."\t\tif (empty(\$items))"; + $main .= PHP_EOL."\t\t{"; + $main .= PHP_EOL."\t\t\treturn false;"; + $main .= PHP_EOL."\t\t}"; // ###SITE_GET_ITEMS### <<>> $main .= $this->setCustomViewGetItems($view,$view->code); - $main .= "\n\t\t//".$this->setLine(__LINE__)." return items"; - $main .= "\n\t\treturn \$items;"; + $main .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." return items"; + $main .= PHP_EOL."\t\treturn \$items;"; $type = 'mixed An array of objects on success, false on failure.'; } // load the main mehtod @@ -1989,7 +1989,7 @@ class Interpretation extends Fields { // build uikit get method $ukit = array(); - $ukit[] = "\n\n\t/**"; + $ukit[] = PHP_EOL.PHP_EOL."\t/**"; $ukit[] = "\t* \tUIKIT Component Classes"; $ukit[] = "\t**/"; $ukit[] = "\tpublic static \$uk_components = array("; @@ -2092,7 +2092,7 @@ class Interpretation extends Fields $ukit[] = "\t}"; // return the help methods - return implode("\n",$ukit); + return implode(PHP_EOL,$ukit); } return ''; } @@ -2103,20 +2103,20 @@ class Interpretation extends Fields if ($this->uikit) { // build uikit get method - $method .= "\n\n\t/**"; - $method .= "\n\t* Get the uikit needed components"; - $method .= "\n\t*"; - $method .= "\n\t* @return mixed An array of objects on success."; - $method .= "\n\t*"; - $method .= "\n\t*/"; - $method .= "\n\tpublic function getUikitComp()"; - $method .= "\n\t{"; - $method .= "\n\t\tif (isset(\$this->uikitComp) && ".$this->fileContentStatic['###Component###']."Helper::checkArray(\$this->uikitComp))"; - $method .= "\n\t\t{"; - $method .= "\n\t\t\treturn \$this->uikitComp;"; - $method .= "\n\t\t}"; - $method .= "\n\t\treturn false;"; - $method .= "\n\t}"; + $method .= PHP_EOL.PHP_EOL."\t/**"; + $method .= PHP_EOL."\t* Get the uikit needed components"; + $method .= PHP_EOL."\t*"; + $method .= PHP_EOL."\t* @return mixed An array of objects on success."; + $method .= PHP_EOL."\t*"; + $method .= PHP_EOL."\t*/"; + $method .= PHP_EOL."\tpublic function getUikitComp()"; + $method .= PHP_EOL."\t{"; + $method .= PHP_EOL."\t\tif (isset(\$this->uikitComp) && ".$this->fileContentStatic['###Component###']."Helper::checkArray(\$this->uikitComp))"; + $method .= PHP_EOL."\t\t{"; + $method .= PHP_EOL."\t\t\treturn \$this->uikitComp;"; + $method .= PHP_EOL."\t\t}"; + $method .= PHP_EOL."\t\treturn false;"; + $method .= PHP_EOL."\t}"; } return $method; } @@ -2127,15 +2127,15 @@ class Interpretation extends Fields if (ComponentbuilderHelper::checkString($body)) { // build custom method - $method .= "\n\n\t/**"; - $method .= "\n\t* Custom Method"; - $method .= "\n\t*"; - $method .= "\n\t* @return ".$type; - $method .= "\n\t*"; - $method .= "\n\t*/"; - $method .= "\n\tpublic function ".$nAme."()"; - $method .= "\n\t{".$body; - $method .= "\n\t}"; + $method .= PHP_EOL.PHP_EOL."\t/**"; + $method .= PHP_EOL."\t* Custom Method"; + $method .= PHP_EOL."\t*"; + $method .= PHP_EOL."\t* @return ".$type; + $method .= PHP_EOL."\t*"; + $method .= PHP_EOL."\t*/"; + $method .= PHP_EOL."\tpublic function ".$nAme."()"; + $method .= PHP_EOL."\t{".$body; + $method .= PHP_EOL."\t}"; } return $method; } @@ -2155,38 +2155,38 @@ class Interpretation extends Fields // set the method defaults $default = $this->setCustomViewMethodDefaults($get,$code); // build custom method - $methods .= "\n\n\t/**"; - $methods .= "\n\t* Method to get an array of ".$default['name']." Objects."; - $methods .= "\n\t*"; - $methods .= "\n\t* @return mixed An array of ".$default['name']." Objects on success, false on failure."; - $methods .= "\n\t*"; - $methods .= "\n\t*/"; - $methods .= "\n\tpublic function get".$default['methodName']."(\$".$default['on_field'].")"; - $methods .= "\n\t{###CRYPT###"; - $methods .= "\n\t\t//".$this->setLine(__LINE__)." Get a db connection."; - $methods .= "\n\t\t\$db = JFactory::getDbo();"; - $methods .= "\n\n\t\t//".$this->setLine(__LINE__)." Create a new query object."; - $methods .= "\n\t\t\$query = \$db->getQuery(true);"; - $methods .= "\n\n\t\t//".$this->setLine(__LINE__)." Get from ".$get['selection']['table']." as ".$default['as']; - $methods .= "\n\t\t".$get['selection']['select']; - $methods .= "\n\t\t".'$query->from('.$get['selection']['from'].');'; + $methods .= PHP_EOL.PHP_EOL."\t/**"; + $methods .= PHP_EOL."\t* Method to get an array of ".$default['name']." Objects."; + $methods .= PHP_EOL."\t*"; + $methods .= PHP_EOL."\t* @return mixed An array of ".$default['name']." Objects on success, false on failure."; + $methods .= PHP_EOL."\t*"; + $methods .= PHP_EOL."\t*/"; + $methods .= PHP_EOL."\tpublic function get".$default['methodName']."(\$".$default['on_field'].")"; + $methods .= PHP_EOL."\t{###CRYPT###"; + $methods .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get a db connection."; + $methods .= PHP_EOL."\t\t\$db = JFactory::getDbo();"; + $methods .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Create a new query object."; + $methods .= PHP_EOL."\t\t\$query = \$db->getQuery(true);"; + $methods .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get from ".$get['selection']['table']." as ".$default['as']; + $methods .= PHP_EOL."\t\t".$get['selection']['select']; + $methods .= PHP_EOL."\t\t".'$query->from('.$get['selection']['from'].');'; // set the string if ($get['operator'] === 'IN' || $get['operator'] === 'NOT IN') { - $methods .= "\n\n\t\t//".$this->setLine(__LINE__)." Check if \$" . $default['on_field'] . " is an array with values."; - $methods .= "\n\t\t\$array = \$" . $default['on_field'] . ";"; - $methods .= "\n\t\tif (isset(\$array) && ".$this->fileContentStatic['###Component###']."Helper::checkArray(\$array, true))"; - $methods .= "\n\t\t{"; - $methods .= "\n\t\t\t\$query->where('".$get['join_field']." ".$get['operator']." (' . implode(',', \$array) . ')');"; - $methods .= "\n\t\t}"; - $methods .= "\n\t\telse"; - $methods .= "\n\t\t{"; - $methods .= "\n\t\t\treturn false;"; - $methods .= "\n\t\t}"; + $methods .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Check if \$" . $default['on_field'] . " is an array with values."; + $methods .= PHP_EOL."\t\t\$array = \$" . $default['on_field'] . ";"; + $methods .= PHP_EOL."\t\tif (isset(\$array) && ".$this->fileContentStatic['###Component###']."Helper::checkArray(\$array, true))"; + $methods .= PHP_EOL."\t\t{"; + $methods .= PHP_EOL."\t\t\t\$query->where('".$get['join_field']." ".$get['operator']." (' . implode(',', \$array) . ')');"; + $methods .= PHP_EOL."\t\t}"; + $methods .= PHP_EOL."\t\telse"; + $methods .= PHP_EOL."\t\t{"; + $methods .= PHP_EOL."\t\t\treturn false;"; + $methods .= PHP_EOL."\t\t}"; } else { - $methods .= "\n\t\t\$query->where('".$get['join_field']." ".$get['operator']." ' . \$db->quote(\$".$default['on_field']."));"; + $methods .= PHP_EOL."\t\t\$query->where('".$get['join_field']." ".$get['operator']." ' . \$db->quote(\$".$default['on_field']."));"; } // check if other queries should be loaded $queryChecker = (isset($this->otherQuery[$this->target][$default['code']][$default['as']]) && ComponentbuilderHelper::checkArray($this->otherQuery[$this->target][$default['code']][$default['as']])) ? $this->otherQuery[$this->target][$default['code']][$default['as']] : ''; @@ -2221,12 +2221,12 @@ class Interpretation extends Fields $methods .= $string; } } - $methods .= "\n\n\t\t//".$this->setLine(__LINE__)." Reset the query using our newly populated query object."; - $methods .= "\n\t\t\$db->setQuery(\$query);"; - $methods .= "\n\t\t\$db->execute();"; - $methods .= "\n\n\t\t//".$this->setLine(__LINE__)." check if there was data returned"; - $methods .= "\n\t\tif (\$db->getNumRows())"; - $methods .= "\n\t\t{"; + $methods .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Reset the query using our newly populated query object."; + $methods .= PHP_EOL."\t\t\$db->setQuery(\$query);"; + $methods .= PHP_EOL."\t\t\$db->execute();"; + $methods .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." check if there was data returned"; + $methods .= PHP_EOL."\t\tif (\$db->getNumRows())"; + $methods .= PHP_EOL."\t\t{"; // set decoding of needed fields if (isset($this->siteFieldData['decode'][$default['code']][$get['key']][$default['as']])) { @@ -2276,10 +2276,10 @@ class Interpretation extends Fields } if (ComponentbuilderHelper::checkString($decoder) || ComponentbuilderHelper::checkString($uikit) || ComponentbuilderHelper::checkString($decoder_filter) || ComponentbuilderHelper::checkString($joine)) { - $methods .= "\n\t\t\t\$items = \$db->loadObjectList();"; - $methods .= "\n\n\t\t\t//".$this->setLine(__LINE__)." Convert the parameter fields into objects."; - $methods .= "\n\t\t\tforeach (\$items as \$nr => &\$item)"; - $methods .= "\n\t\t\t{"; + $methods .= PHP_EOL."\t\t\t\$items = \$db->loadObjectList();"; + $methods .= PHP_EOL.PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Convert the parameter fields into objects."; + $methods .= PHP_EOL."\t\t\tforeach (\$items as \$nr => &\$item)"; + $methods .= PHP_EOL."\t\t\t{"; if (ComponentbuilderHelper::checkString($decoder)) { $methods .= $decoder; @@ -2296,21 +2296,21 @@ class Interpretation extends Fields { $methods .= $joine; } - $methods .= "\n\t\t\t}"; - $methods .= "\n\t\t\treturn \$items;"; + $methods .= PHP_EOL."\t\t\t}"; + $methods .= PHP_EOL."\t\t\treturn \$items;"; } else { - $methods .= "\n\t\t\treturn \$db->loadObjectList();"; + $methods .= PHP_EOL."\t\t\treturn \$db->loadObjectList();"; } } else { - $methods .= "\n\t\t\treturn \$db->loadObjectList();"; + $methods .= PHP_EOL."\t\t\treturn \$db->loadObjectList();"; } - $methods .= "\n\t\t}"; - $methods .= "\n\t\treturn false;"; - $methods .= "\n\t}"; + $methods .= PHP_EOL."\t\t}"; + $methods .= PHP_EOL."\t\treturn false;"; + $methods .= PHP_EOL."\t}"; if ((isset($this->siteDecrypt['basic'][$code]) && $this->siteDecrypt['basic'][$code]) || (isset($this->siteDecrypt['advanced'][$code]) && $this->siteDecrypt['advanced'][$code])) { @@ -2318,17 +2318,17 @@ class Interpretation extends Fields $script = ''; if ($this->siteDecrypt['basic'][$code]) { - $script .= "\n\t\t//".$this->setLine(__LINE__)." Get the basic encription."; - $script .= "\n\t\t\$basickey = ".$Component."Helper::getCryptKey('basic');"; - $script .= "\n\t\t//".$this->setLine(__LINE__)." Get the encription object."; - $script .= "\n\t\t\$basic = new FOFEncryptAes(\$basickey, 128);\n"; + $script .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the basic encription."; + $script .= PHP_EOL."\t\t\$basickey = ".$Component."Helper::getCryptKey('basic');"; + $script .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the encription object."; + $script .= PHP_EOL."\t\t\$basic = new FOFEncryptAes(\$basickey, 128);".PHP_EOL; } if ($this->siteDecrypt['advanced'][$code]) { - $script .= "\n\t\t//".$this->setLine(__LINE__)." Get the advanced encription."; - $script .= "\n\t\t\$advancedkey = ".$Component."Helper::getCryptKey('advanced');"; - $script .= "\n\t\t//".$this->setLine(__LINE__)." Get the encription object."; - $script .= "\n\t\t\$advanced = new FOFEncryptAes(\$advancedkey, 256);\n"; + $script .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the advanced encription."; + $script .= PHP_EOL."\t\t\$advancedkey = ".$Component."Helper::getCryptKey('advanced');"; + $script .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the encription object."; + $script .= PHP_EOL."\t\t\$advanced = new FOFEncryptAes(\$advancedkey, 256);".PHP_EOL; } $methods = str_replace('###CRYPT###',$script,$methods); } @@ -2336,7 +2336,7 @@ class Interpretation extends Fields $methods = str_replace('###CRYPT###','',$methods); } } - return $methods."\n"; + return $methods.PHP_EOL; } public function setCustomViewMethodDefaults($get,$code) @@ -2387,19 +2387,19 @@ class Interpretation extends Fields { if ($get->pagination == 1) { - $getItem = "\n\t\t//".$this->setLine(__LINE__)." Get a db connection."; + $getItem = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get a db connection."; } else { - $getItem = "\n\t\t//".$this->setLine(__LINE__)." Make sure all records load, since no pagination allowed."; - $getItem .= "\n\t\t\$this->setState('list.limit', 0);"; - $getItem .= "\n\t\t//".$this->setLine(__LINE__)." Get a db connection."; + $getItem = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Make sure all records load, since no pagination allowed."; + $getItem .= PHP_EOL."\t\t\$this->setState('list.limit', 0);"; + $getItem .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get a db connection."; } - $getItem .= "\n\t\t\$db = JFactory::getDbo();"; - $getItem .= "\n\n\t\t//".$this->setLine(__LINE__)." Create a new query object."; - $getItem .= "\n\t\t\$query = \$db->getQuery(true);"; + $getItem .= PHP_EOL."\t\t\$db = JFactory::getDbo();"; + $getItem .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Create a new query object."; + $getItem .= PHP_EOL."\t\t\$query = \$db->getQuery(true);"; // check if there is any custom script - $getItem .= $this->getCustomScriptBuilder($this->target.'_php_getlistquery', $code, '', "\n\n\t\t//".$this->setLine(__LINE__)." Filtering.", true); + $getItem .= $this->getCustomScriptBuilder($this->target.'_php_getlistquery', $code, '', PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Filtering.", true); // set main get query $getItem .= $this->setCustomViewQuery($get->main_get,$code); // setup filters @@ -2411,12 +2411,12 @@ class Interpretation extends Fields if ($return) { // return the query object - $getItem .= "\n\n\t\t//".$this->setLine(__LINE__)." return the query object\n\t\treturn \$query;"; + $getItem .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." return the query object".PHP_EOL."\t\treturn \$query;"; } return $getItem; } - return "\n\t\t//".$this->setLine(__LINE__)."add your custom code here."; + return PHP_EOL."\t\t//".$this->setLine(__LINE__)."add your custom code here."; } /** @@ -2432,13 +2432,13 @@ class Interpretation extends Fields $Component = $this->fileContentStatic['###Component###']; if (ComponentbuilderHelper::checkObject($get)) { - $getItem .= "\n\n\t\t//".$this->setLine(__LINE__)." Convert the parameter fields into objects."; - $getItem .= "\n\t\tif (".$Component."Helper::checkArray(\$items))"; - $getItem .= "\n\t\t{"; - $getItem .= "\n\t\t\tforeach (\$items as \$nr => &\$item)"; - $getItem .= "\n\t\t\t{"; - $getItem .= "\n\t\t\t\t//".$this->setLine(__LINE__)." Always create a slug for sef URL's"; - $getItem .= "\n\t\t\t\t\$item->slug = (isset(\$item->alias) && isset(\$item->id)) ? \$item->id.':'.\$item->alias : \$item->id;"; + $getItem .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Convert the parameter fields into objects."; + $getItem .= PHP_EOL."\t\tif (".$Component."Helper::checkArray(\$items))"; + $getItem .= PHP_EOL."\t\t{"; + $getItem .= PHP_EOL."\t\t\tforeach (\$items as \$nr => &\$item)"; + $getItem .= PHP_EOL."\t\t\t{"; + $getItem .= PHP_EOL."\t\t\t\t//".$this->setLine(__LINE__)." Always create a slug for sef URL's"; + $getItem .= PHP_EOL."\t\t\t\t\$item->slug = (isset(\$item->alias) && isset(\$item->id)) ? \$item->id.':'.\$item->alias : \$item->id;"; if (isset($get->main_get) && ComponentbuilderHelper::checkArray($get->main_get)) { $asBucket = array(); @@ -2481,18 +2481,18 @@ class Interpretation extends Fields // set calculations if ($get->addcalculation == 1) { - $get->php_calculation = (array) explode("\n",$get->php_calculation); + $get->php_calculation = (array) explode(PHP_EOL,$get->php_calculation); if (ComponentbuilderHelper::checkArray($get->php_calculation)) { - $getItem .= str_replace(array_keys($this->placeholders),array_values($this->placeholders),"\n\t\t\t\t".implode("\n\t\t\t\t",$get->php_calculation)); + $getItem .= str_replace(array_keys($this->placeholders),array_values($this->placeholders),PHP_EOL."\t\t\t\t".implode(PHP_EOL."\t\t\t\t",$get->php_calculation)); } } - $getItem .= "\n\t\t\t}"; - $getItem .= "\n\t\t}"; + $getItem .= PHP_EOL."\t\t\t}"; + $getItem .= PHP_EOL."\t\t}"; // remove empty foreach if (strlen($getItem) <= 100) { - $getItem = "\n"; + $getItem = PHP_EOL; } } @@ -2501,17 +2501,17 @@ class Interpretation extends Fields $script = ''; if ($this->siteDecrypt['basic'][$code]) { - $script .= "\n\n\t\t//".$this->setLine(__LINE__)." Get the basic encription."; - $script .= "\n\t\t\$basickey = ".$Component."Helper::getCryptKey('basic');"; - $script .= "\n\t\t//".$this->setLine(__LINE__)." Get the encription object."; - $script .= "\n\t\t\$basic = new FOFEncryptAes(\$basickey, 128);"; + $script .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the basic encription."; + $script .= PHP_EOL."\t\t\$basickey = ".$Component."Helper::getCryptKey('basic');"; + $script .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the encription object."; + $script .= PHP_EOL."\t\t\$basic = new FOFEncryptAes(\$basickey, 128);"; } if ($this->siteDecrypt['advanced'][$code]) { - $script .= "\n\n\t\t//".$this->setLine(__LINE__)." Get the advanced encription."; - $script .= "\n\t\t\$advancedkey = ".$Component."Helper::getCryptKey('advanced');"; - $script .= "\n\t\t//".$this->setLine(__LINE__)." Get the encription object."; - $script .= "\n\t\t\$advanced = new FOFEncryptAes(\$advancedkey, 256);"; + $script .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the advanced encription."; + $script .= PHP_EOL."\t\t\$advancedkey = ".$Component."Helper::getCryptKey('advanced');"; + $script .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the encription object."; + $script .= PHP_EOL."\t\t\$advanced = new FOFEncryptAes(\$advancedkey, 256);"; } $getItem = $script . $getItem; } @@ -2526,24 +2526,24 @@ class Interpretation extends Fields if ($view['settings']->main_get->gettype == 1) { // for single views - $method .= "\n\t\t//".$this->setLine(__LINE__)." Initialise variables."; - $method .= "\n\t\t\$this->item\t= \$this->get('Item');"; + $method .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Initialise variables."; + $method .= PHP_EOL."\t\t\$this->item\t= \$this->get('Item');"; } elseif ($view['settings']->main_get->gettype == 2) { // for list views - $method .= "\n\t\t//".$this->setLine(__LINE__)." Initialise variables."; - $method .= "\n\t\t\$this->items\t= \$this->get('Items');"; + $method .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Initialise variables."; + $method .= PHP_EOL."\t\t\$this->items\t= \$this->get('Items');"; // only add if pagination is requered if ($view['settings']->main_get->pagination == 1) { - $method .= "\n\t\t\$this->pagination\t= \$this->get('Pagination');"; + $method .= PHP_EOL."\t\t\$this->pagination\t= \$this->get('Pagination');"; } // add id to list view if (isset($this->customAdminViewListId[$view['settings']->code])) { // ###HIDDEN_INPUT_VALUES### - $this->fileContentDynamic[$view['settings']->code]['###HIDDEN_INPUT_VALUES###'] = "\n\t".''; + $this->fileContentDynamic[$view['settings']->code]['###HIDDEN_INPUT_VALUES###'] = PHP_EOL."\t".''; } else { @@ -2557,44 +2557,44 @@ class Interpretation extends Fields foreach ($view['settings']->custom_get as $custom_get) { $custom_get_name = str_replace('get','',$custom_get->getcustom); - $method .= "\n\t\t\$this->".ComponentbuilderHelper::safeString($custom_get_name)."\t= \$this->get('".$custom_get_name."');"; + $method .= PHP_EOL."\t\t\$this->".ComponentbuilderHelper::safeString($custom_get_name)."\t= \$this->get('".$custom_get_name."');"; } } - $method .= "\n\n\t\t//".$this->setLine(__LINE__)." Check for errors."; - $method .= "\n\t\tif (count(\$errors = \$this->get('Errors')))"; - $method .= "\n\t\t{"; - $method .= "\n\t\t\tJError::raiseError(500, ".'implode("\n", $errors));'; - $method .= "\n\t\t\treturn false;"; - $method .= "\n\t\t}"; + $method .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Check for errors."; + $method .= PHP_EOL."\t\tif (count(\$errors = \$this->get('Errors')))"; + $method .= PHP_EOL."\t\t{"; + $method .= PHP_EOL."\t\t\tJError::raiseError(500, ".'implode(PHP_EOL, $errors));'; + $method .= PHP_EOL."\t\t\treturn false;"; + $method .= PHP_EOL."\t\t}"; // add custom script if ($view['settings']->add_php_jview_display == 1) { - $view['settings']->php_jview_display = (array) explode("\n",$view['settings']->php_jview_display); + $view['settings']->php_jview_display = (array) explode(PHP_EOL,$view['settings']->php_jview_display); if (ComponentbuilderHelper::checkArray($view['settings']->php_jview_display)) { - $method .= str_replace(array_keys($this->placeholders),array_values($this->placeholders),"\n\t\t".implode("\n\t\t",$view['settings']->php_jview_display)); + $method .= str_replace(array_keys($this->placeholders),array_values($this->placeholders),PHP_EOL."\t\t".implode(PHP_EOL."\t\t",$view['settings']->php_jview_display)); } } if ('site' === $this->target) { - $method .= "\n\n\t\t//".$this->setLine(__LINE__)." Set the toolbar"; - $method .= "\n\t\t\$this->addToolBar();"; - $method .= "\n\n\t\t//".$this->setLine(__LINE__)." set the document"; - $method .= "\n\t\t\$this->_prepareDocument();"; + $method .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Set the toolbar"; + $method .= PHP_EOL."\t\t\$this->addToolBar();"; + $method .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." set the document"; + $method .= PHP_EOL."\t\t\$this->_prepareDocument();"; } elseif ('custom_admin' === $this->target) { - $method .= "\n\n\t\t//".$this->setLine(__LINE__)." We don't need toolbar in the modal window."; - $method .= "\n\t\tif (\$this->getLayout() !== 'modal')"; - $method .= "\n\t\t{"; - $method .= "\n\t\t\t//".$this->setLine(__LINE__)." add the tool bar"; - $method .= "\n\t\t\t\$this->addToolBar();"; - $method .= "\n\t\t}"; - $method .= "\n\n\t\t//".$this->setLine(__LINE__)." set the document"; - $method .= "\n\t\t\$this->setDocument();"; + $method .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." We don't need toolbar in the modal window."; + $method .= PHP_EOL."\t\tif (\$this->getLayout() !== 'modal')"; + $method .= PHP_EOL."\t\t{"; + $method .= PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." add the tool bar"; + $method .= PHP_EOL."\t\t\t\$this->addToolBar();"; + $method .= PHP_EOL."\t\t}"; + $method .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." set the document"; + $method .= PHP_EOL."\t\t\$this->setDocument();"; } - $method .= "\n\n\t\tparent::display(\$tpl);"; + $method .= PHP_EOL.PHP_EOL."\t\tparent::display(\$tpl);"; } return $method; } @@ -2647,7 +2647,7 @@ class Interpretation extends Fields if (isset($this->getModule[$this->target][$view['settings']->code]) && $this->getModule[$this->target][$view['settings']->code]) { $addModule = array(); - $addModule[] = "\n\n\t/**"; + $addModule[] = PHP_EOL.PHP_EOL."\t/**"; $addModule[] = "\t * Get the modules published in a position"; $addModule[] = "\t */"; $addModule[] = "\tpublic function getModules(\$position, \$seperator = '', \$class = '')"; @@ -2707,9 +2707,9 @@ class Interpretation extends Fields $addModule[] = "\t\treturn false;"; $addModule[] = "\t}"; - $this->fileContentDynamic[$view['settings']->code]['###'.$TARGET.'_GET_MODULE_JIMPORT###'] = "\njimport('joomla.application.module.helper');"; + $this->fileContentDynamic[$view['settings']->code]['###'.$TARGET.'_GET_MODULE_JIMPORT###'] = PHP_EOL."jimport('joomla.application.module.helper');"; - return implode("\n",$addModule); + return implode(PHP_EOL,$addModule); } $this->fileContentDynamic[$view['settings']->code]['###'.$TARGET.'_GET_MODULE_JIMPORT###'] = ''; return ''; @@ -2724,10 +2724,10 @@ class Interpretation extends Fields { if ($view['settings']->add_php_document == 1) { - $view['settings']->php_document = (array) explode("\n",$view['settings']->php_document); + $view['settings']->php_document = (array) explode(PHP_EOL,$view['settings']->php_document); if (ComponentbuilderHelper::checkArray($view['settings']->php_document)) { - return str_replace(array_keys($this->placeholders),array_values($this->placeholders),"\n\t\t".implode("\n\t\t",$view['settings']->php_document)); + return str_replace(array_keys($this->placeholders),array_values($this->placeholders),PHP_EOL."\t\t".implode(PHP_EOL."\t\t",$view['settings']->php_document)); } } return ''; @@ -2790,7 +2790,7 @@ class Interpretation extends Fields { // set the custom buttons ###CUSTOM_BUTTONS_CONTROLLER### $this->fileContentDynamic[$viewName]['###'.$TARGET.'_CUSTOM_BUTTONS_CONTROLLER###'] = - "\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$view['settings']->php_controller); + PHP_EOL.PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$view['settings']->php_controller); if ('site' === $this->target) { // add the controller for this view @@ -2804,9 +2804,9 @@ class Interpretation extends Fields { // set the custom buttons ###CUSTOM_BUTTONS_METHOD### $this->fileContentDynamic[$viewName]['###'.$TARGET.'_CUSTOM_BUTTONS_METHOD###'] = - "\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$view['settings']->php_model); + PHP_EOL.PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$view['settings']->php_model); } - if (ComponentbuilderHelper::checkArray($view['settings']->custom_buttons)) + if (isset($view['settings']->custom_buttons) && ComponentbuilderHelper::checkArray($view['settings']->custom_buttons)) { $buttons = array(); foreach ($view['settings']->custom_buttons as $custom_button) @@ -2827,7 +2827,7 @@ class Interpretation extends Fields } if (ComponentbuilderHelper::checkArray($buttons)) { - return "\n".implode("\n",$buttons); + return PHP_EOL.implode(PHP_EOL,$buttons); } } } @@ -2850,12 +2850,12 @@ class Interpretation extends Fields { if ($view['settings']->add_css_document == 1) { - $view['settings']->css_document = (array) explode("\n",$view['settings']->css_document); + $view['settings']->css_document = (array) explode(PHP_EOL,$view['settings']->css_document); if (ComponentbuilderHelper::checkArray($view['settings']->css_document)) { - $script = "\n\t\t//".$this->setLine(__LINE__)." Set the Custom CSS script to view\n\t\t".'$this->document->addStyleDeclaration("'; - $cssDocument = str_replace('"', '\"', implode("\n\t\t\t",$view['settings']->css_document)); - return $script.str_replace(array_keys($this->placeholders),array_values($this->placeholders),"\n\t\t\t".$cssDocument)."\n\t\t".'");'; + $script = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Set the Custom CSS script to view".PHP_EOL."\t\t".'$this->document->addStyleDeclaration("'; + $cssDocument = str_replace('"', '\"', implode(PHP_EOL."\t\t\t",$view['settings']->css_document)); + return $script.str_replace(array_keys($this->placeholders),array_values($this->placeholders),PHP_EOL."\t\t\t".$cssDocument).PHP_EOL."\t\t".'");'; } } return ''; @@ -2865,12 +2865,12 @@ class Interpretation extends Fields { if ($view['settings']->add_js_document == 1) { - $view['settings']->js_document = (array) explode("\n",$view['settings']->js_document); + $view['settings']->js_document = (array) explode(PHP_EOL,$view['settings']->js_document); if (ComponentbuilderHelper::checkArray($view['settings']->js_document)) { - $script = "\n\t\t//".$this->setLine(__LINE__)." Set the Custom JS script to view\n\t\t".'$this->document->addScriptDeclaration("'; - $jsDocument = str_replace('"', '\"', implode("\n\t\t\t",$view['settings']->js_document)); - return $script.str_replace(array_keys($this->placeholders),array_values($this->placeholders),"\n\t\t\t".$jsDocument)."\n\t\t".'");'; + $script = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Set the Custom JS script to view".PHP_EOL."\t\t".'$this->document->addScriptDeclaration("'; + $jsDocument = str_replace('"', '\"', implode(PHP_EOL."\t\t\t",$view['settings']->js_document)); + return $script.str_replace(array_keys($this->placeholders),array_values($this->placeholders),PHP_EOL."\t\t\t".$jsDocument).PHP_EOL."\t\t".'");'; } } return ''; @@ -2929,7 +2929,7 @@ class Interpretation extends Fields public function setMetadataItem($item = 'item') { $meta = array(); - $meta[] = "\n\t\t//".$this->setLine(__LINE__)." load the meta description"; + $meta[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." load the meta description"; $meta[] = "\t\tif (isset(\$this->".$item."->metadesc) && \$this->".$item."->metadesc)"; $meta[] = "\t\t{"; $meta[] = "\t\t\t\$this->document->setDescription(\$this->".$item."->metadesc);"; @@ -2974,13 +2974,13 @@ class Interpretation extends Fields $meta[] = "\t\t\t}"; $meta[] = "\t\t}"; - return implode("\n",$meta); + return implode(PHP_EOL,$meta); } public function setMetadataList() { $meta = array(); - $meta[] = "\n\t\t//".$this->setLine(__LINE__)." load the meta description"; + $meta[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." load the meta description"; $meta[] = "\t\tif (\$this->params->get('menu-meta_description'))"; $meta[] = "\t\t{"; $meta[] = "\t\t\t\$this->document->setDescription(\$this->params->get('menu-meta_description'));"; @@ -2996,7 +2996,7 @@ class Interpretation extends Fields $meta[] = "\t\t\t\$this->document->setMetadata('robots', \$this->params->get('robots'));"; $meta[] = "\t\t}"; - return implode("\n",$meta); + return implode(PHP_EOL,$meta); } public function setGoogleChartLoader(&$view) @@ -3004,13 +3004,13 @@ class Interpretation extends Fields if (isset($this->googleChart[$this->target][$view['settings']->code]) && $this->googleChart[$this->target][$view['settings']->code]) { $chart = array(); - $chart[] = "\n\n\t\t//".$this->setLine(__LINE__)." add the google chart builder class."; + $chart[] = PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." add the google chart builder class."; $chart[] = "\t\trequire_once JPATH_COMPONENT_ADMINISTRATOR.'/helpers/chartbuilder.php';"; $chart[] = "\t\t//".$this->setLine(__LINE__)." load the google chart js."; $chart[] = "\t\t\$this->document->addScript(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/js/google.jsapi.js');"; $chart[] = "\t\t\$this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js');"; $chart[] = "\t\t\$this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js');"; - return implode("\n",$chart); + return implode(PHP_EOL,$chart); } return ''; } @@ -3022,125 +3022,125 @@ class Interpretation extends Fields $loader['css'] = array(); $loader['js'] = array(); // allways load these in - $setter .= "\n\n\t\t//".$this->setLine(__LINE__)." always make sure jquery is loaded."; - $setter .= "\n\t\tJHtml::_('jquery.framework');"; - $setter .= "\n\t\t//".$this->setLine(__LINE__)." Load the header checker class."; + $setter .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." always make sure jquery is loaded."; + $setter .= PHP_EOL."\t\tJHtml::_('jquery.framework');"; + $setter .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Load the header checker class."; if ($this->target === 'site') { - $setter .= "\n\t\trequire_once( JPATH_COMPONENT_SITE.'/helpers/headercheck.php' );"; + $setter .= PHP_EOL."\t\trequire_once( JPATH_COMPONENT_SITE.'/helpers/headercheck.php' );"; } else { - $setter .= "\n\t\trequire_once( JPATH_COMPONENT_ADMINISTRATOR.'/helpers/headercheck.php' );"; + $setter .= PHP_EOL."\t\trequire_once( JPATH_COMPONENT_ADMINISTRATOR.'/helpers/headercheck.php' );"; } - $setter .= "\n\t\t//".$this->setLine(__LINE__)." Initialize the header checker."; - $setter .= "\n\t\t\$HeaderCheck = new HeaderCheck;"; + $setter .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Initialize the header checker."; + $setter .= PHP_EOL."\t\t\$HeaderCheck = new HeaderCheck;"; // load the defaults needed if ($this->uikit) { - $setter .= "\n\n\t\t//".$this->setLine(__LINE__)." Load uikit options."; - $setter .= "\n\t\t\$uikit = \$this->params->get('uikit_load');"; - $setter .= "\n\t\t//".$this->setLine(__LINE__)." Set script size."; - $setter .= "\n\t\t\$size = \$this->params->get('uikit_min');"; - $setter .= "\n\t\t//".$this->setLine(__LINE__)." Set css style."; - $setter .= "\n\t\t\$style = \$this->params->get('uikit_style');"; + $setter .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Load uikit options."; + $setter .= PHP_EOL."\t\t\$uikit = \$this->params->get('uikit_load');"; + $setter .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Set script size."; + $setter .= PHP_EOL."\t\t\$size = \$this->params->get('uikit_min');"; + $setter .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Set css style."; + $setter .= PHP_EOL."\t\t\$style = \$this->params->get('uikit_style');"; - $setter .= "\n\n\t\t//".$this->setLine(__LINE__)." The uikit css."; - $setter .= "\n\t\tif ((!\$HeaderCheck->css_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)"; - $setter .= "\n\t\t{"; - $setter .= "\n\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit/css/uikit'.\$style.\$size.'.css');"; - $setter .= "\n\t\t}"; - $setter .= "\n\t\t//".$this->setLine(__LINE__)." The uikit js."; - $setter .= "\n\t\tif ((!\$HeaderCheck->js_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)"; - $setter .= "\n\t\t{"; - $setter .= "\n\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit/js/uikit'.\$size.'.js');"; - $setter .= "\n\t\t}"; + $setter .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." The uikit css."; + $setter .= PHP_EOL."\t\tif ((!\$HeaderCheck->css_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)"; + $setter .= PHP_EOL."\t\t{"; + $setter .= PHP_EOL."\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit/css/uikit'.\$style.\$size.'.css');"; + $setter .= PHP_EOL."\t\t}"; + $setter .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." The uikit js."; + $setter .= PHP_EOL."\t\tif ((!\$HeaderCheck->js_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)"; + $setter .= PHP_EOL."\t\t{"; + $setter .= PHP_EOL."\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit/js/uikit'.\$size.'.js');"; + $setter .= PHP_EOL."\t\t}"; } // load the components need if ($this->uikit && isset($this->uikitComp[$view['settings']->code]) && ComponentbuilderHelper::checkArray($this->uikitComp[$view['settings']->code])) { - $setter .= "\n\n\t\t//".$this->setLine(__LINE__)." Load the script to find all uikit components needed."; - $setter .= "\n\t\tif (\$uikit != 2)"; - $setter .= "\n\t\t{"; - $setter .= "\n\t\t\t//".$this->setLine(__LINE__)." Set the default uikit components in this view."; - $setter .= "\n\t\t\t\$uikitComp = array();"; + $setter .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Load the script to find all uikit components needed."; + $setter .= PHP_EOL."\t\tif (\$uikit != 2)"; + $setter .= PHP_EOL."\t\t{"; + $setter .= PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Set the default uikit components in this view."; + $setter .= PHP_EOL."\t\t\t\$uikitComp = array();"; foreach ($this->uikitComp[$view['settings']->code] as $class) { - $setter .= "\n\t\t\t\$uikitComp[] = '".$class."';"; + $setter .= PHP_EOL."\t\t\t\$uikitComp[] = '".$class."';"; } // check content for more needed components if (isset($this->siteFieldData['uikit'][$view['settings']->code]) && ComponentbuilderHelper::checkArray($this->siteFieldData['uikit'][$view['settings']->code])) { - $setter .= "\n\n\t\t\t//".$this->setLine(__LINE__)." Get field uikit components needed in this view."; - $setter .= "\n\t\t\t\$uikitFieldComp = \$this->get('UikitComp');"; - $setter .= "\n\t\t\tif (isset(\$uikitFieldComp) && ".$this->fileContentStatic['###Component###']."Helper::checkArray(\$uikitFieldComp))"; - $setter .= "\n\t\t\t{"; - $setter .= "\n\t\t\t\tif (isset(\$uikitComp) && ".$this->fileContentStatic['###Component###']."Helper::checkArray(\$uikitComp))"; - $setter .= "\n\t\t\t\t{"; - $setter .= "\n\t\t\t\t\t\$uikitComp = array_merge(\$uikitComp, \$uikitFieldComp);"; - $setter .= "\n\t\t\t\t\t\$uikitComp = array_unique(\$uikitComp);"; - $setter .= "\n\t\t\t\t}"; - $setter .= "\n\t\t\t\telse"; - $setter .= "\n\t\t\t\t{"; - $setter .= "\n\t\t\t\t\t\$uikitComp = \$uikitFieldComp;"; - $setter .= "\n\t\t\t\t}"; - $setter .= "\n\t\t\t}"; + $setter .= PHP_EOL.PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Get field uikit components needed in this view."; + $setter .= PHP_EOL."\t\t\t\$uikitFieldComp = \$this->get('UikitComp');"; + $setter .= PHP_EOL."\t\t\tif (isset(\$uikitFieldComp) && ".$this->fileContentStatic['###Component###']."Helper::checkArray(\$uikitFieldComp))"; + $setter .= PHP_EOL."\t\t\t{"; + $setter .= PHP_EOL."\t\t\t\tif (isset(\$uikitComp) && ".$this->fileContentStatic['###Component###']."Helper::checkArray(\$uikitComp))"; + $setter .= PHP_EOL."\t\t\t\t{"; + $setter .= PHP_EOL."\t\t\t\t\t\$uikitComp = array_merge(\$uikitComp, \$uikitFieldComp);"; + $setter .= PHP_EOL."\t\t\t\t\t\$uikitComp = array_unique(\$uikitComp);"; + $setter .= PHP_EOL."\t\t\t\t}"; + $setter .= PHP_EOL."\t\t\t\telse"; + $setter .= PHP_EOL."\t\t\t\t{"; + $setter .= PHP_EOL."\t\t\t\t\t\$uikitComp = \$uikitFieldComp;"; + $setter .= PHP_EOL."\t\t\t\t}"; + $setter .= PHP_EOL."\t\t\t}"; } - $setter .= "\n\t\t}"; - $setter .= "\n\n\t\t//".$this->setLine(__LINE__)." Load the needed uikit components in this view."; - $setter .= "\n\t\tif (\$uikit != 2 && isset(\$uikitComp) && ".$this->fileContentStatic['###Component###']."Helper::checkArray(\$uikitComp))"; - $setter .= "\n\t\t{"; - $setter .= "\n\t\t\t//".$this->setLine(__LINE__)." load just in case."; - $setter .= "\n\t\t\tjimport('joomla.filesystem.file');"; - $setter .= "\n\t\t\t//".$this->setLine(__LINE__)." loading..."; - $setter .= "\n\t\t\tforeach (\$uikitComp as \$class)"; - $setter .= "\n\t\t\t{"; - $setter .= "\n\t\t\t\tforeach (".$this->fileContentStatic['###Component###']."Helper::\$uk_components[\$class] as \$name)"; - $setter .= "\n\t\t\t\t{"; - $setter .= "\n\t\t\t\t\t//".$this->setLine(__LINE__)." check if the CSS file exists."; - $setter .= "\n\t\t\t\t\tif (JFile::exists(JPATH_ROOT.'/media/com_".$this->fileContentStatic['###component###']."/uikit/css/components/'.\$name.\$style.\$size.'.css'))"; - $setter .= "\n\t\t\t\t\t{"; - $setter .= "\n\t\t\t\t\t\t//".$this->setLine(__LINE__)." load the css."; - $setter .= "\n\t\t\t\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit/css/components/'.\$name.\$style.\$size.'.css');"; - $setter .= "\n\t\t\t\t\t}"; - $setter .= "\n\t\t\t\t\t//".$this->setLine(__LINE__)." check if the JavaScript file exists."; - $setter .= "\n\t\t\t\t\tif (JFile::exists(JPATH_ROOT.'/media/com_".$this->fileContentStatic['###component###']."/uikit/js/components/'.\$name.\$size.'.js'))"; - $setter .= "\n\t\t\t\t\t{"; - $setter .= "\n\t\t\t\t\t\t//".$this->setLine(__LINE__)." load the js."; - $setter .= "\n\t\t\t\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit/js/components/'.\$name.\$size.'.js', 'text/javascript', true);"; - $setter .= "\n\t\t\t\t\t}"; - $setter .= "\n\t\t\t\t}"; - $setter .= "\n\t\t\t}"; - $setter .= "\n\t\t}"; + $setter .= PHP_EOL."\t\t}"; + $setter .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Load the needed uikit components in this view."; + $setter .= PHP_EOL."\t\tif (\$uikit != 2 && isset(\$uikitComp) && ".$this->fileContentStatic['###Component###']."Helper::checkArray(\$uikitComp))"; + $setter .= PHP_EOL."\t\t{"; + $setter .= PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." load just in case."; + $setter .= PHP_EOL."\t\t\tjimport('joomla.filesystem.file');"; + $setter .= PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." loading..."; + $setter .= PHP_EOL."\t\t\tforeach (\$uikitComp as \$class)"; + $setter .= PHP_EOL."\t\t\t{"; + $setter .= PHP_EOL."\t\t\t\tforeach (".$this->fileContentStatic['###Component###']."Helper::\$uk_components[\$class] as \$name)"; + $setter .= PHP_EOL."\t\t\t\t{"; + $setter .= PHP_EOL."\t\t\t\t\t//".$this->setLine(__LINE__)." check if the CSS file exists."; + $setter .= PHP_EOL."\t\t\t\t\tif (JFile::exists(JPATH_ROOT.'/media/com_".$this->fileContentStatic['###component###']."/uikit/css/components/'.\$name.\$style.\$size.'.css'))"; + $setter .= PHP_EOL."\t\t\t\t\t{"; + $setter .= PHP_EOL."\t\t\t\t\t\t//".$this->setLine(__LINE__)." load the css."; + $setter .= PHP_EOL."\t\t\t\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit/css/components/'.\$name.\$style.\$size.'.css');"; + $setter .= PHP_EOL."\t\t\t\t\t}"; + $setter .= PHP_EOL."\t\t\t\t\t//".$this->setLine(__LINE__)." check if the JavaScript file exists."; + $setter .= PHP_EOL."\t\t\t\t\tif (JFile::exists(JPATH_ROOT.'/media/com_".$this->fileContentStatic['###component###']."/uikit/js/components/'.\$name.\$size.'.js'))"; + $setter .= PHP_EOL."\t\t\t\t\t{"; + $setter .= PHP_EOL."\t\t\t\t\t\t//".$this->setLine(__LINE__)." load the js."; + $setter .= PHP_EOL."\t\t\t\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit/js/components/'.\$name.\$size.'.js', 'text/javascript', true);"; + $setter .= PHP_EOL."\t\t\t\t\t}"; + $setter .= PHP_EOL."\t\t\t\t}"; + $setter .= PHP_EOL."\t\t\t}"; + $setter .= PHP_EOL."\t\t}"; } elseif ($this->uikit && isset($this->siteFieldData['uikit'][$view['settings']->code]) && ComponentbuilderHelper::checkArray($this->siteFieldData['uikit'][$view['settings']->code])) { - $setter .= "\n\n\t\t//".$this->setLine(__LINE__)." Load the needed uikit components in this view."; - $setter .= "\n\t\t\$uikitComp = \$this->get('UikitComp');"; - $setter .= "\n\t\tif (\$uikit != 2 && isset(\$uikitComp) && ".$this->fileContentStatic['###Component###']."Helper::checkArray(\$uikitComp))"; - $setter .= "\n\t\t{"; - $setter .= "\n\t\t\t//".$this->setLine(__LINE__)." load just in case."; - $setter .= "\n\t\t\tjimport('joomla.filesystem.file');"; - $setter .= "\n\t\t\t//".$this->setLine(__LINE__)." loading..."; - $setter .= "\n\t\t\tforeach (\$uikitComp as \$class)"; - $setter .= "\n\t\t\t{"; - $setter .= "\n\t\t\t\tforeach (".$this->fileContentStatic['###Component###']."Helper::\$uk_components[\$class] as \$name)"; - $setter .= "\n\t\t\t\t{"; - $setter .= "\n\t\t\t\t\t//".$this->setLine(__LINE__)." check if the CSS file exists."; - $setter .= "\n\t\t\t\t\tif (JFile::exists(JPATH_ROOT.'/media/com_".$this->fileContentStatic['###component###']."/uikit/css/components/'.\$name.\$style.\$size.'.css'))"; - $setter .= "\n\t\t\t\t\t{"; - $setter .= "\n\t\t\t\t\t\t//".$this->setLine(__LINE__)." load the css."; - $setter .= "\n\t\t\t\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit/css/components/'.\$name.\$style.\$size.'.css');"; - $setter .= "\n\t\t\t\t\t}"; - $setter .= "\n\t\t\t\t\t//".$this->setLine(__LINE__)." check if the JavaScript file exists."; - $setter .= "\n\t\t\t\t\tif (JFile::exists(JPATH_ROOT.'/media/com_".$this->fileContentStatic['###component###']."/uikit/js/components/'.\$name.\$size.'.js'))"; - $setter .= "\n\t\t\t\t\t{"; - $setter .= "\n\t\t\t\t\t\t//".$this->setLine(__LINE__)." load the js."; - $setter .= "\n\t\t\t\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit/js/components/'.\$name.\$size.'.js', 'text/javascript', true);"; - $setter .= "\n\t\t\t\t\t}"; - $setter .= "\n\t\t\t\t}"; - $setter .= "\n\t\t\t}"; - $setter .= "\n\t\t}"; + $setter .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Load the needed uikit components in this view."; + $setter .= PHP_EOL."\t\t\$uikitComp = \$this->get('UikitComp');"; + $setter .= PHP_EOL."\t\tif (\$uikit != 2 && isset(\$uikitComp) && ".$this->fileContentStatic['###Component###']."Helper::checkArray(\$uikitComp))"; + $setter .= PHP_EOL."\t\t{"; + $setter .= PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." load just in case."; + $setter .= PHP_EOL."\t\t\tjimport('joomla.filesystem.file');"; + $setter .= PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." loading..."; + $setter .= PHP_EOL."\t\t\tforeach (\$uikitComp as \$class)"; + $setter .= PHP_EOL."\t\t\t{"; + $setter .= PHP_EOL."\t\t\t\tforeach (".$this->fileContentStatic['###Component###']."Helper::\$uk_components[\$class] as \$name)"; + $setter .= PHP_EOL."\t\t\t\t{"; + $setter .= PHP_EOL."\t\t\t\t\t//".$this->setLine(__LINE__)." check if the CSS file exists."; + $setter .= PHP_EOL."\t\t\t\t\tif (JFile::exists(JPATH_ROOT.'/media/com_".$this->fileContentStatic['###component###']."/uikit/css/components/'.\$name.\$style.\$size.'.css'))"; + $setter .= PHP_EOL."\t\t\t\t\t{"; + $setter .= PHP_EOL."\t\t\t\t\t\t//".$this->setLine(__LINE__)." load the css."; + $setter .= PHP_EOL."\t\t\t\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit/css/components/'.\$name.\$style.\$size.'.css');"; + $setter .= PHP_EOL."\t\t\t\t\t}"; + $setter .= PHP_EOL."\t\t\t\t\t//".$this->setLine(__LINE__)." check if the JavaScript file exists."; + $setter .= PHP_EOL."\t\t\t\t\tif (JFile::exists(JPATH_ROOT.'/media/com_".$this->fileContentStatic['###component###']."/uikit/js/components/'.\$name.\$size.'.js'))"; + $setter .= PHP_EOL."\t\t\t\t\t{"; + $setter .= PHP_EOL."\t\t\t\t\t\t//".$this->setLine(__LINE__)." load the js."; + $setter .= PHP_EOL."\t\t\t\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit/js/components/'.\$name.\$size.'.js', 'text/javascript', true);"; + $setter .= PHP_EOL."\t\t\t\t\t}"; + $setter .= PHP_EOL."\t\t\t\t}"; + $setter .= PHP_EOL."\t\t\t}"; + $setter .= PHP_EOL."\t\t}"; } return $setter; } @@ -3149,7 +3149,7 @@ class Interpretation extends Fields { if ($view['settings']->add_php_jview == 1) { - return str_replace(array_keys($this->placeholders),array_values($this->placeholders),"\n\n".$view['settings']->php_jview); + return str_replace(array_keys($this->placeholders),array_values($this->placeholders),PHP_EOL.PHP_EOL.$view['settings']->php_jview); } return ''; } @@ -3168,7 +3168,7 @@ class Interpretation extends Fields $this->placeholders['[[[LIMITBOX]]]'] = 'pagination->getLimitBox(); ?>'; } $body[] = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$view['settings']->default); - $body[] = "\n".'items) && '.$this->fileContentStatic['###component###'].'Helper::checkArray($this->items) && count($this->items) > 4): ?>'; + $body[] = PHP_EOL.'items) && '.$this->fileContentStatic['###component###'].'Helper::checkArray($this->items) && count($this->items) > 4): ?>'; $body[] = ''; $body[] = "\t".'
'; + $body .= PHP_EOL."\tuser->authorise('core.manage', 'com_checkin') || \$item->checked_out == \$this->user->id || \$item->checked_out == 0;"; + $body .= PHP_EOL."\t\t\$userChkOut = JFactory::getUser(\$item->checked_out);"; + $body .= PHP_EOL."\t\t\$canDo = ".$Helper."::getActions('".$viewName_single."',\$item,'".$viewName_list."');"; + $body .= PHP_EOL."\t?>"; + $body .= PHP_EOL."\t".''; // only load if not over written if (!isset($this->fieldsNames[$viewName_single]['ordering'])) { - $body .= "\n\t\t".'"; + $body .= PHP_EOL."\t\t\tsaveOrder)"; + $body .= PHP_EOL."\t\t\t\t{"; + $body .= PHP_EOL."\t\t\t\t\t\$iconClass = ' inactive';"; + $body .= PHP_EOL."\t\t\t\t}"; + $body .= PHP_EOL."\t\t\t\telse"; + $body .= PHP_EOL."\t\t\t\t{"; + $body .= PHP_EOL."\t\t\t\t\t\$iconClass = ' inactive tip-top".'" hasTooltip" title="'."' . JHtml::tooltipText('JORDERINGDISABLED');"; + $body .= PHP_EOL."\t\t\t\t}"; + $body .= PHP_EOL."\t\t\t?>"; + $body .= PHP_EOL."\t\t\t".''; + $body .= PHP_EOL."\t\t\t\t".''; + $body .= PHP_EOL."\t\t\t"; + $body .= PHP_EOL."\t\t\tsaveOrder) : ?>"; + $body .= PHP_EOL."\t\t\t\t".'ordering; ?>" class="width-20 text-area-order " />'; + $body .= PHP_EOL."\t\t\t"; + $body .= PHP_EOL."\t\t"; + $body .= PHP_EOL."\t\t\t⋮"; + $body .= PHP_EOL."\t\t"; + $body .= PHP_EOL."\t\t"; } - $body .= "\n\t\t".'"; + $body .= PHP_EOL."\t\t\t\tchecked_out) : ?>"; + $body .= PHP_EOL."\t\t\t\t\t"; + $body .= PHP_EOL."\t\t\t\t\t\tid); ?>"; + $body .= PHP_EOL."\t\t\t\t\t"; + $body .= PHP_EOL."\t\t\t\t\t\t□"; + $body .= PHP_EOL."\t\t\t\t\t"; + $body .= PHP_EOL."\t\t\t\t"; + $body .= PHP_EOL."\t\t\t\t\tid); ?>"; + $body .= PHP_EOL."\t\t\t\t"; + $body .= PHP_EOL."\t\t"; + $body .= PHP_EOL."\t\t\t□"; + $body .= PHP_EOL."\t\t"; + $body .= PHP_EOL."\t\t"; // check if this view has fields that should not be escaped $doNotEscape = false; if (isset($this->doNotEscape[$viewName_list])) @@ -5290,25 +5333,25 @@ class Interpretation extends Fields { $otherViews = $this->catCodeBuilder[$viewName_single]['views']; // category and linked - $body .= "\n\t\t".'"; + $body .= PHP_EOL."\t\t".'"; } elseif ($item['type'] === 'user' && !$item['title']) { // user and linked - $body .= "\n\t\t".$item['code']."); ?>"; - $body .= "\n\t\t".'"; + $body .= PHP_EOL."\t\t".$item['code']."); ?>"; + $body .= PHP_EOL."\t\t".'"; } else { @@ -5337,14 +5380,14 @@ class Interpretation extends Fields elseif (isset($item['custom']) && ComponentbuilderHelper::checkArray($item['custom']) && $item['custom']['extends'] === 'user' && !$item['title']) { // user and linked - $body .= "\n\t\t".$item['id']."); ?>"; - $body .= "\n\t\t".'"; + $body .= PHP_EOL."\t\t".$item['id']."); ?>"; + $body .= PHP_EOL."\t\t".'"; $add = false; } @@ -5358,16 +5401,16 @@ class Interpretation extends Fields // make sure the custom links are only added once $firstTimeBeingAdded = false; // start building the links - $customAdminView = "\n\t\t\t".'
'; + $customAdminView = PHP_EOL."\t\t\t".'
'; foreach ($this->customAdminViewListLink[$viewName_list] as $customLinkView) { - $customAdminView .= "\n\t\t\tget('".$customLinkView['link'].".access')): ?>"; - $customAdminView .= "\n\t\t\t\t".'fileContentStatic['###COMPONENT###'].'_'.$customLinkView['NAME']."'".'); ?>" >'; - $customAdminView .= "\n\t\t\t"; - $customAdminView .= "\n\t\t\t\t".'fileContentStatic['###COMPONENT###'].'_'.$customLinkView['NAME']."'".'); ?>">'; - $customAdminView .= "\n\t\t\t"; + $customAdminView .= PHP_EOL."\t\t\tget('".$customLinkView['link'].".access')): ?>"; + $customAdminView .= PHP_EOL."\t\t\t\t".'fileContentStatic['###COMPONENT###'].'_'.$customLinkView['NAME']."'".'); ?>" >'; + $customAdminView .= PHP_EOL."\t\t\t"; + $customAdminView .= PHP_EOL."\t\t\t\t".'fileContentStatic['###COMPONENT###'].'_'.$customLinkView['NAME']."'".'); ?>">'; + $customAdminView .= PHP_EOL."\t\t\t"; } - $customAdminView .= "\n\t\t\t".'
'; + $customAdminView .= PHP_EOL."\t\t\t".'
'; } // check if the item has permissions. @@ -5388,21 +5431,21 @@ class Interpretation extends Fields if ($add) { // set as linked - $body .= "\n\t\t".'"; + $body .= PHP_EOL."\t\t"; } } } @@ -5410,74 +5453,74 @@ class Interpretation extends Fields { if ($item['type'] === 'category') { - $body .= "\n\t\t"; + $body .= PHP_EOL."\t\t"; } elseif (ComponentbuilderHelper::checkArray($item['custom']) && $item['custom']['extends'] === 'user') { // custom user and linked - $body .= "\n\t\t".$item['id']."); ?>"; - $body .= "\n\t\t".'"; + $body .= PHP_EOL."\t\t".$item['id']."); ?>"; + $body .= PHP_EOL."\t\t".'"; } elseif ($item['type'] === 'user') { // user name only - $body .= "\n\t\t".$item['code']."); ?>"; - $body .= "\n\t\t".'"; + $body .= PHP_EOL."\t\t".$item['code']."); ?>"; + $body .= PHP_EOL."\t\t".'"; } else { // normal not linked - $body .= "\n\t\t"; + $body .= PHP_EOL."\t\t"; } } } // add the defaults if (!isset($this->fieldsNames[$viewName_single]['published'])) { - $body .= "\n\t\t".'"; + $body .= PHP_EOL."\t\t\t\tchecked_out) : ?>"; + $body .= PHP_EOL."\t\t\t\t\t"; + $body .= PHP_EOL."\t\t\t\t\t\tpublished, \$i, '".$viewName_list.".', true, 'cb'); ?>"; + $body .= PHP_EOL."\t\t\t\t\t"; + $body .= PHP_EOL."\t\t\t\t\t\tpublished, \$i, '".$viewName_list.".', false, 'cb'); ?>"; + $body .= PHP_EOL."\t\t\t\t\t"; + $body .= PHP_EOL."\t\t\t\t"; + $body .= PHP_EOL."\t\t\t\t\tpublished, \$i, '".$viewName_list.".', true, 'cb'); ?>"; + $body .= PHP_EOL."\t\t\t\t"; + $body .= PHP_EOL."\t\t"; + $body .= PHP_EOL."\t\t\tpublished, \$i, '".$viewName_list.".', false, 'cb'); ?>"; + $body .= PHP_EOL."\t\t"; + $body .= PHP_EOL."\t\t"; } if (!isset($this->fieldsNames[$viewName_single]['id'])) { - $body .= "\n\t\t".'"; + $body .= PHP_EOL."\t\t".'"; } - $body .= "\n\t"; - $body .= "\n"; + $body .= PHP_EOL."\t"; + $body .= PHP_EOL.""; // return the build return $body; } @@ -5506,24 +5549,24 @@ class Interpretation extends Fields } // set default $head = ''; - $head .= "\n\tcanEdit&& \$this->canState): ?>"; + $head .= PHP_EOL."\tcanEdit&& \$this->canState): ?>"; if (!isset($this->fieldsNames[$viewName_single]['ordering'])) { - $head .= "\n\t\t".'"; + $head .= PHP_EOL."\t\t".'"; } - $head .= "\n\t\t".'"; - $head .= "\n\t"; - $head .= "\n\t\t".'"; - $head .= "\n\t\t".'"; - $head .= "\n\t"; + $head .= PHP_EOL."\t\t".'"; + $head .= PHP_EOL."\t"; + $head .= PHP_EOL."\t\t".'"; + $head .= PHP_EOL."\t\t".'"; + $head .= PHP_EOL."\t"; // set footer Column number $this->listColnrBuilder[$viewName_list] = 4; // build the dynamic fields @@ -5543,31 +5586,31 @@ class Interpretation extends Fields { $title = "listDirn, \$this->listOrder); ?>"; } - $head .= "\n\t".'"; + $head .= PHP_EOL."\t".'"; $this->listColnrBuilder[$viewName_list]++; } // set default if (!isset($this->fieldsNames[$viewName_single]['published'])) { - $head .= "\n\tcanState): ?>"; - $head .= "\n\t\t".'"; - $head .= "\n\t"; - $head .= "\n\t\t".'"; - $head .= "\n\t"; + $head .= PHP_EOL."\tcanState): ?>"; + $head .= PHP_EOL."\t\t".'"; + $head .= PHP_EOL."\t"; + $head .= PHP_EOL."\t\t".'"; + $head .= PHP_EOL."\t"; } if (!isset($this->fieldsNames[$viewName_single]['id'])) { - $head .= "\n\t".'"; + $head .= PHP_EOL."\t".'"; } - $head .= "\n"; + $head .= PHP_EOL.""; return $head; } @@ -5684,7 +5727,7 @@ class Interpretation extends Fields } else { - $items .= ",\n\t'".$name."'"; + $items .= ",".PHP_EOL."\t'".$name."'"; } $itemCounter++; } @@ -5721,27 +5764,27 @@ class Interpretation extends Fields // set as title layout $this->setLayout($viewName_single, $layoutCodeName, $items, 'layouttitle'); // load to header - $header .= "\n\t"; + $header .= PHP_EOL."\t"; break; case 5: // under // set as title layout $this->setLayout($viewName_single, $layoutCodeName, $items, 'layouttitle'); // load to footer - $footer .= "\n\n
\n"; + $footer .= PHP_EOL.PHP_EOL."
".PHP_EOL.""; break; case 6: // left side $tabWidth = $tabWidth - 2; // set as items layout $this->setLayout($viewName_single, $layoutCodeName, $items, 'layoutitems'); // load the body - $leftside .= "\n\t"; + $leftside .= PHP_EOL."\t"; break; case 7: // right side $tabWidth = $tabWidth - 2; // set as items layout $this->setLayout($viewName_single, $layoutCodeName, $items, 'layoutitems'); // load the body - $rightside .= "\n\t"; + $rightside .= PHP_EOL."\t"; break; } } @@ -5815,9 +5858,9 @@ class Interpretation extends Fields { case 1: // left case 2: // right - $main .= "\n\t\t\t".'
'; - $main .= "\n\t\t\t\t".$string; - $main .= "\n\t\t\t".'
'; + $main .= PHP_EOL."\t\t\t".'
'; + $main .= PHP_EOL."\t\t\t\t".$string; + $main .= PHP_EOL."\t\t\t".'
'; break; } } @@ -5827,25 +5870,25 @@ class Interpretation extends Fields { case 1: // left case 2: // right - $main .= "\n\t\t\t".'
'; - $main .= "\n\t\t\t\t".$string; - $main .= "\n\t\t\t".'
'; + $main .= PHP_EOL."\t\t\t".'
'; + $main .= PHP_EOL."\t\t\t\t".$string; + $main .= PHP_EOL."\t\t\t".'
'; break; } } switch($posion) { case 3: // fullwidth - $mainbottom .= "\n\t\t\t".'
'; - $mainbottom .= "\n\t\t\t\t".$string; - $mainbottom .= "\n\t\t\t".'
'; + $mainbottom .= PHP_EOL."\t\t\t".'
'; + $mainbottom .= PHP_EOL."\t\t\t\t".$string; + $mainbottom .= PHP_EOL."\t\t\t".'
'; break; } } // set acctive tab if ($tabCounter == 0) { - $body .= "\n\n\t '".$tabCodeName."')); ?>"; + $body .= PHP_EOL.PHP_EOL."\t '".$tabCodeName."')); ?>"; } // if this is a linked view set permissions $closeIT = false; @@ -5865,37 +5908,37 @@ class Interpretation extends Fields // check if the item has permissions. if ($coreLoadLinked && isset($coreLinked['core.access']) && isset($this->permissionBuilder['global'][$coreLinked['core.access']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$coreLinked['core.access']]) && in_array($linkedCodeName,$this->permissionBuilder['global'][$coreLinked['core.access']])) { - $body .= "\n\n\tcanDo->get('".$coreLinked['core.access']."')) : ?>"; + $body .= PHP_EOL.PHP_EOL."\tcanDo->get('".$coreLinked['core.access']."')) : ?>"; $closeIT = true; } else { - $body .= "\n"; + $body .= PHP_EOL; } // insure clear unset($coreLoadLinked,$coreLinked,$linkedViewData); } else { - $body .= "\n"; + $body .= PHP_EOL; } // start tab - $body .= "\n\t"; + $body .= PHP_EOL."\t"; // add the main - $body .= "\n\t\t".'
'; + $body .= PHP_EOL."\t\t".'
'; $body .= $main; - $body .= "\n\t\t
"; + $body .= PHP_EOL."\t\t
"; if (strlen($mainbottom) > 0) { // add the main bottom - $body .= "\n\t\t".'
'; + $body .= PHP_EOL."\t\t".'
'; $body .= $mainbottom; - $body .= "\n\t\t
"; + $body .= PHP_EOL."\t\t
"; } - $body .= "\n\t"; + $body .= PHP_EOL."\t"; if($closeIT) { - $body .= "\n\t"; + $body .= PHP_EOL."\t"; } // set counter $tabCounter++; @@ -5935,7 +5978,7 @@ class Interpretation extends Fields if (ComponentbuilderHelper::checkArray($items)) { // load all items - $items_one = "'". implode("',\n\t'", $items)."'"; + $items_one = "'". implode("',".PHP_EOL."\t'", $items)."'"; // set the publishing layout $this->setLayout($viewName_single, $tabCodeNameLeft, $items_one, 'layoutpublished'); $items_one = true; @@ -5978,7 +6021,7 @@ class Interpretation extends Fields if (ComponentbuilderHelper::checkArray($items_one)) { // load all items - $items_one = "'". implode("',\n\t'", $items_one)."'"; + $items_one = "'". implode("',".PHP_EOL."\t'", $items_one)."'"; // set the publishing layout $this->setLayout($viewName_single, $tabCodeNameLeft, $items_one, 'layoutpublished'); $items_one = true; @@ -5987,7 +6030,7 @@ class Interpretation extends Fields if (ComponentbuilderHelper::checkArray($items_two)) { // load all items - $items_two = "'". implode("',\n\t'", $items_two)."'"; + $items_two = "'". implode("',".PHP_EOL."\t'", $items_two)."'"; // set the publishing layout $this->setLayout($viewName_single, $tabCodeNameRight, $items_two, 'layoutpublished'); $items_two = true; @@ -6026,25 +6069,25 @@ class Interpretation extends Fields $publishingPer[] = "\$this->canDo->get('".$core_permission."')"; } } - $body .= "\n\n\t"; + $body .= PHP_EOL.PHP_EOL."\t"; // set the default publishing tab - $body .= "\n\t"; - $body .= "\n\t\t".'
'; + $body .= PHP_EOL."\t"; + $body .= PHP_EOL."\t\t".'
'; if ($items_one) { - $body .= "\n\t\t\t".'
'; - $body .= "\n\t\t\t\t"; - $body .= "\n\t\t\t
"; + $body .= PHP_EOL."\t\t\t".'
'; + $body .= PHP_EOL."\t\t\t\t"; + $body .= PHP_EOL."\t\t\t
"; } if ($items_two) { - $body .= "\n\t\t\t".'
'; - $body .= "\n\t\t\t\t"; - $body .= "\n\t\t\t
"; + $body .= PHP_EOL."\t\t\t".'
'; + $body .= PHP_EOL."\t\t\t\t"; + $body .= PHP_EOL."\t\t\t
"; } - $body .= "\n\t\t
"; - $body .= "\n\t"; - $body .= "\n\t"; + $body .= PHP_EOL."\t\t
"; + $body .= PHP_EOL."\t"; + $body .= PHP_EOL."\t"; } // make sure we dont load it to a view with the name component if ($viewName_single != 'component') @@ -6059,36 +6102,36 @@ class Interpretation extends Fields $this->langContent[$this->lang][$tabLangName] = 'Permissions'; } // set the permissions tab - $body .= "\n\n\tcanDo->get('core.admin')) : ?>"; - $body .= "\n\t"; - $body .= "\n\t\t".'
'; - $body .= "\n\t\t\t".'
'; - $body .= "\n\t\t\t\t".'
'; - $body .= "\n\t\t\t\t\t".'
'; - $body .= "\n\t\t\t\t\tform->getFieldset('accesscontrol') as \$field): ?>"; - $body .= "\n\t\t\t\t\t\t
"; - $body .= "\n\t\t\t\t\t\t\tlabel; echo \$field->input;?>"; - $body .= "\n\t\t\t\t\t\t
"; - $body .= "\n\t\t\t\t\t\t".'
'; - $body .= "\n\t\t\t\t\t"; - $body .= "\n\t\t\t\t\t
"; - $body .= "\n\t\t\t\t
"; - $body .= "\n\t\t\t
"; - $body .= "\n\t\t
"; - $body .= "\n\t"; - $body .= "\n\t"; + $body .= PHP_EOL.PHP_EOL."\tcanDo->get('core.admin')) : ?>"; + $body .= PHP_EOL."\t"; + $body .= PHP_EOL."\t\t".'
'; + $body .= PHP_EOL."\t\t\t".'
'; + $body .= PHP_EOL."\t\t\t\t".'
'; + $body .= PHP_EOL."\t\t\t\t\t".'
'; + $body .= PHP_EOL."\t\t\t\t\tform->getFieldset('accesscontrol') as \$field): ?>"; + $body .= PHP_EOL."\t\t\t\t\t\t
"; + $body .= PHP_EOL."\t\t\t\t\t\t\tlabel; echo \$field->input;?>"; + $body .= PHP_EOL."\t\t\t\t\t\t
"; + $body .= PHP_EOL."\t\t\t\t\t\t".'
'; + $body .= PHP_EOL."\t\t\t\t\t"; + $body .= PHP_EOL."\t\t\t\t\t
"; + $body .= PHP_EOL."\t\t\t\t
"; + $body .= PHP_EOL."\t\t\t
"; + $body .= PHP_EOL."\t\t
"; + $body .= PHP_EOL."\t"; + $body .= PHP_EOL."\t"; } // end the tab set - $body .= "\n\n\t"; - $body .= "\n\n\t
"; - $body .= "\n\t\t".''; - $body .= "\n\t\t"; - $body .= "\n\t
"; - $body .= "\n"; + $body .= PHP_EOL.PHP_EOL."\t"; + $body .= PHP_EOL.PHP_EOL."\t
"; + $body .= PHP_EOL."\t\t".''; + $body .= PHP_EOL."\t\t"; + $body .= PHP_EOL."\t
"; + $body .= PHP_EOL.""; // check if left has been set if (strlen($leftside) > 0 ) { - $left = '
'.$leftside."\n
"; + $left = '
'.$leftside.PHP_EOL."
"; } else { @@ -6097,7 +6140,7 @@ class Interpretation extends Fields // check if right has been set if (strlen($rightside) > 0 ) { - $right = '
'.$rightside."\n
"; + $right = '
'.$rightside.PHP_EOL."
"; } else { @@ -6139,7 +6182,7 @@ class Interpretation extends Fields $fadein[] = ""; $fadein[] = "
fileContentStatic['###component###']."_loader\" style=\"display: none;\">"; - return implode("\n", $fadein); + return implode(PHP_EOL, $fadein); } return "
fileContentStatic['###component###']."_loader\">"; } @@ -6210,13 +6253,13 @@ class Interpretation extends Fields $headerscript = '$edit = "index.php?option=com_'.$this->fileContentStatic['###component###'].'&view='.$list.'&task='.$single.'.edit";'; if ($addNewButon) { - $headerscript .= "\n".'$ref = ($id) ? "&ref='.$viewName_single.'&refid=".$id : "";'; - $headerscript .= "\n".'$new = "index.php?option=com_'.$this->fileContentStatic['###component###'].'&view='.$single.'&layout=edit".$ref;'; - $headerscript .= "\n".'$can = '.$this->fileContentStatic['###Component###'].'Helper::getActions('."'".$single."'".');'; + $headerscript .= PHP_EOL.'$ref = ($id) ? "&ref='.$viewName_single.'&refid=".$id : "";'; + $headerscript .= PHP_EOL.'$new = "index.php?option=com_'.$this->fileContentStatic['###component###'].'&view='.$single.'&layout=edit".$ref;'; + $headerscript .= PHP_EOL.'$can = '.$this->fileContentStatic['###Component###'].'Helper::getActions('."'".$single."'".');'; } $this->fileContentDynamic[$viewName_single.'_'.$layoutCodeName]['###LAYOUTITEMSHEADER###'] = $headerscript; // ###LINKEDVIEWITEMS### <<>> - $this->fileContentDynamic[$viewName_single]['###LINKEDVIEWITEMS###'] .= "\n\n\t\t//".$this->setLine(__LINE__)." Get Linked view data\n\t\t\$this->".$codeName."\t\t= \$this->get('".$functionName."');"; + $this->fileContentDynamic[$viewName_single]['###LINKEDVIEWITEMS###'] .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get Linked view data".PHP_EOL."\t\t\$this->".$codeName."\t\t= \$this->get('".$functionName."');"; // ###LINKEDVIEWTABLESCRIPTS### <<>> $this->fileContentDynamic[$viewName_single]['###LINKEDVIEWTABLESCRIPTS###'] = $this->setFootableScripts(); if(strpos($parentKey, '-R>') !== false || strpos($parentKey, '-A>') !== false) @@ -6238,7 +6281,7 @@ class Interpretation extends Fields // set the global key $globalKey = ComponentbuilderHelper::safeString($_key.$this->uniquekey(4)); // ###LINKEDVIEWGLOBAL### <<>> - $this->fileContentDynamic[$viewName_single]['###LINKEDVIEWGLOBAL###'] .= "\n\t\t\$this->".$globalKey." = \$item->".$parent_key.";"; + $this->fileContentDynamic[$viewName_single]['###LINKEDVIEWGLOBAL###'] .= PHP_EOL."\t\t\$this->".$globalKey." = \$item->".$parent_key.";"; // ###LINKEDVIEWMETHODS### <<>> $this->fileContentDynamic[$viewName_single]['###LINKEDVIEWMETHODS###'] .= $this->setListQueryLinked($single, $list, $functionName, $key, $_key, $parentKey, $parent_key, $globalKey); } @@ -6258,41 +6301,41 @@ class Interpretation extends Fields { if (!isset($this->footableVersion) || 2 == $this->footableVersion) // loading version 2 { - $foo = "\n\n\t\t//".$this->setLine(__LINE__)." Add the CSS for Footable."; - $foo .= "\n\t\t".$document."->addStyleSheet(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/css/footable.core.min.css');"; - $foo .= "\n\n\t\t//".$this->setLine(__LINE__)." Use the Metro Style"; - $foo .= "\n\t\tif (!isset(\$this->fooTableStyle) || 0 == \$this->fooTableStyle)"; - $foo .= "\n\t\t{"; - $foo .= "\n\t\t\t".$document."->addStyleSheet(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/css/footable.metro.min.css');"; - $foo .= "\n\t\t}"; - $foo .= "\n\t\t//".$this->setLine(__LINE__)." Use the Legacy Style."; - $foo .= "\n\t\telseif (isset(\$this->fooTableStyle) && 1 == \$this->fooTableStyle)"; - $foo .= "\n\t\t{"; - $foo .= "\n\t\t\t".$document."->addStyleSheet(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/css/footable.standalone.min.css');"; - $foo .= "\n\t\t}"; - $foo .= "\n\n\t\t//".$this->setLine(__LINE__)." Add the JavaScript for Footable"; - $foo .= "\n\t\t".$document."->addScript(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/js/footable.js');"; - $foo .= "\n\t\t".$document."->addScript(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/js/footable.sort.js');"; - $foo .= "\n\t\t".$document."->addScript(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/js/footable.filter.js');"; - $foo .= "\n\t\t".$document."->addScript(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/js/footable.paginate.js');"; + $foo = PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Add the CSS for Footable."; + $foo .= PHP_EOL."\t\t".$document."->addStyleSheet(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/css/footable.core.min.css');"; + $foo .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Use the Metro Style"; + $foo .= PHP_EOL."\t\tif (!isset(\$this->fooTableStyle) || 0 == \$this->fooTableStyle)"; + $foo .= PHP_EOL."\t\t{"; + $foo .= PHP_EOL."\t\t\t".$document."->addStyleSheet(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/css/footable.metro.min.css');"; + $foo .= PHP_EOL."\t\t}"; + $foo .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Use the Legacy Style."; + $foo .= PHP_EOL."\t\telseif (isset(\$this->fooTableStyle) && 1 == \$this->fooTableStyle)"; + $foo .= PHP_EOL."\t\t{"; + $foo .= PHP_EOL."\t\t\t".$document."->addStyleSheet(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/css/footable.standalone.min.css');"; + $foo .= PHP_EOL."\t\t}"; + $foo .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Add the JavaScript for Footable"; + $foo .= PHP_EOL."\t\t".$document."->addScript(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/js/footable.js');"; + $foo .= PHP_EOL."\t\t".$document."->addScript(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/js/footable.sort.js');"; + $foo .= PHP_EOL."\t\t".$document."->addScript(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/js/footable.filter.js');"; + $foo .= PHP_EOL."\t\t".$document."->addScript(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/js/footable.paginate.js');"; if ($init) { - $foo .= "\n\n\t\t".'$footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('."'.footable'".').footable(); }); jQuery('."'.nav-tabs'".').on('."'click'".', '."'li'".', function() { setTimeout(tableFix, 10); }); }); function tableFix() { jQuery('."'.footable'".').trigger('."'footable_resize'".'); }";'; - $foo .= "\n\t\t\$document->addScriptDeclaration(\$footable);\n"; + $foo .= PHP_EOL.PHP_EOL."\t\t".'$footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('."'.footable'".').footable(); }); jQuery('."'.nav-tabs'".').on('."'click'".', '."'li'".', function() { setTimeout(tableFix, 10); }); }); function tableFix() { jQuery('."'.footable'".').trigger('."'footable_resize'".'); }";'; + $foo .= PHP_EOL."\t\t\$document->addScriptDeclaration(\$footable);".PHP_EOL; } } elseif (3 == $this->footableVersion) // loading version 3 { - $foo = "\n\n\t\t//".$this->setLine(__LINE__)." Add the CSS for Footable"; - $foo .= "\n\t\t".$document."->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css');"; - $foo .= "\n\t\t".$document."->addStyleSheet(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/css/footable.standalone.min.css');"; - $foo .= "\n\t\t//".$this->setLine(__LINE__)." Add the JavaScript for Footable (adding all funtions)"; - $foo .= "\n\t\t".$document."->addScript(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/js/footable.min.js');"; + $foo = PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Add the CSS for Footable"; + $foo .= PHP_EOL."\t\t".$document."->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css');"; + $foo .= PHP_EOL."\t\t".$document."->addStyleSheet(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/css/footable.standalone.min.css');"; + $foo .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Add the JavaScript for Footable (adding all funtions)"; + $foo .= PHP_EOL."\t\t".$document."->addScript(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/js/footable.min.js');"; if ($init) { - $foo .= "\n\n\t\t".'$footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('."'.footable'".').footable();});});";'; - $foo .= "\n\t\t\$document->addScriptDeclaration(\$footable);\n"; + $foo .= PHP_EOL.PHP_EOL."\t\t".'$footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('."'.footable'".').footable();});});";'; + $foo .= PHP_EOL."\t\t\$document->addScriptDeclaration(\$footable);".PHP_EOL; } } return $foo; @@ -6321,14 +6364,14 @@ class Interpretation extends Fields } $counter = 0; // add the default - $body = "\n
"; - $body .= "\n \$item): ?>"; - $body .= "\n\tauthorise('core.manage', 'com_checkin') || \$item->checked_out == \$user->id || \$item->checked_out == 0;"; - $body .= "\n\t\t\$userChkOut = JFactory::getUser(\$item->checked_out);"; - $body .= "\n\t\t\$canDo = ".$Helper."::getActions('".$viewName_single."',\$item,'".$viewName_list."');"; - $body .= "\n\t?>"; - $body .= "\n\t".''; + $body = PHP_EOL.""; + $body .= PHP_EOL." \$item): ?>"; + $body .= PHP_EOL."\tauthorise('core.manage', 'com_checkin') || \$item->checked_out == \$user->id || \$item->checked_out == 0;"; + $body .= PHP_EOL."\t\t\$userChkOut = JFactory::getUser(\$item->checked_out);"; + $body .= PHP_EOL."\t\t\$canDo = ".$Helper."::getActions('".$viewName_single."',\$item,'".$viewName_list."');"; + $body .= PHP_EOL."\t?>"; + $body .= PHP_EOL."\t".''; // check if this view has fields that should not be escaped $doNotEscape = false; if (isset($this->doNotEscape[$viewName_list])) @@ -6383,25 +6426,25 @@ class Interpretation extends Fields { $otherViews = $this->catCodeBuilder[$viewName_single]['views']; // category and linked - $body .= "\n\t\t".'"; + $body .= PHP_EOL."\t\t".'"; } elseif ($item['type'] === 'user' && !$item['title']) { // user and linked - $body .= "\n\t\t".$item['code']."); ?>"; - $body .= "\n\t\t".'"; + $body .= PHP_EOL."\t\t".$item['code']."); ?>"; + $body .= PHP_EOL."\t\t".'"; } else { @@ -6411,9 +6454,9 @@ class Interpretation extends Fields if ($refview === $item['custom']['view']) { // normal not linked - $body .= "\n\t\t"; + $body .= PHP_EOL."\t\t"; $add = false; } @@ -6443,14 +6486,14 @@ class Interpretation extends Fields elseif (isset($item['custom']) && ComponentbuilderHelper::checkArray($item['custom']) && $item['custom']['extends'] === 'user' && !$item['title']) { // user and linked - $body .= "\n\t\t".$item['id']."); ?>"; - $body .= "\n\t\t".'"; + $body .= PHP_EOL."\t\t".$item['id']."); ?>"; + $body .= PHP_EOL."\t\t".'"; $add = false; } @@ -6463,16 +6506,16 @@ class Interpretation extends Fields // make sure the custom links are only added once $firstTimeBeingAdded = false; // start building the links - $customAdminView = "\n\t\t\t".'
'; + $customAdminView = PHP_EOL."\t\t\t".'
'; foreach ($this->customAdminViewListLink[$viewName_list] as $customLinkView) { - $customAdminView .= "\n\t\t\tget('".$customLinkView['link'].".access')): ?>"; - $customAdminView .= "\n\t\t\t\t".'fileContentStatic['###COMPONENT###'].'_'.$customLinkView['NAME']."'".'); ?>" >'; - $customAdminView .= "\n\t\t\t"; - $customAdminView .= "\n\t\t\t\t".'fileContentStatic['###COMPONENT###'].'_'.$customLinkView['NAME']."'".'); ?>">'; - $customAdminView .= "\n\t\t\t"; + $customAdminView .= PHP_EOL."\t\t\tget('".$customLinkView['link'].".access')): ?>"; + $customAdminView .= PHP_EOL."\t\t\t\t".'fileContentStatic['###COMPONENT###'].'_'.$customLinkView['NAME']."'".'); ?>" >'; + $customAdminView .= PHP_EOL."\t\t\t"; + $customAdminView .= PHP_EOL."\t\t\t\t".'fileContentStatic['###COMPONENT###'].'_'.$customLinkView['NAME']."'".'); ?>">'; + $customAdminView .= PHP_EOL."\t\t\t"; } - $customAdminView .= "\n\t\t\t".'
'; + $customAdminView .= PHP_EOL."\t\t\t".'
'; } // check if the item has permissions. @@ -6493,20 +6536,20 @@ class Interpretation extends Fields if ($add) { // set as linked - $body .= "\n\t\t".'"; + $body .= PHP_EOL."\t\t"; } } } @@ -6514,93 +6557,93 @@ class Interpretation extends Fields { if ($item['type'] === 'category') { - $body .= "\n\t\t"; + $body .= PHP_EOL."\t\t"; } elseif (ComponentbuilderHelper::checkArray($item['custom']) && $item['custom']['extends'] === 'user') { // custom user and linked - $body .= "\n\t\t".$item['id']."); ?>"; - $body .= "\n\t\t".'"; + $body .= PHP_EOL."\t\t".$item['id']."); ?>"; + $body .= PHP_EOL."\t\t".'"; } elseif ($item['type'] === 'user') { // user name only - $body .= "\n\t\t".$item['code']."); ?>"; - $body .= "\n\t\t".'"; + $body .= PHP_EOL."\t\t".$item['code']."); ?>"; + $body .= PHP_EOL."\t\t".'"; } else { // normal not linked - $body .= "\n\t\t"; + $body .= PHP_EOL."\t\t"; } } } $counter = $counter + 2; $data_value = (3 == $this->footableVersion) ? 'data-sort-value':'data-value'; // add the defaults - $body .= "\n\t\tpublished == 1):?>"; - $body .= "\n\t\t\t".''; + $body .= PHP_EOL."\t\tpublished == 1):?>"; + $body .= PHP_EOL."\t\t\t".''; - $body .= "\n\t\tpublished == 0):?>"; - $body .= "\n\t\t\t".''; + $body .= PHP_EOL."\t\tpublished == 0):?>"; + $body .= PHP_EOL."\t\t\t".''; - $body .= "\n\t\tpublished == 2):?>"; - $body .= "\n\t\t\t".''; + $body .= PHP_EOL."\t\tpublished == 2):?>"; + $body .= PHP_EOL."\t\t\t".''; - $body .= "\n\t\tpublished == -2):?>"; - $body .= "\n\t\t\t".''; - $body .= "\n\t\t".''; + $body .= PHP_EOL."\t\tpublished == -2):?>"; + $body .= PHP_EOL."\t\t\t".''; + $body .= PHP_EOL."\t\t".''; - $body .= "\n\t\t".'"; - $body .= "\n\t"; - $body .= "\n"; - $body .= "\n"; + $body .= PHP_EOL."\t\t".'"; + $body .= PHP_EOL."\t"; + $body .= PHP_EOL.""; + $body .= PHP_EOL.""; if (2 == $this->footableVersion) { - $body .= "\n".''; - $body .= "\n\t".''; - $body .= "\n\t\t".''; - $body .= "\n\t".''; - $body .= "\n".''; + $body .= PHP_EOL.''; + $body .= PHP_EOL."\t".''; + $body .= PHP_EOL."\t\t".''; + $body .= PHP_EOL."\t".''; + $body .= PHP_EOL.''; } - $body .= "\n".'
").text(this.emptyString))},draw:function(){var a=this,c=a.ft.$el.children("tbody"),d=!0;a.array.length>0?(a.$empty.detach(),b.arr.each(a.array,function(b){(a.expandFirst&&d||a.expandAll)&&(b.expanded=!0,d=!1),b.draw(c)})):(a.$empty.children("td").attr("colspan",a.ft.columns.visibleColspan),c.append(a.$empty))},load:function(c,d){var e=this,f=a.map(c,function(a){return new b.Row(e.ft,e.ft.columns.array,a)});b.arr.each(this.array,function(a){a.predraw()}),this.all=(b.is["boolean"](d)?d:!1)?this.all.concat(f):f,this.array=this.all.slice(0),this.ft.draw()},expand:function(){b.arr.each(this.array,function(a){a.expand()})},collapse:function(){b.arr.each(this.array,function(a){a.collapse()})}}),b.components.register("rows",b.Rows,800)}(jQuery,FooTable),function(a){a.Defaults.prototype.rows=[],a.Defaults.prototype.empty="No results",a.Defaults.prototype.showToggle=!0,a.Defaults.prototype.toggleSelector="tr,td,.footable-toggle",a.Defaults.prototype.toggleColumn="first",a.Defaults.prototype.expandFirst=!1,a.Defaults.prototype.expandAll=!1}(FooTable),function(a){a.Table.prototype.loadRows=function(a,b){this.rows.load(a,b)}}(FooTable); \ No newline at end of file diff --git a/admin/custom/footable3/js/footable.editing.js b/admin/custom/footable3/js/footable.editing.js new file mode 100644 index 000000000..ec2e1861a --- /dev/null +++ b/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 = $('').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 = $('
', {'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 = $('').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: ' Edit rows', + hideText: 'Cancel', + addText: 'New row', + editText: '', + deleteText: '', + viewText: '', + 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} + */ + 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); diff --git a/admin/custom/footable3/js/footable.editing.min.js b/admin/custom/footable3/js/footable.editing.min.js new file mode 100644 index 000000000..c7b23caa3 --- /dev/null +++ b/admin/custom/footable3/js/footable.editing.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){b.Editing=b.Component.extend({construct:function(c){this._super(c,c.o.editing.enabled),this.pageToNew=c.o.editing.pageToNew,this.alwaysShow=c.o.editing.alwaysShow,this.column=a.extend(!0,{},c.o.editing.column,{visible:this.alwaysShow}),this.position=c.o.editing.position,this.showText=c.o.editing.showText,this.hideText=c.o.editing.hideText,this.addText=c.o.editing.addText,this.editText=c.o.editing.editText,this.deleteText=c.o.editing.deleteText,this.viewText=c.o.editing.viewText,this.allowAdd=c.o.editing.allowAdd,this.allowEdit=c.o.editing.allowEdit,this.allowDelete=c.o.editing.allowDelete,this.allowView=c.o.editing.allowView,this._$buttons=null,this.callbacks={addRow:b.checkFnValue(this,c.o.editing.addRow),editRow:b.checkFnValue(this,c.o.editing.editRow),deleteRow:b.checkFnValue(this,c.o.editing.deleteRow),viewRow:b.checkFnValue(this,c.o.editing.viewRow)}},preinit:function(c){var d=this;this.ft.raise("preinit.ft.editing",[c]).then(function(){if(d.ft.$el.hasClass("footable-editing")&&(d.enabled=!0),d.enabled=b.is["boolean"](c.editing)?c.editing:d.enabled,d.enabled){if(d.pageToNew=b.is["boolean"](c.editingPageToNew)?c.editingPageToNew:d.pageToNew,d.alwaysShow=b.is["boolean"](c.editingAlwaysShow)?c.editingAlwaysShow:d.alwaysShow,d.position=b.is.string(c.editingPosition)?c.editingPosition:d.position,d.showText=b.is.string(c.editingShowText)?c.editingShowText:d.showText,d.hideText=b.is.string(c.editingHideText)?c.editingHideText:d.hideText,d.addText=b.is.string(c.editingAddText)?c.editingAddText:d.addText,d.editText=b.is.string(c.editingEditText)?c.editingEditText:d.editText,d.deleteText=b.is.string(c.editingDeleteText)?c.editingDeleteText:d.deleteText,d.viewText=b.is.string(c.editingViewText)?c.editingViewText:d.viewText,d.allowAdd=b.is["boolean"](c.editingAllowAdd)?c.editingAllowAdd:d.allowAdd,d.allowEdit=b.is["boolean"](c.editingAllowEdit)?c.editingAllowEdit:d.allowEdit,d.allowDelete=b.is["boolean"](c.editingAllowDelete)?c.editingAllowDelete:d.allowDelete,d.allowView=b.is["boolean"](c.editingAllowView)?c.editingAllowView:d.allowView,d.column=new b.EditingColumn(d.ft,d,a.extend(!0,{},d.column,c.editingColumn,{visible:d.alwaysShow})),d.ft.$el.hasClass("footable-editing-left")&&(d.position="left"),d.ft.$el.hasClass("footable-editing-right")&&(d.position="right"),"right"===d.position)d.column.index=d.ft.columns.array.length;else{d.column.index=0;for(var e=0,f=d.ft.columns.array.length;f>e;e++)d.ft.columns.array[e].index+=1}d.ft.columns.array.push(d.column),d.ft.columns.array.sort(function(a,b){return a.index-b.index}),d.callbacks.addRow=b.checkFnValue(d,c.editingAddRow,d.callbacks.addRow),d.callbacks.editRow=b.checkFnValue(d,c.editingEditRow,d.callbacks.editRow),d.callbacks.deleteRow=b.checkFnValue(d,c.editingDeleteRow,d.callbacks.deleteRow),d.callbacks.viewRow=b.checkFnValue(d,c.editingViewRow,d.callbacks.viewRow)}},function(){d.enabled=!1})},init:function(){var a=this;this.ft.raise("init.ft.editing").then(function(){a.$create()},function(){a.enabled=!1})},destroy:function(){var a=this;this.ft.raise("destroy.ft.editing").then(function(){a.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()})},$create:function(){var b=this,c="right"===b.position?"footable-editing-right":"footable-editing-left";b.ft.$el.addClass("footable-editing").addClass(c).on("click.ft.editing",".footable-show",{self:b},b._onShowClick).on("click.ft.editing",".footable-hide",{self:b},b._onHideClick).on("click.ft.editing",".footable-edit",{self:b},b._onEditClick).on("click.ft.editing",".footable-delete",{self:b},b._onDeleteClick).on("click.ft.editing",".footable-view",{self:b},b._onViewClick).on("click.ft.editing",".footable-add",{self:b},b._onAddClick),b.$cell=a("").attr("colspan",b.ft.columns.visibleColspan).append(b.$buttonShow()),b.allowAdd&&b.$cell.append(b.$buttonAdd()),b.$cell.append(b.$buttonHide()),b.alwaysShow&&b.ft.$el.addClass("footable-editing-always-show"),b.allowAdd||b.ft.$el.addClass("footable-editing-no-add"),b.allowEdit||b.ft.$el.addClass("footable-editing-no-edit"),b.allowDelete||b.ft.$el.addClass("footable-editing-no-delete"),b.allowView||b.ft.$el.addClass("footable-editing-no-view");var d=b.ft.$el.children("tfoot");0==d.length&&(d=a("
",{"class":"footable-editing"})).html(this.title)},parser:function(c){if(b.is.string(c)&&(c=a(a.trim(c))),b.is.element(c)&&(c=a(c)),b.is.jq(c)){var d=c.prop("tagName").toLowerCase();return"td"==d||"th"==d?c.data("value")||c.contents():c}return null},createCell:function(c){var d=this.editing.$rowButtons(),e=a("").append(d);return b.is.jq(c.$el)&&(0===this.index?e.prependTo(c.$el):e.insertAfter(c.$el.children().eq(this.index-1))),new b.Cell(this.ft,c,this,e||e.html())}}),b.columns.register("editing",b.EditingColumn)}(jQuery,FooTable),function(a,b){b.Defaults.prototype.editing={enabled:!1,pageToNew:!0,position:"right",alwaysShow:!1,addRow:function(){},editRow:function(a){},deleteRow:function(a){},viewRow:function(a){},showText:' Edit rows',hideText:"Cancel",addText:"New row",editText:'',deleteText:'',viewText:'',allowAdd:!0,allowEdit:!0,allowDelete:!0,allowView:!1,column:{classes:"footable-editing",name:"editing",title:"",filterable:!1,sortable:!1}}}(jQuery,FooTable),function(a,b){b.is.defined(b.Paging)&&(b.Paging.prototype.unpaged=[],b.Paging.extend("predraw",function(){this.unpaged=this.ft.rows.array.slice(0),this._super()}))}(jQuery,FooTable),function(a,b){b.Row.prototype.add=function(c){c=b.is["boolean"](c)?c:!0;var d=this;return a.Deferred(function(a){var b=d.ft.rows.all.push(d)-1;return c?d.ft.draw().then(function(){a.resolve(b)}):void a.resolve(b)})},b.Row.prototype["delete"]=function(c){c=b.is["boolean"](c)?c:!0;var d=this;return a.Deferred(function(a){var e=d.ft.rows.all.indexOf(d);return b.is.number(e)&&e>=0&&e=0&&e>b&&(f=this.ft.rows.all[b]),f instanceof FooTable.Row&&a.is.hash(c)&&f.val(c,d)},a.Rows.prototype["delete"]=function(b,c){var d=this.ft.rows.all.length,e=b;a.is.number(b)&&b>=0&&d>b&&(e=this.ft.rows.all[b]),e instanceof FooTable.Row&&e["delete"](c)}}(FooTable); \ No newline at end of file diff --git a/admin/custom/footable3/js/footable.filtering.js b/admin/custom/footable3/js/footable.filtering.js index 3d61fb43f..5b077a715 100644 --- a/admin/custom/footable3/js/footable.filtering.js +++ b/admin/custom/footable3/js/footable.filtering.js @@ -1,925 +1,1044 @@ -/* -* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome. -* @version 3.0.6 -* @link http://fooplugins.com -* @copyright Steven Usher & Brad Vincent 2015 -* @license Released under the GPLv3 license. -*/ -(function(F){ - F.Filter = F.Class.extend(/** @lends FooTable.Filter */{ - /** - * The filter object contains the query to filter by and the columns to apply it to. - * @constructs - * @extends FooTable.Class - * @param {string} name - The name for the filter. - * @param {string} query - The query for the filter. - * @param {Array.} 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. - * @returns {FooTable.Filter} - */ - construct: function(name, query, columns, space, connectors){ - /** - * The name of the filter. - * @instance - * @type {string} - */ - this.name = name; - /** - * A string specifying how the filter treats space characters. Can be either "OR" or "AND". - * @instance - * @type {string} - */ - this.space = F.is.string(space) && (space == 'OR' || space == 'AND') ? space : 'AND'; - /** - * Whether or not to replace phrase connectors (+.-_) with spaces before executing the query. - * @instance - * @type {boolean} - */ - this.connectors = F.is.boolean(connectors) ? connectors : true; - /** - * The query for the filter. - * @instance - * @type {(string|FooTable.Query)} - */ - this.query = new F.Query(query, this.space, this.connectors); - /** - * The columns to apply the query to. - * @instance - * @type {Array.} - */ - this.columns = columns; - }, - /** - * Checks if the current filter matches the supplied string. - * If the current query property is a string it will be auto converted to a {@link FooTable.Query} object to perform the match. - * @instance - * @param {string} str - The string to check. - * @returns {boolean} - */ - 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); - } - return this.query instanceof F.Query ? this.query.match(str) : false; - }, - /** - * Checks if the current filter matches the supplied {@link FooTable.Row}. - * @instance - * @param {FooTable.Row} row - The row to check. - * @returns {boolean} - */ - matchRow: function(row){ - var self = this, text = F.arr.map(row.cells, function(cell){ - return F.arr.contains(self.columns, cell.column) ? cell.filterValue : null; - }).join(' '); - return self.match(text); - } - }); - -})(FooTable); -(function ($, F) { - F.Filtering = F.Component.extend(/** @lends FooTable.Filtering */{ - /** - * The filtering component adds a search input and column selector dropdown to the table allowing users to filter the using space delimited queries. - * @constructs - * @extends FooTable.Component - * @param {FooTable.Table} table - The parent {@link FooTable.Table} object for the component. - * @returns {FooTable.Filtering} - */ - construct: function (table) { - // call the constructor of the base class - this._super(table, table.o.filtering.enabled); - - /* PUBLIC */ - /** - * The filters to apply to the current {@link FooTable.Rows#array}. - * @instance - * @type {Array.} - */ - this.filters = table.o.filtering.filters; - /** - * The delay in milliseconds before the query is auto applied after a change. - * @instance - * @type {number} - */ - this.delay = table.o.filtering.delay; - /** - * The minimum number of characters allowed in the search input before it is auto applied. - * @instance - * @type {number} - */ - this.min = table.o.filtering.min; - /** - * Specifies how whitespace in a filter query is handled. - * @instance - * @type {string} - */ - this.space = table.o.filtering.space; - /** - * Whether or not to replace phrase connectors (+.-_) with spaces before executing the query. - * @instance - * @type {boolean} - */ - this.connectors = table.o.filtering.connectors; - /** - * The placeholder text to display within the search $input. - * @instance - * @type {string} - */ - this.placeholder = table.o.filtering.placeholder; - /** - * The position of the $search input within the filtering rows cell. - * @type {string} - */ - this.position = table.o.filtering.position; - /** - * The jQuery row object that contains all the filtering specific elements. - * @instance - * @type {jQuery} - */ - this.$row = null; - /** - * The jQuery cell object that contains the search input and column selector. - * @instance - * @type {jQuery} - */ - this.$cell = null; - /** - * The jQuery object of the column selector dropdown. - * @instance - * @type {jQuery} - */ - this.$dropdown = null; - /** - * The jQuery object of the search input. - * @instance - * @type {jQuery} - */ - this.$input = null; - /** - * The jQuery object of the search button. - * @instance - * @type {jQuery} - */ - this.$button = null; - - /* PRIVATE */ - /** - * The timeout ID for the filter changed event. - * @instance - * @private - * @type {?number} - */ - this._filterTimeout = null; - }, - - /* PROTECTED */ - /** - * Checks the supplied data and options for the filtering component. - * @instance - * @protected - * @param {object} data - The jQuery data object from the parent table. - * @fires FooTable.Filtering#"preinit.ft.filtering" - */ - preinit: function(data){ - var self = this; - /** - * The preinit.ft.filtering 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.Filtering#"preinit.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 {object} data - The jQuery data object of the table raising the event. - */ - this.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; - // then check if the data-filtering-enabled attribute has been set - self.enabled = F.is.boolean(data.filtering) - ? data.filtering - : self.enabled; - - // if filtering is not enabled exit early as we don't need to do anything else - if (!self.enabled) return; - - self.space = F.is.string(data.filterSpace) - ? data.filterSpace - : self.space; - - self.min = F.is.number(data.filterMin) - ? data.filterMin - : self.min; - - self.connectors = F.is.number(data.filterConnectors) - ? data.filterConnectors - : self.connectors; - - self.delay = F.is.number(data.filterDelay) - ? data.filterDelay - : self.delay; - - self.placeholder = F.is.number(data.filterPlaceholder) - ? data.filterPlaceholder - : self.placeholder; - - self.filters = F.is.array(data.filterFilters) - ? self.ensure(data.filterFilters) - : self.ensure(self.filters); - - if (self.ft.$el.hasClass('footable-filtering-left')) - self.position = 'left'; - if (self.ft.$el.hasClass('footable-filtering-center')) - self.position = 'center'; - if (self.ft.$el.hasClass('footable-filtering-right')) - self.position = 'right'; - - self.position = F.is.string(data.filterPosition) - ? data.filterPosition - : self.position; - },function(){ - self.enabled = false; - }); - }, - /** - * Initializes the filtering component for the plugin. - * @instance - * @protected - * @fires FooTable.Filtering#"init.ft.filtering" - */ - init: function () { - var self = this; - /** - * The init.ft.filtering event is raised before its UI is generated. - * Calling preventDefault on this event will disable the component. - * @event FooTable.Filtering#"init.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. - */ - this.ft.raise('init.ft.filtering').then(function(){ - self.$create(); - }, function(){ - self.enabled = false; - }); - }, - /** - * Destroys the filtering component removing any UI from the table. - * @instance - * @protected - * @fires FooTable.Filtering#"destroy.ft.filtering" - */ - destroy: function () { - /** - * The destroy.ft.filtering event is raised before its UI is removed. - * Calling preventDefault on this event will prevent the component from being destroyed. - * @event FooTable.Filtering#"destroy.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. - */ - var self = this; - this.ft.raise('destroy.ft.filtering').then(function(){ - self.ft.$el.removeClass('footable-filtering') - .find('thead > tr.footable-filtering').remove(); - }); - }, - /** - * Creates the filtering UI from the current options setting the various jQuery properties of this component. - * @instance - * @protected - * @this FooTable.Filtering - */ - $create: function () { - var self = this; - // generate the cell that actually contains all the UI. - var $form_grp = $('
', {'class': 'form-group'}) - .append($('
').attr('colspan', self.ft.columns.visibleColspan).appendTo(self.$row); - self.$form = $('
', {'class': 'form-inline'}).append($form_grp).appendTo(self.$cell); - - self.$input = $('', {type: 'text', 'class': 'form-control', placeholder: self.placeholder}); - - self.$button = $('
The below shows what is meant by the "left" side of a queryThe below shows what is meant by the "right" side of a query
').attr('colspan', self.ft.columns.visibleColspan).appendTo(self.$row); + self.$form = $('', {'class': 'form-inline'}).append($form_grp).appendTo(self.$cell); + + self.$input = $('', {type: 'text', 'class': 'form-control', placeholder: self.placeholder}); + + self.$button = $('
The below shows what is meant by the "left" side of a queryThe below shows what is meant by the "right" side of a query
").attr("colspan",d.ft.columns.visibleColspan).appendTo(d.$row),d.$form=a("",{"class":"form-inline"}).append(e).appendTo(d.$cell),d.$input=a("",{type:"text","class":"form-control",placeholder:d.placeholder}),d.$button=a("
").attr("colspan",d.ft.columns.visibleColspan).appendTo(d.$row),d.$form=a("",{"class":"form-inline"}).append(e).appendTo(d.$cell),d.$input=a("",{type:"text","class":"form-control",placeholder:d.placeholder}),d.$button=a("').attr('colspan', self.ft.columns.visibleColspan); - var $tfoot = self.ft.$el.children('tfoot'); - if ($tfoot.length == 0){ - $tfoot = $('
').attr('colspan', this.ft.columns.visibleColspan); + var $tfoot = this.ft.$el.children('tfoot'); + if ($tfoot.length == 0){ + $tfoot = $('
").attr("colspan",c.ft.columns.visibleColspan);var f=c.ft.$el.children("tfoot");0==f.length&&(f=a("
").attr("colspan",this.ft.columns.visibleColspan);var c=this.ft.$el.children("tfoot");0==c.length&&(c=a("
This example shows using pseudo code what a sort function would look like.This example shows using pseudo code what a sort function would look like.
'; + $body .= PHP_EOL."\t\t".''; // check if the item has permissions. if ($coreLoad && isset($core['core.edit.state']) && isset($this->permissionBuilder['global'][$core['core.edit.state']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit.state']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.edit.state']])) { - $body .= "\n\t\tget('".$core['core.edit.state']."')): ?>"; + $body .= PHP_EOL."\t\tget('".$core['core.edit.state']."')): ?>"; } else { - $body .= "\n\t\tget('core.edit.state')): ?>"; + $body .= PHP_EOL."\t\tget('core.edit.state')): ?>"; } - $body .= "\n\t\t\tsaveOrder)"; - $body .= "\n\t\t\t\t{"; - $body .= "\n\t\t\t\t\t\$iconClass = ' inactive';"; - $body .= "\n\t\t\t\t}"; - $body .= "\n\t\t\t\telse"; - $body .= "\n\t\t\t\t{"; - $body .= "\n\t\t\t\t\t\$iconClass = ' inactive tip-top".'" hasTooltip" title="'."' . JHtml::tooltipText('JORDERINGDISABLED');"; - $body .= "\n\t\t\t\t}"; - $body .= "\n\t\t\t?>"; - $body .= "\n\t\t\t".''; - $body .= "\n\t\t\t\t".''; - $body .= "\n\t\t\t"; - $body .= "\n\t\t\tsaveOrder) : ?>"; - $body .= "\n\t\t\t\t".''; - $body .= "\n\t\t\t"; - $body .= "\n\t\t"; - $body .= "\n\t\t\t⋮"; - $body .= "\n\t\t"; - $body .= "\n\t\t'; + $body .= PHP_EOL."\t\t".''; // check if the item has permissions. if ($coreLoad && isset($core['core.edit']) && isset($this->permissionBuilder['global'][$core['core.edit']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.edit']])) { - $body .= "\n\t\tget('".$core['core.edit']."')): ?>"; + $body .= PHP_EOL."\t\tget('".$core['core.edit']."')): ?>"; } else { - $body .= "\n\t\tget('core.edit')): ?>"; + $body .= PHP_EOL."\t\tget('core.edit')): ?>"; } - $body .= "\n\t\t\t\tchecked_out) : ?>"; - $body .= "\n\t\t\t\t\t"; - $body .= "\n\t\t\t\t\t\tid); ?>"; - $body .= "\n\t\t\t\t\t"; - $body .= "\n\t\t\t\t\t\t□"; - $body .= "\n\t\t\t\t\t"; - $body .= "\n\t\t\t\t"; - $body .= "\n\t\t\t\t\tid); ?>"; - $body .= "\n\t\t\t\t"; - $body .= "\n\t\t"; - $body .= "\n\t\t\t□"; - $body .= "\n\t\t"; - $body .= "\n\t\t'; - $body .= "\n\t\t\tuser->authorise('core.edit', 'com_".$this->fileContentStatic['###component###'].".".$otherViews.".category.' . (int)\$item->".$item['code'].")): ?>"; - $body .= "\n\t\t\t\t".'escape($item->category_title); ?>'; - $body .= "\n\t\t\t"; - $body .= "\n\t\t\t\tescape(\$item->category_title); ?>"; - $body .= "\n\t\t\t"; - $body .= "\n\t\t'; + $body .= PHP_EOL."\t\t\tuser->authorise('core.edit', 'com_".$this->fileContentStatic['###component###'].".".$otherViews.".category.' . (int)\$item->".$item['code'].")): ?>"; + $body .= PHP_EOL."\t\t\t\t".'escape($item->category_title); ?>'; + $body .= PHP_EOL."\t\t\t"; + $body .= PHP_EOL."\t\t\t\tescape(\$item->category_title); ?>"; + $body .= PHP_EOL."\t\t\t"; + $body .= PHP_EOL."\t\t'; - $body .= "\n\t\t\tuser->authorise('core.edit', 'com_users')): ?>"; - $body .= "\n\t\t\t\t".'name; ?>'; - $body .= "\n\t\t\t"; - $body .= "\n\t\t\t\tname; ?>"; - $body .= "\n\t\t\t"; - $body .= "\n\t\t'; + $body .= PHP_EOL."\t\t\tuser->authorise('core.edit', 'com_users')): ?>"; + $body .= PHP_EOL."\t\t\t\t".'name; ?>'; + $body .= PHP_EOL."\t\t\t"; + $body .= PHP_EOL."\t\t\t\tname; ?>"; + $body .= PHP_EOL."\t\t\t"; + $body .= PHP_EOL."\t\t'; - $body .= "\n\t\t\tuser->authorise('core.edit', 'com_users')): ?>"; - $body .= "\n\t\t\t\t".'name; ?>'; - $body .= "\n\t\t\t"; - $body .= "\n\t\t\t\tname; ?>"; - $body .= "\n\t\t\t"; - $body .= "\n\t\t'; + $body .= PHP_EOL."\t\t\tuser->authorise('core.edit', 'com_users')): ?>"; + $body .= PHP_EOL."\t\t\t\t".'name; ?>'; + $body .= PHP_EOL."\t\t\t"; + $body .= PHP_EOL."\t\t\t\tname; ?>"; + $body .= PHP_EOL."\t\t\t"; + $body .= PHP_EOL."\t\t'; - $body .= "\n\t\t\t"; - $body .= "\n\t\t\t\t".'
'."\n\t\t\t\t\t".''.$itemCode.''; + $body .= PHP_EOL."\t\t".'
'; + $body .= PHP_EOL."\t\t\t"; + $body .= PHP_EOL."\t\t\t\t".'
'.PHP_EOL."\t\t\t\t\t".''.$itemCode.''; if ($checkoutTriger) { - $body .= "\n\t\t\t\t\tchecked_out): ?>"; - $body .= "\n\t\t\t\t\t\tname, \$item->checked_out_time, '".$viewName_list.".', \$canCheckin); ?>"; - $body .= "\n\t\t\t\t\t"; + $body .= PHP_EOL."\t\t\t\t\tchecked_out): ?>"; + $body .= PHP_EOL."\t\t\t\t\t\tname, \$item->checked_out_time, '".$viewName_list.".', \$canCheckin); ?>"; + $body .= PHP_EOL."\t\t\t\t\t"; } - $body .= "\n\t\t\t\t".'
'; - $body .= "\n\t\t\t"; - $body .= "\n\t\t\t\t".'
'.$itemCode.'
'; - $body .= "\n\t\t\t"; + $body .= PHP_EOL."\t\t\t\t".''; + $body .= PHP_EOL."\t\t\t"; + $body .= PHP_EOL."\t\t\t\t".'
'.$itemCode.'
'; + $body .= PHP_EOL."\t\t\t"; $body .= $customAdminView; - $body .= "\n\t\t		"; - $body .= "\n\t\t\tescape(\$item->category_title); ?>"; - $body .= "\n\t\t"; + $body .= PHP_EOL."\t\t\tescape(\$item->category_title); ?>"; + $body .= PHP_EOL."\t\t'; - $body .= "\n\t\t\tuser->authorise('core.edit', 'com_users')): ?>"; - $body .= "\n\t\t\t\t".'name; ?>'; - $body .= "\n\t\t\t"; - $body .= "\n\t\t\t\tname; ?>"; - $body .= "\n\t\t\t"; - $body .= "\n\t\t'; + $body .= PHP_EOL."\t\t\tuser->authorise('core.edit', 'com_users')): ?>"; + $body .= PHP_EOL."\t\t\t\t".'name; ?>'; + $body .= PHP_EOL."\t\t\t"; + $body .= PHP_EOL."\t\t\t\tname; ?>"; + $body .= PHP_EOL."\t\t\t"; + $body .= PHP_EOL."\t\t'; - $body .= "\n\t\t\tname; ?>"; - $body .= "\n\t\t'; + $body .= PHP_EOL."\t\t\tname; ?>"; + $body .= PHP_EOL."\t\t"; - $body .= "\n\t\t\t".$itemCode; - $body .= "\n\t\t"; + $body .= PHP_EOL."\t\t\t".$itemCode; + $body .= PHP_EOL."\t\t'; + $body .= PHP_EOL."\t\t".''; // check if the item has permissions. if ($coreLoad && isset($core['core.edit.state']) && isset($this->permissionBuilder['global'][$core['core.edit.state']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit.state']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.edit.state']])) { - $body .= "\n\t\tget('".$core['core.edit.state']."')) : ?>"; + $body .= PHP_EOL."\t\tget('".$core['core.edit.state']."')) : ?>"; } else { - $body .= "\n\t\tget('core.edit.state')) : ?>"; + $body .= PHP_EOL."\t\tget('core.edit.state')) : ?>"; } - $body .= "\n\t\t\t\tchecked_out) : ?>"; - $body .= "\n\t\t\t\t\t"; - $body .= "\n\t\t\t\t\t\tpublished, \$i, '".$viewName_list.".', true, 'cb'); ?>"; - $body .= "\n\t\t\t\t\t"; - $body .= "\n\t\t\t\t\t\tpublished, \$i, '".$viewName_list.".', false, 'cb'); ?>"; - $body .= "\n\t\t\t\t\t"; - $body .= "\n\t\t\t\t"; - $body .= "\n\t\t\t\t\tpublished, \$i, '".$viewName_list.".', true, 'cb'); ?>"; - $body .= "\n\t\t\t\t"; - $body .= "\n\t\t"; - $body .= "\n\t\t\tpublished, \$i, '".$viewName_list.".', false, 'cb'); ?>"; - $body .= "\n\t\t"; - $body .= "\n\t\t'; - $body .= "\n\t\t\tid; ?>"; - $body .= "\n\t\t'; + $body .= PHP_EOL."\t\t\tid; ?>"; + $body .= PHP_EOL."\t\t
'; - $head .= "\n\t\t\t'."', 'ordering', \$this->listDirn, \$this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>"; - $head .= "\n\t\t'; + $head .= PHP_EOL."\t\t\t'."', 'ordering', \$this->listDirn, \$this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>"; + $head .= PHP_EOL."\t\t'; - $head .= "\n\t\t\t"; - $head .= "\n\t\t'; - $head .= "\n\t\t\t▾"; - $head .= "\n\t\t'; - $head .= "\n\t\t\t■"; - $head .= "\n\t\t'; + $head .= PHP_EOL."\t\t\t"; + $head .= PHP_EOL."\t\t'; + $head .= PHP_EOL."\t\t\t▾"; + $head .= PHP_EOL."\t\t'; + $head .= PHP_EOL."\t\t\t■"; + $head .= PHP_EOL."\t\t'; - $head .= "\n\t\t\t".$title; - $head .= "\n\t'; + $head .= PHP_EOL."\t\t\t".$title; + $head .= PHP_EOL."\t'; - $head .= "\n\t\t\tlistDirn, \$this->listOrder); ?>"; - $head .= "\n\t\t'; - $head .= "\n\t\t\t"; - $head .= "\n\t\t'; + $head .= PHP_EOL."\t\t\tlistDirn, \$this->listOrder); ?>"; + $head .= PHP_EOL."\t\t'; + $head .= PHP_EOL."\t\t\t"; + $head .= PHP_EOL."\t\t'; - $head .= "\n\t\t\tlistDirn, \$this->listOrder); ?>"; - $head .= "\n\t'; + $head .= PHP_EOL."\t\t\tlistDirn, \$this->listOrder); ?>"; + $head .= PHP_EOL."\t
'; - $body .= "\n\t\t\tauthorise('core.edit', 'com_".$this->fileContentStatic['###component###'].".".$otherViews.".category.' . (int)\$item->".$item['code'].")): ?>"; - $body .= "\n\t\t\t\t".'escape($item->category_title); ?>'; - $body .= "\n\t\t\t"; - $body .= "\n\t\t\t\tescape(\$item->category_title); ?>"; - $body .= "\n\t\t\t"; - $body .= "\n\t\t'; + $body .= PHP_EOL."\t\t\tauthorise('core.edit', 'com_".$this->fileContentStatic['###component###'].".".$otherViews.".category.' . (int)\$item->".$item['code'].")): ?>"; + $body .= PHP_EOL."\t\t\t\t".'escape($item->category_title); ?>'; + $body .= PHP_EOL."\t\t\t"; + $body .= PHP_EOL."\t\t\t\tescape(\$item->category_title); ?>"; + $body .= PHP_EOL."\t\t\t"; + $body .= PHP_EOL."\t\t'; - $body .= "\n\t\t\tauthorise('core.edit', 'com_users')): ?>"; - $body .= "\n\t\t\t\t".'name; ?>'; - $body .= "\n\t\t\t"; - $body .= "\n\t\t\t\tname; ?>"; - $body .= "\n\t\t\t"; - $body .= "\n\t\t'; + $body .= PHP_EOL."\t\t\tauthorise('core.edit', 'com_users')): ?>"; + $body .= PHP_EOL."\t\t\t\t".'name; ?>'; + $body .= PHP_EOL."\t\t\t"; + $body .= PHP_EOL."\t\t\t\tname; ?>"; + $body .= PHP_EOL."\t\t\t"; + $body .= PHP_EOL."\t\t"; - $body .= "\n\t\t\t".$itemCode; - $body .= "\n\t\t"; + $body .= PHP_EOL."\t\t\t".$itemCode; + $body .= PHP_EOL."\t\t'; - $body .= "\n\t\t\tauthorise('core.edit', 'com_users')): ?>"; - $body .= "\n\t\t\t\t".'name; ?>'; - $body .= "\n\t\t\t"; - $body .= "\n\t\t\t\tname; ?>"; - $body .= "\n\t\t\t"; - $body .= "\n\t\t'; + $body .= PHP_EOL."\t\t\tauthorise('core.edit', 'com_users')): ?>"; + $body .= PHP_EOL."\t\t\t\t".'name; ?>'; + $body .= PHP_EOL."\t\t\t"; + $body .= PHP_EOL."\t\t\t\tname; ?>"; + $body .= PHP_EOL."\t\t\t"; + $body .= PHP_EOL."\t\t'; - $body .= "\n\t\t\t"; - $body .= "\n\t\t\t\t".''.$itemCode.''; + $body .= PHP_EOL."\t\t".''; + $body .= PHP_EOL."\t\t\t"; + $body .= PHP_EOL."\t\t\t\t".''.$itemCode.''; if ($checkoutTriger) { - $body .= "\n\t\t\t\t\tchecked_out): ?>"; - $body .= "\n\t\t\t\t\t\tname, \$item->checked_out_time, '".$viewName_list.".', \$canCheckin); ?>"; - $body .= "\n\t\t\t\t\t"; + $body .= PHP_EOL."\t\t\t\t\tchecked_out): ?>"; + $body .= PHP_EOL."\t\t\t\t\t\tname, \$item->checked_out_time, '".$viewName_list.".', \$canCheckin); ?>"; + $body .= PHP_EOL."\t\t\t\t\t"; } - $body .= "\n\t\t\t"; - $body .= "\n\t\t\t\t".'
'.$itemCode.'
'; - $body .= "\n\t\t\t"; + $body .= PHP_EOL."\t\t\t"; + $body .= PHP_EOL."\t\t\t\t".'
'.$itemCode.'
'; + $body .= PHP_EOL."\t\t\t"; $body .= $customAdminView; - $body .= "\n\t\t		"; - $body .= "\n\t\t\tescape(\$item->category_title); ?>"; - $body .= "\n\t\t"; + $body .= PHP_EOL."\t\t\tescape(\$item->category_title); ?>"; + $body .= PHP_EOL."\t\t'; - $body .= "\n\t\t\tauthorise('core.edit', 'com_users')): ?>"; - $body .= "\n\t\t\t\t".'name; ?>'; - $body .= "\n\t\t\t"; - $body .= "\n\t\t\t\tname; ?>"; - $body .= "\n\t\t\t"; - $body .= "\n\t\t'; + $body .= PHP_EOL."\t\t\tauthorise('core.edit', 'com_users')): ?>"; + $body .= PHP_EOL."\t\t\t\t".'name; ?>'; + $body .= PHP_EOL."\t\t\t"; + $body .= PHP_EOL."\t\t\t\tname; ?>"; + $body .= PHP_EOL."\t\t\t"; + $body .= PHP_EOL."\t\t'; - $body .= "\n\t\t\tname; ?>"; - $body .= "\n\t\t'; + $body .= PHP_EOL."\t\t\tname; ?>"; + $body .= PHP_EOL."\t\t"; - $body .= "\n\t\t\t".$itemCode; - $body .= "\n\t\t"; + $body .= PHP_EOL."\t\t\t".$itemCode; + $body .= PHP_EOL."\t\t'; - $body .= "\n\t\t\t\t".'">'; - $body .= "\n\t\t\t\t\t".''; - $body .= "\n\t\t\t\t".''; - $body .= "\n\t\t\t".''; + $body .= PHP_EOL."\t\t\t\t".'">'; + $body .= PHP_EOL."\t\t\t\t\t".''; + $body .= PHP_EOL."\t\t\t\t".''; + $body .= PHP_EOL."\t\t\t".''; - $body .= "\n\t\t\t\t".'">'; - $body .= "\n\t\t\t\t\t".''; - $body .= "\n\t\t\t\t".''; - $body .= "\n\t\t\t".''; + $body .= PHP_EOL."\t\t\t\t".'">'; + $body .= PHP_EOL."\t\t\t\t\t".''; + $body .= PHP_EOL."\t\t\t\t".''; + $body .= PHP_EOL."\t\t\t".''; - $body .= "\n\t\t\t\t".'">'; - $body .= "\n\t\t\t\t\t".''; - $body .= "\n\t\t\t\t".''; - $body .= "\n\t\t\t".''; + $body .= PHP_EOL."\t\t\t\t".'">'; + $body .= PHP_EOL."\t\t\t\t\t".''; + $body .= PHP_EOL."\t\t\t\t".''; + $body .= PHP_EOL."\t\t\t".''; - $body .= "\n\t\t\t\t".'">'; - $body .= "\n\t\t\t\t\t".''; - $body .= "\n\t\t\t\t".''; - $body .= "\n\t\t\t".''; + $body .= PHP_EOL."\t\t\t\t".'">'; + $body .= PHP_EOL."\t\t\t\t\t".''; + $body .= PHP_EOL."\t\t\t\t".''; + $body .= PHP_EOL."\t\t\t".''; - $body .= "\n\t\t\tid; ?>"; - $body .= "\n\t\t
'; + $body .= PHP_EOL."\t\t\tid; ?>"; + $body .= PHP_EOL."\t\t
'; - $body .= "\n\t\t\t".''; - $body .= "\n\t\t".'
'; + $body .= PHP_EOL."\t\t\t".''; + $body .= PHP_EOL."\t\t".'
'; - $body .= "\n".''; - $body .= "\n\t".'
'; - $body .= "\n\t\t".''; - $body .= "\n\t".'
'; - $body .= "\n".''; + $body .= PHP_EOL.'
'; + $body .= PHP_EOL.''; + $body .= PHP_EOL."\t".'
'; + $body .= PHP_EOL."\t\t".''; + $body .= PHP_EOL."\t".'
'; + $body .= PHP_EOL.''; // return the build return $body; } @@ -6637,8 +6680,8 @@ class Interpretation extends Fields } // add a button for new $head = ''; - $head .= "\n\t".' langPrefix."_NEW'".'); ?>

'; - $head .= "\n".''."\n"; + $head .= PHP_EOL."\t".' langPrefix."_NEW'".'); ?>

'; + $head .= PHP_EOL.''.PHP_EOL; } $head .= ''; // set the style for V2 @@ -6649,8 +6692,8 @@ class Interpretation extends Fields $paging = (2 == $this->footableVersion) ?' data-page-size="20" data-filter="#filter_'.$viewName_list.'"':' data-sorting="true" data-paging="true" data-paging-size="20" data-filtering="true"'; // add html fix for V3 $htmlFix = (3 == $this->footableVersion) ? ' data-type="html" data-sort-use="text"':''; - $head .= "\n".''; - $head .= "\n"; + $head .= PHP_EOL.'
'; + $head .= PHP_EOL.""; // main lang prefix $langView = $this->langPrefix.'_'.ComponentbuilderHelper::safeString($viewName_single,'U'); // set status lang @@ -6669,7 +6712,7 @@ class Interpretation extends Fields { $this->langContent[$this->lang][$idLangName] = 'Id'; } - $head .= "\n\t"; + $head .= PHP_EOL."\t"; // set controller for data hiding options $controller = 1; // build the dynamic fields @@ -6691,23 +6734,23 @@ class Interpretation extends Fields $setin = (2 == $this->footableVersion) ? ' data-toggle="true"':''; $firstLink = false; } - $head .= "\n\t\t"; - $head .= "\n\t\t\t"; - $head .= "\n\t\t"; + $head .= PHP_EOL."\t\t"; + $head .= PHP_EOL."\t\t\t"; + $head .= PHP_EOL."\t\t"; $controller++; } // set some V3 attr $data_hide = (2 == $this->footableVersion) ? 'data-hide="phone,tablet"' : 'data-breakpoints="xs sm md"'; $data_type = (2 == $this->footableVersion) ? 'data-type="numeric"':'data-type="number"'; // set default - $head .= "\n\t\t".'"; - $head .= "\n\t\t".'"; - $head .= "\n\t"; - $head .= "\n"; + $head .= PHP_EOL."\t\t".'"; + $head .= PHP_EOL."\t\t".'"; + $head .= PHP_EOL."\t"; + $head .= PHP_EOL.""; return $head; } @@ -6737,79 +6780,80 @@ class Interpretation extends Fields { $addCategory = false; } - $query = "\n\n\t/**"; - $query .= "\n\t* Method to get list data."; - $query .= "\n\t*"; - $query .= "\n\t* @return mixed An array of data items on success, false on failure."; - $query .= "\n\t*/"; - $query .= "\n\tpublic function get".$functionName."()"; - $query .= "\n\t{"; + $query = PHP_EOL.PHP_EOL."\t/**"; + $query .= PHP_EOL."\t* Method to get list data."; + $query .= PHP_EOL."\t*"; + $query .= PHP_EOL."\t* @return mixed An array of data items on success, false on failure."; + $query .= PHP_EOL."\t*/"; + $query .= PHP_EOL."\tpublic function get".$functionName."()"; + $query .= PHP_EOL."\t{"; // setup the query - $query .= "\n\t\t//".$this->setLine(__LINE__)." Get the user object."; - $query .= "\n\t\t\$user = JFactory::getUser();"; - $query .= "\n\t\t//".$this->setLine(__LINE__)." Create a new query object."; - $query .= "\n\t\t\$db = JFactory::getDBO();"; - $query .= "\n\t\t\$query = \$db->getQuery(true);"; - $query .= "\n\n\t\t//".$this->setLine(__LINE__)." Select some fields"; - $query .= "\n\t\t\$query->select('a.*');"; + $query .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the user object."; + $query .= PHP_EOL."\t\t\$user = JFactory::getUser();"; + $query .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Create a new query object."; + $query .= PHP_EOL."\t\t\$db = JFactory::getDBO();"; + $query .= PHP_EOL."\t\t\$query = \$db->getQuery(true);"; + $query .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Select some fields"; + $query .= PHP_EOL."\t\t\$query->select('a.*');"; // add the category if ($addCategory) { - $query .= "\n\t\t\$query->select(\$db->quoteName('c.title','category_title'));"; + $query .= PHP_EOL."\t\t\$query->select(\$db->quoteName('c.title','category_title'));"; } - $query .= "\n\n\t\t//".$this->setLine(__LINE__)." From the ".$this->fileContentStatic['###component###']."_".$viewName_single." table"; - $query .= "\n\t\t\$query->from(\$db->quoteName('#__".$this->fileContentStatic['###component###']."_".$viewName_single."', 'a'));"; + $query .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." From the ".$this->fileContentStatic['###component###']."_".$viewName_single." table"; + $query .= PHP_EOL."\t\t\$query->from(\$db->quoteName('#__".$this->fileContentStatic['###component###']."_".$viewName_single."', 'a'));"; // add the category if ($addCategory) { - $query .= "\n\t\t\$query->join('LEFT', \$db->quoteName('#__categories', 'c') . ' ON (' . \$db->quoteName('a.".$categoryCodeName."') . ' = ' . \$db->quoteName('c.id') . ')');"; + $query .= PHP_EOL."\t\t\$query->join('LEFT', \$db->quoteName('#__categories', 'c') . ' ON (' . \$db->quoteName('a.".$categoryCodeName."') . ' = ' . \$db->quoteName('c.id') . ')');"; } // add custom filtering php - $query .= $this->getCustomScriptBuilder('php_getlistquery', $viewName_single, "\n\n"); + $query .= $this->getCustomScriptBuilder('php_getlistquery', $viewName_single, PHP_EOL.PHP_EOL); // add the custom fields query $query .= $this->setCustomQuery($viewName_list, $viewName_single); if ($key && strpos($key,'-R>') === false && strpos($key,'-A>') === false && strpos($parentKey,'-R>') === false && strpos($parentKey,'-A>') === false) { - $query .= "\n\n\t\t//".$this->setLine(__LINE__)." Filter by ".$globalKey." global."; - $query .= "\n\t\t\$".$globalKey." = \$this->".$globalKey.";"; - $query .= "\n\t\tif (is_numeric(\$".$globalKey." ))"; - $query .= "\n\t\t{"; - $query .= "\n\t\t\t\$query->where('a.".$key." = ' . (int) \$".$globalKey." );"; - $query .= "\n\t\t}"; - $query .= "\n\t\telseif (is_string(\$".$globalKey."))"; - $query .= "\n\t\t{"; - $query .= "\n\t\t\t\$query->where('a.".$key." = ' . \$db->quote(\$".$globalKey."));"; - $query .= "\n\t\t}"; - $query .= "\n\t\telse"; - $query .= "\n\t\t{"; - $query .= "\n\t\t\t\$query->where('a.".$key." = -5');"; - $query .= "\n\t\t}"; + $query .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Filter by ".$globalKey." global."; + $query .= PHP_EOL."\t\t\$".$globalKey." = \$this->".$globalKey.";"; + $query .= PHP_EOL."\t\tif (is_numeric(\$".$globalKey." ))"; + $query .= PHP_EOL."\t\t{"; + $query .= PHP_EOL."\t\t\t\$query->where('a.".$key." = ' . (int) \$".$globalKey." );"; + $query .= PHP_EOL."\t\t}"; + $query .= PHP_EOL."\t\telseif (is_string(\$".$globalKey."))"; + $query .= PHP_EOL."\t\t{"; + $query .= PHP_EOL."\t\t\t\$query->where('a.".$key." = ' . \$db->quote(\$".$globalKey."));"; + $query .= PHP_EOL."\t\t}"; + $query .= PHP_EOL."\t\telse"; + $query .= PHP_EOL."\t\t{"; + $query .= PHP_EOL."\t\t\t\$query->where('a.".$key." = -5');"; + $query .= PHP_EOL."\t\t}"; } if (isset($this->accessBuilder[$viewName_single]) && ComponentbuilderHelper::checkString($this->accessBuilder[$viewName_single])) { - $query .= "\n\n\t\t//".$this->setLine(__LINE__)." Join over the asset groups."; - $query .= "\n\t\t\$query->select('ag.title AS access_level');"; - $query .= "\n\t\t\$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');"; - $query .= "\n\t\t//".$this->setLine(__LINE__)." Filter by access level."; - $query .= "\n\t\tif (\$access = \$this->getState('filter.access'))"; - $query .= "\n\t\t{"; - $query .= "\n\t\t\t\$query->where('a.access = ' . (int) \$access);"; - $query .= "\n\t\t}"; - $query .= "\n\t\t//".$this->setLine(__LINE__)." Implement View Level Access"; - $query .= "\n\t\tif (!\$user->authorise('core.options', 'com_".$this->fileContentStatic['###component###']."'))"; - $query .= "\n\t\t{"; - $query .= "\n\t\t\t\$groups = implode(',', \$user->getAuthorisedViewLevels());"; - $query .= "\n\t\t\t\$query->where('a.access IN (' . \$groups . ')');"; - $query .= "\n\t\t}"; + $query .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Join over the asset groups."; + $query .= PHP_EOL."\t\t\$query->select('ag.title AS access_level');"; + $query .= PHP_EOL."\t\t\$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');"; + $query .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Filter by access level."; + $query .= PHP_EOL."\t\tif (\$access = \$this->getState('filter.access'))"; + $query .= PHP_EOL."\t\t{"; + $query .= PHP_EOL."\t\t\t\$query->where('a.access = ' . (int) \$access);"; + $query .= PHP_EOL."\t\t}"; + $query .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Implement View Level Access"; + $query .= PHP_EOL."\t\tif (!\$user->authorise('core.options', 'com_".$this->fileContentStatic['###component###']."'))"; + $query .= PHP_EOL."\t\t{"; + $query .= PHP_EOL."\t\t\t\$groups = implode(',', \$user->getAuthorisedViewLevels());"; + $query .= PHP_EOL."\t\t\t\$query->where('a.access IN (' . \$groups . ')');"; + $query .= PHP_EOL."\t\t}"; } - $query .= "\n\n\t\t//".$this->setLine(__LINE__)." Order the results by ordering"; - $query .= "\n\t\t\$query->order('a.published ASC');"; $query .= "\n\t\t\$query->order('a.ordering ASC');"; - $query .= "\n\n\t\t//".$this->setLine(__LINE__)." Load the items"; - $query .= "\n\t\t\$db->setQuery(\$query);"; - $query .= "\n\t\t\$db->execute();"; - $query .= "\n\t\tif (\$db->getNumRows())"; - $query .= "\n\t\t{"; - $query .= "\n\t\t\t\$items = \$db->loadObjectList();"; + $query .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Order the results by ordering"; + $query .= PHP_EOL."\t\t\$query->order('a.published ASC');"; + $query .= PHP_EOL."\t\t\$query->order('a.ordering ASC');"; + $query .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Load the items"; + $query .= PHP_EOL."\t\t\$db->setQuery(\$query);"; + $query .= PHP_EOL."\t\t\$db->execute();"; + $query .= PHP_EOL."\t\tif (\$db->getNumRows())"; + $query .= PHP_EOL."\t\t{"; + $query .= PHP_EOL."\t\t\t\$items = \$db->loadObjectList();"; // ###STORE_METHOD_FIX### <<>> $query .= $this->setGetItemsMethodStringFix($viewName_single,$this->fileContentStatic['###Component###'],"\t"); // ###SELECTIONTRANSLATIONFIX### <<>> @@ -6818,156 +6862,156 @@ class Interpretation extends Fields if ($key && strpos($key,'-R>') !== false && strpos($key,'-A>') === false) { list($field,$target) = explode('-R>',$key); - $query .= "\n\n\t\t\t//".$this->setLine(__LINE__)." Filter by ".$globalKey." in this Repetable Field"; - $query .= "\n\t\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkArray(\$items) && isset(\$this->".$globalKey."))"; - $query .= "\n\t\t\t{"; - $query .= "\n\t\t\t\tforeach (\$items as \$nr => &\$item)"; - $query .= "\n\t\t\t\t{"; - $query .= "\n\t\t\t\t\tif (isset(\$item->".$field.") && ".$this->fileContentStatic['###Component###']."Helper::checkJson(\$item->".$field."))"; - $query .= "\n\t\t\t\t\t{"; - $query .= "\n\t\t\t\t\t\t\$tmpArray = json_decode(\$item->".$field.",true);"; - $query .= "\n\t\t\t\t\t\tif (!in_array(\$this->".$globalKey.", \$tmpArray['".$target."']))"; - $query .= "\n\t\t\t\t\t\t{"; - $query .= "\n\t\t\t\t\t\t\tunset(\$items[\$nr]);"; - $query .= "\n\t\t\t\t\t\t\tcontinue;"; - $query .= "\n\t\t\t\t\t\t}"; - $query .= "\n\t\t\t\t\t}"; - $query .= "\n\t\t\t\t\telse"; - $query .= "\n\t\t\t\t\t{"; - $query .= "\n\t\t\t\t\t\tunset(\$items[\$nr]);"; - $query .= "\n\t\t\t\t\t\tcontinue;"; - $query .= "\n\t\t\t\t\t}"; - $query .= "\n\t\t\t\t}"; - $query .= "\n\t\t\t}"; - $query .= "\n\t\t\telse"; - $query .= "\n\t\t\t{"; - $query .= "\n\t\t\t\treturn false;"; - $query .= "\n\t\t\t}"; + $query .= PHP_EOL.PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Filter by ".$globalKey." in this Repetable Field"; + $query .= PHP_EOL."\t\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkArray(\$items) && isset(\$this->".$globalKey."))"; + $query .= PHP_EOL."\t\t\t{"; + $query .= PHP_EOL."\t\t\t\tforeach (\$items as \$nr => &\$item)"; + $query .= PHP_EOL."\t\t\t\t{"; + $query .= PHP_EOL."\t\t\t\t\tif (isset(\$item->".$field.") && ".$this->fileContentStatic['###Component###']."Helper::checkJson(\$item->".$field."))"; + $query .= PHP_EOL."\t\t\t\t\t{"; + $query .= PHP_EOL."\t\t\t\t\t\t\$tmpArray = json_decode(\$item->".$field.",true);"; + $query .= PHP_EOL."\t\t\t\t\t\tif (!in_array(\$this->".$globalKey.", \$tmpArray['".$target."']))"; + $query .= PHP_EOL."\t\t\t\t\t\t{"; + $query .= PHP_EOL."\t\t\t\t\t\t\tunset(\$items[\$nr]);"; + $query .= PHP_EOL."\t\t\t\t\t\t\tcontinue;"; + $query .= PHP_EOL."\t\t\t\t\t\t}"; + $query .= PHP_EOL."\t\t\t\t\t}"; + $query .= PHP_EOL."\t\t\t\t\telse"; + $query .= PHP_EOL."\t\t\t\t\t{"; + $query .= PHP_EOL."\t\t\t\t\t\tunset(\$items[\$nr]);"; + $query .= PHP_EOL."\t\t\t\t\t\tcontinue;"; + $query .= PHP_EOL."\t\t\t\t\t}"; + $query .= PHP_EOL."\t\t\t\t}"; + $query .= PHP_EOL."\t\t\t}"; + $query .= PHP_EOL."\t\t\telse"; + $query .= PHP_EOL."\t\t\t{"; + $query .= PHP_EOL."\t\t\t\treturn false;"; + $query .= PHP_EOL."\t\t\t}"; } // filter by child array field values if ($key && strpos($key,'-R>') === false && strpos($key,'-A>') !== false) { - $query .= "\n\n\t\t\t//".$this->setLine(__LINE__)." Filter by ".$globalKey." Array Field"; - $query .= "\n\t\t\t\$".$globalKey." = \$this->".$globalKey.";"; - $query .= "\n\t\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkArray(\$items) && \$".$globalKey.")"; - $query .= "\n\t\t\t{"; - $query .= "\n\t\t\t\tforeach (\$items as \$nr => &\$item)"; - $query .= "\n\t\t\t\t{"; + $query .= PHP_EOL.PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Filter by ".$globalKey." Array Field"; + $query .= PHP_EOL."\t\t\t\$".$globalKey." = \$this->".$globalKey.";"; + $query .= PHP_EOL."\t\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkArray(\$items) && \$".$globalKey.")"; + $query .= PHP_EOL."\t\t\t{"; + $query .= PHP_EOL."\t\t\t\tforeach (\$items as \$nr => &\$item)"; + $query .= PHP_EOL."\t\t\t\t{"; list($bin,$target) = explode('-A>',$key); if (ComponentbuilderHelper::checkString($target)) { - $query .= "\n\t\t\t\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkJson(\$item->".$target."))"; - $query .= "\n\t\t\t\t\t{"; - $query .= "\n\t\t\t\t\t\t\$item->".$target." = json_decode(\$item->".$target.");"; - $query .= "\n\t\t\t\t\t}"; - $query .= "\n\t\t\t\t\telse"; - $query .= "\n\t\t\t\t\t{"; - $query .= "\n\t\t\t\t\t\tunset(\$items[\$nr]);"; - $query .= "\n\t\t\t\t\t\tcontinue;"; - $query .= "\n\t\t\t\t\t}"; - $query .= "\n\t\t\t\t\tif (!in_array(\$".$globalKey.",\$item->".$target."))"; + $query .= PHP_EOL."\t\t\t\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkJson(\$item->".$target."))"; + $query .= PHP_EOL."\t\t\t\t\t{"; + $query .= PHP_EOL."\t\t\t\t\t\t\$item->".$target." = json_decode(\$item->".$target.", true);"; + $query .= PHP_EOL."\t\t\t\t\t}"; + $query .= PHP_EOL."\t\t\t\t\telseif (!isset(\$item->".$target.") || !".$this->fileContentStatic['###Component###']."Helper::checkArray(\$item->".$target."))"; + $query .= PHP_EOL."\t\t\t\t\t{"; + $query .= PHP_EOL."\t\t\t\t\t\tunset(\$items[\$nr]);"; + $query .= PHP_EOL."\t\t\t\t\t\tcontinue;"; + $query .= PHP_EOL."\t\t\t\t\t}"; + $query .= PHP_EOL."\t\t\t\t\tif (!in_array(\$".$globalKey.",\$item->".$target."))"; } else { - $query .= "\n\t\t\t\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkJson(\$item->".$_key."))"; - $query .= "\n\t\t\t\t\t{"; - $query .= "\n\t\t\t\t\t\t\$item->".$_key." = json_decode(\$item->".$_key.");"; - $query .= "\n\t\t\t\t\t}"; - $query .= "\n\t\t\t\t\telse"; - $query .= "\n\t\t\t\t\t{"; - $query .= "\n\t\t\t\t\t\tunset(\$items[\$nr]);"; - $query .= "\n\t\t\t\t\t\tcontinue;"; - $query .= "\n\t\t\t\t\t}"; - $query .= "\n\t\t\t\t\tif (!in_array(\$".$globalKey.",\$item->".$_key."))"; + $query .= PHP_EOL."\t\t\t\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkJson(\$item->".$_key."))"; + $query .= PHP_EOL."\t\t\t\t\t{"; + $query .= PHP_EOL."\t\t\t\t\t\t\$item->".$_key." = json_decode(\$item->".$_key.", true);"; + $query .= PHP_EOL."\t\t\t\t\t}"; + $query .= PHP_EOL."\t\t\t\t\telseif (!isset(\$item->".$_key.") || !".$this->fileContentStatic['###Component###']."Helper::checkArray(\$item->".$_key."))"; + $query .= PHP_EOL."\t\t\t\t\t{"; + $query .= PHP_EOL."\t\t\t\t\t\tunset(\$items[\$nr]);"; + $query .= PHP_EOL."\t\t\t\t\t\tcontinue;"; + $query .= PHP_EOL."\t\t\t\t\t}"; + $query .= PHP_EOL."\t\t\t\t\tif (!in_array(\$".$globalKey.",\$item->".$_key."))"; } - $query .= "\n\t\t\t\t\t{"; - $query .= "\n\t\t\t\t\t\tunset(\$items[\$nr]);"; - $query .= "\n\t\t\t\t\t\tcontinue;"; - $query .= "\n\t\t\t\t\t}"; - $query .= "\n\t\t\t\t}"; - $query .= "\n\t\t\t}"; - $query .= "\n\t\t\telse"; - $query .= "\n\t\t\t{"; - $query .= "\n\t\t\t\treturn false;"; - $query .= "\n\t\t\t}"; + $query .= PHP_EOL."\t\t\t\t\t{"; + $query .= PHP_EOL."\t\t\t\t\t\tunset(\$items[\$nr]);"; + $query .= PHP_EOL."\t\t\t\t\t\tcontinue;"; + $query .= PHP_EOL."\t\t\t\t\t}"; + $query .= PHP_EOL."\t\t\t\t}"; + $query .= PHP_EOL."\t\t\t}"; + $query .= PHP_EOL."\t\t\telse"; + $query .= PHP_EOL."\t\t\t{"; + $query .= PHP_EOL."\t\t\t\treturn false;"; + $query .= PHP_EOL."\t\t\t}"; } // filter by parent repetable field values if ($key && strpos($parentKey,'-R>') !== false && strpos($parentKey,'-A>') === false) { list($bin,$target) = explode('-R>',$parentKey); - $query .= "\n\n\t\t\t//".$this->setLine(__LINE__)." Filter by ".$_key." Repetable Field"; - $query .= "\n\t\t\t\$".$globalKey." = json_decode(\$this->".$globalKey.",true);"; - $query .= "\n\t\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkArray(\$items) && isset(\$".$globalKey.") && ".$this->fileContentStatic['###Component###']."Helper::checkArray(\$".$globalKey."))"; - $query .= "\n\t\t\t{"; - $query .= "\n\t\t\t\tforeach (\$items as \$nr => &\$item)"; - $query .= "\n\t\t\t\t{"; - $query .= "\n\t\t\t\t\tif (\$item->".$_key." && isset(\$".$globalKey."['".$target."']) && ".$this->fileContentStatic['###Component###']."Helper::checkArray(\$".$globalKey."['".$target."']))"; - $query .= "\n\t\t\t\t\t{"; - $query .= "\n\t\t\t\t\t\tif (!in_array(\$item->".$_key.",\$".$globalKey."['".$target."']))"; - $query .= "\n\t\t\t\t\t\t{"; - $query .= "\n\t\t\t\t\t\t\tunset(\$items[\$nr]);"; - $query .= "\n\t\t\t\t\t\t\tcontinue;"; - $query .= "\n\t\t\t\t\t\t}"; - $query .= "\n\t\t\t\t\t}"; - $query .= "\n\t\t\t\t\telse"; - $query .= "\n\t\t\t\t\t{"; - $query .= "\n\t\t\t\t\t\tunset(\$items[\$nr]);"; - $query .= "\n\t\t\t\t\t\tcontinue;"; - $query .= "\n\t\t\t\t\t}"; - $query .= "\n\t\t\t\t}"; - $query .= "\n\t\t\t}"; - $query .= "\n\t\t\telse"; - $query .= "\n\t\t\t{"; - $query .= "\n\t\t\t\treturn false;"; - $query .= "\n\t\t\t}"; + $query .= PHP_EOL.PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Filter by ".$_key." Repetable Field"; + $query .= PHP_EOL."\t\t\t\$".$globalKey." = json_decode(\$this->".$globalKey.",true);"; + $query .= PHP_EOL."\t\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkArray(\$items) && isset(\$".$globalKey.") && ".$this->fileContentStatic['###Component###']."Helper::checkArray(\$".$globalKey."))"; + $query .= PHP_EOL."\t\t\t{"; + $query .= PHP_EOL."\t\t\t\tforeach (\$items as \$nr => &\$item)"; + $query .= PHP_EOL."\t\t\t\t{"; + $query .= PHP_EOL."\t\t\t\t\tif (\$item->".$_key." && isset(\$".$globalKey."['".$target."']) && ".$this->fileContentStatic['###Component###']."Helper::checkArray(\$".$globalKey."['".$target."']))"; + $query .= PHP_EOL."\t\t\t\t\t{"; + $query .= PHP_EOL."\t\t\t\t\t\tif (!in_array(\$item->".$_key.",\$".$globalKey."['".$target."']))"; + $query .= PHP_EOL."\t\t\t\t\t\t{"; + $query .= PHP_EOL."\t\t\t\t\t\t\tunset(\$items[\$nr]);"; + $query .= PHP_EOL."\t\t\t\t\t\t\tcontinue;"; + $query .= PHP_EOL."\t\t\t\t\t\t}"; + $query .= PHP_EOL."\t\t\t\t\t}"; + $query .= PHP_EOL."\t\t\t\t\telse"; + $query .= PHP_EOL."\t\t\t\t\t{"; + $query .= PHP_EOL."\t\t\t\t\t\tunset(\$items[\$nr]);"; + $query .= PHP_EOL."\t\t\t\t\t\tcontinue;"; + $query .= PHP_EOL."\t\t\t\t\t}"; + $query .= PHP_EOL."\t\t\t\t}"; + $query .= PHP_EOL."\t\t\t}"; + $query .= PHP_EOL."\t\t\telse"; + $query .= PHP_EOL."\t\t\t{"; + $query .= PHP_EOL."\t\t\t\treturn false;"; + $query .= PHP_EOL."\t\t\t}"; } // filter by parent array field values if ($key && strpos($parentKey,'-R>') === false && strpos($parentKey,'-A>') !== false) { - $query .= "\n\n\t\t\t//".$this->setLine(__LINE__)." Filter by ".$globalKey." Array Field"; - $query .= "\n\t\t\t\$".$globalKey." = \$this->".$globalKey.";"; - $query .= "\n\t\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkArray(\$items) && ".$this->fileContentStatic['###Component###']."Helper::checkArray(\$".$globalKey."))"; - $query .= "\n\t\t\t{"; - $query .= "\n\t\t\t\tforeach (\$items as \$nr => &\$item)"; - $query .= "\n\t\t\t\t{"; + $query .= PHP_EOL.PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Filter by ".$globalKey." Array Field"; + $query .= PHP_EOL."\t\t\t\$".$globalKey." = \$this->".$globalKey.";"; + $query .= PHP_EOL."\t\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkArray(\$items) && ".$this->fileContentStatic['###Component###']."Helper::checkArray(\$".$globalKey."))"; + $query .= PHP_EOL."\t\t\t{"; + $query .= PHP_EOL."\t\t\t\tforeach (\$items as \$nr => &\$item)"; + $query .= PHP_EOL."\t\t\t\t{"; list($bin,$target) = explode('-A>',$parentKey); if (ComponentbuilderHelper::checkString($target)) { - $query .= "\n\t\t\t\t\tif (\$item->".$_key." && ".$this->fileContentStatic['###Component###']."Helper::checkArray(\$".$globalKey."['".$target."']))"; - $query .= "\n\t\t\t\t\t{"; - $query .= "\n\t\t\t\t\t\tif (!in_array(\$item->".$_key.",\$".$globalKey."['".$target."']))"; + $query .= PHP_EOL."\t\t\t\t\tif (\$item->".$_key." && ".$this->fileContentStatic['###Component###']."Helper::checkArray(\$".$globalKey."['".$target."']))"; + $query .= PHP_EOL."\t\t\t\t\t{"; + $query .= PHP_EOL."\t\t\t\t\t\tif (!in_array(\$item->".$_key.",\$".$globalKey."['".$target."']))"; } else { - $query .= "\n\t\t\t\t\tif (\$item->".$_key.")"; - $query .= "\n\t\t\t\t\t{"; - $query .= "\n\t\t\t\t\t\tif (!in_array(\$item->".$_key.",\$".$globalKey."))"; + $query .= PHP_EOL."\t\t\t\t\tif (\$item->".$_key.")"; + $query .= PHP_EOL."\t\t\t\t\t{"; + $query .= PHP_EOL."\t\t\t\t\t\tif (!in_array(\$item->".$_key.",\$".$globalKey."))"; } - $query .= "\n\t\t\t\t\t\t{"; - $query .= "\n\t\t\t\t\t\t\tunset(\$items[\$nr]);"; - $query .= "\n\t\t\t\t\t\t\tcontinue;"; - $query .= "\n\t\t\t\t\t\t}"; - $query .= "\n\t\t\t\t\t}"; - $query .= "\n\t\t\t\t\telse"; - $query .= "\n\t\t\t\t\t{"; - $query .= "\n\t\t\t\t\t\tunset(\$items[\$nr]);"; - $query .= "\n\t\t\t\t\t\tcontinue;"; - $query .= "\n\t\t\t\t\t}"; - $query .= "\n\t\t\t\t}"; - $query .= "\n\t\t\t}"; - $query .= "\n\t\t\telse"; - $query .= "\n\t\t\t{"; - $query .= "\n\t\t\t\treturn false;"; - $query .= "\n\t\t\t}"; + $query .= PHP_EOL."\t\t\t\t\t\t{"; + $query .= PHP_EOL."\t\t\t\t\t\t\tunset(\$items[\$nr]);"; + $query .= PHP_EOL."\t\t\t\t\t\t\tcontinue;"; + $query .= PHP_EOL."\t\t\t\t\t\t}"; + $query .= PHP_EOL."\t\t\t\t\t}"; + $query .= PHP_EOL."\t\t\t\t\telse"; + $query .= PHP_EOL."\t\t\t\t\t{"; + $query .= PHP_EOL."\t\t\t\t\t\tunset(\$items[\$nr]);"; + $query .= PHP_EOL."\t\t\t\t\t\tcontinue;"; + $query .= PHP_EOL."\t\t\t\t\t}"; + $query .= PHP_EOL."\t\t\t\t}"; + $query .= PHP_EOL."\t\t\t}"; + $query .= PHP_EOL."\t\t\telse"; + $query .= PHP_EOL."\t\t\t{"; + $query .= PHP_EOL."\t\t\t\treturn false;"; + $query .= PHP_EOL."\t\t\t}"; } // add custom php to getitems method after all - $query .= $this->getCustomScriptBuilder('php_getitems_after_all', $viewName_single, "\n\n\t"); + $query .= $this->getCustomScriptBuilder('php_getitems_after_all', $viewName_single, PHP_EOL.PHP_EOL."\t"); - $query .= "\n\t\t\treturn \$items;"; - $query .= "\n\t\t}"; - $query .= "\n\t\treturn false;"; - $query .= "\n\t}"; + $query .= PHP_EOL."\t\t\treturn \$items;"; + $query .= PHP_EOL."\t\t}"; + $query .= PHP_EOL."\t\treturn false;"; + $query .= PHP_EOL."\t}"; // ###SELECTIONTRANSLATIONFIXFUNC###<<>> $query .= $this->setSelectionTranslationFixFunc($viewName_list,$this->fileContentStatic['###Component###']); @@ -7001,7 +7045,7 @@ class Interpretation extends Fields } if (ComponentbuilderHelper::checkArray($buttons)) { - return implode("\n",$buttons); + return implode(PHP_EOL,$buttons); } } return $buttons; @@ -7020,7 +7064,7 @@ class Interpretation extends Fields foreach ($this->customAdminDynamicButtons[$viewName_list] as $custom_button) { // add the custom redirect method - $method[] = "\n\n\tpublic function redirectTo".ComponentbuilderHelper::safeString($custom_button['link'],'F')."()"; + $method[] = PHP_EOL.PHP_EOL."\tpublic function redirectTo".ComponentbuilderHelper::safeString($custom_button['link'],'F')."()"; $method[] = "\t{"; $method[] = "\t\t//".$this->setLine(__LINE__)." Check for request forgeries"; $method[] = "\t\tJSession::checkToken() or die(JText::_('JINVALID_TOKEN'));"; @@ -7051,7 +7095,7 @@ class Interpretation extends Fields } } - return implode("\n",$method); + return implode(PHP_EOL,$method); } return $method; } @@ -7066,83 +7110,83 @@ class Interpretation extends Fields $query = ''; if ($this->eximportView[$viewName_list]) { - $query = "\n\n\t/**"; - $query .= "\n\t* Method to get list export data."; - $query .= "\n\t*"; - $query .= "\n\t* @return mixed An array of data items on success, false on failure."; - $query .= "\n\t*/"; - $query .= "\n\tpublic function getExportData(\$pks)"; - $query .= "\n\t{"; - $query .= "\n\t\t//".$this->setLine(__LINE__)." setup the query"; - $query .= "\n\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkArray(\$pks))"; - $query .= "\n\t\t{"; - $query .= "\n\t\t\t//".$this->setLine(__LINE__)." Set a value to know this is exporting method."; - $query .= "\n\t\t\t\$_export = true;"; - $query .= "\n\t\t\t//".$this->setLine(__LINE__)." Get the user object."; - $query .= "\n\t\t\t\$user = JFactory::getUser();"; - $query .= "\n\t\t\t//".$this->setLine(__LINE__)." Create a new query object."; - $query .= "\n\t\t\t\$db = JFactory::getDBO();"; - $query .= "\n\t\t\t\$query = \$db->getQuery(true);"; - $query .= "\n\n\t\t\t//".$this->setLine(__LINE__)." Select some fields"; - $query .= "\n\t\t\t\$query->select('a.*');"; - $query .= "\n\n\t\t\t//".$this->setLine(__LINE__)." From the ".$this->fileContentStatic['###component###']."_".$viewName_single." table"; - $query .= "\n\t\t\t\$query->from(\$db->quoteName('#__".$this->fileContentStatic['###component###']."_".$viewName_single."', 'a'));"; - $query .= "\n\t\t\t\$query->where('a.id IN (' . implode(',',\$pks) . ')');"; + $query = PHP_EOL.PHP_EOL."\t/**"; + $query .= PHP_EOL."\t* Method to get list export data."; + $query .= PHP_EOL."\t*"; + $query .= PHP_EOL."\t* @return mixed An array of data items on success, false on failure."; + $query .= PHP_EOL."\t*/"; + $query .= PHP_EOL."\tpublic function getExportData(\$pks)"; + $query .= PHP_EOL."\t{"; + $query .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." setup the query"; + $query .= PHP_EOL."\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkArray(\$pks))"; + $query .= PHP_EOL."\t\t{"; + $query .= PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Set a value to know this is exporting method."; + $query .= PHP_EOL."\t\t\t\$_export = true;"; + $query .= PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Get the user object."; + $query .= PHP_EOL."\t\t\t\$user = JFactory::getUser();"; + $query .= PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Create a new query object."; + $query .= PHP_EOL."\t\t\t\$db = JFactory::getDBO();"; + $query .= PHP_EOL."\t\t\t\$query = \$db->getQuery(true);"; + $query .= PHP_EOL.PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Select some fields"; + $query .= PHP_EOL."\t\t\t\$query->select('a.*');"; + $query .= PHP_EOL.PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." From the ".$this->fileContentStatic['###component###']."_".$viewName_single." table"; + $query .= PHP_EOL."\t\t\t\$query->from(\$db->quoteName('#__".$this->fileContentStatic['###component###']."_".$viewName_single."', 'a'));"; + $query .= PHP_EOL."\t\t\t\$query->where('a.id IN (' . implode(',',\$pks) . ')');"; // add custom filtering php - $query .= $this->getCustomScriptBuilder('php_getlistquery', $viewName_single, "\n\n\t"); + $query .= $this->getCustomScriptBuilder('php_getlistquery', $viewName_single, PHP_EOL.PHP_EOL."\t"); if (isset($this->accessBuilder[$viewName_single]) && ComponentbuilderHelper::checkString($this->accessBuilder[$viewName_single])) { - $query .= "\n\t\t\t//".$this->setLine(__LINE__)." Implement View Level Access"; - $query .= "\n\t\t\tif (!\$user->authorise('core.options', 'com_".$this->fileContentStatic['###component###']."'))"; - $query .= "\n\t\t\t{"; - $query .= "\n\t\t\t\t\$groups = implode(',', \$user->getAuthorisedViewLevels());"; - $query .= "\n\t\t\t\t\$query->where('a.access IN (' . \$groups . ')');"; - $query .= "\n\t\t\t}"; + $query .= PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Implement View Level Access"; + $query .= PHP_EOL."\t\t\tif (!\$user->authorise('core.options', 'com_".$this->fileContentStatic['###component###']."'))"; + $query .= PHP_EOL."\t\t\t{"; + $query .= PHP_EOL."\t\t\t\t\$groups = implode(',', \$user->getAuthorisedViewLevels());"; + $query .= PHP_EOL."\t\t\t\t\$query->where('a.access IN (' . \$groups . ')');"; + $query .= PHP_EOL."\t\t\t}"; } - $query .= "\n\n\t\t\t//".$this->setLine(__LINE__)." Order the results by ordering"; - $query .= "\n\t\t\t\$query->order('a.ordering ASC');"; - $query .= "\n\n\t\t\t//".$this->setLine(__LINE__)." Load the items"; - $query .= "\n\t\t\t\$db->setQuery(\$query);"; - $query .= "\n\t\t\t\$db->execute();"; - $query .= "\n\t\t\tif (\$db->getNumRows())"; - $query .= "\n\t\t\t{"; - $query .= "\n\t\t\t\t\$items = \$db->loadObjectList();"; + $query .= PHP_EOL.PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Order the results by ordering"; + $query .= PHP_EOL."\t\t\t\$query->order('a.ordering ASC');"; + $query .= PHP_EOL.PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Load the items"; + $query .= PHP_EOL."\t\t\t\$db->setQuery(\$query);"; + $query .= PHP_EOL."\t\t\t\$db->execute();"; + $query .= PHP_EOL."\t\t\tif (\$db->getNumRows())"; + $query .= PHP_EOL."\t\t\t{"; + $query .= PHP_EOL."\t\t\t\t\$items = \$db->loadObjectList();"; $query .= $this->setGetItemsMethodStringFix($viewName_single,$this->fileContentStatic['###Component###'],"\t\t",true); // add custom php to getitems method after all - $query .= $this->getCustomScriptBuilder('php_getitems_after_all', $viewName_single, "\n\n\t\t"); - $query .= "\n\t\t\t\treturn \$items;"; - $query .= "\n\t\t\t}"; - $query .= "\n\t\t}"; - $query .= "\n\t\treturn false;"; - $query .= "\n\t}"; + $query .= $this->getCustomScriptBuilder('php_getitems_after_all', $viewName_single, PHP_EOL.PHP_EOL."\t\t"); + $query .= PHP_EOL."\t\t\t\treturn \$items;"; + $query .= PHP_EOL."\t\t\t}"; + $query .= PHP_EOL."\t\t}"; + $query .= PHP_EOL."\t\treturn false;"; + $query .= PHP_EOL."\t}"; - $query .= "\n\n\t/**"; - $query .= "\n\t* Method to get header."; - $query .= "\n\t*"; - $query .= "\n\t* @return mixed An array of data items on success, false on failure."; - $query .= "\n\t*/"; - $query .= "\n\tpublic function getExImPortHeaders()"; - $query .= "\n\t{"; - $query .= "\n\t\t//".$this->setLine(__LINE__)." Get a db connection."; - $query .= "\n\t\t\$db = JFactory::getDbo();"; - $query .= "\n\t\t//".$this->setLine(__LINE__)." get the columns"; - $query .= "\n\t\t\$columns = \$db->getTableColumns(".'"#__'.$this->fileContentStatic['###component###'].'_'.$viewName_single.'");'; - $query .= "\n\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkArray(\$columns))"; - $query .= "\n\t\t{"; - $query .= "\n\t\t\t//".$this->setLine(__LINE__)." remove the headers you don't import/export."; - $query .= "\n\t\t\tunset(\$columns['asset_id']);"; - $query .= "\n\t\t\tunset(\$columns['checked_out']);"; - $query .= "\n\t\t\tunset(\$columns['checked_out_time']);"; - $query .= "\n\t\t\t\$headers = new stdClass();"; - $query .= "\n\t\t\tforeach (\$columns as \$column => \$type)"; - $query .= "\n\t\t\t{"; - $query .= "\n\t\t\t\t\$headers->{\$column} = \$column;"; - $query .= "\n\t\t\t}"; - $query .= "\n\t\t\treturn \$headers;"; - $query .= "\n\t\t}"; - $query .= "\n\t\treturn false;"; - $query .= "\n\t}"; + $query .= PHP_EOL.PHP_EOL."\t/**"; + $query .= PHP_EOL."\t* Method to get header."; + $query .= PHP_EOL."\t*"; + $query .= PHP_EOL."\t* @return mixed An array of data items on success, false on failure."; + $query .= PHP_EOL."\t*/"; + $query .= PHP_EOL."\tpublic function getExImPortHeaders()"; + $query .= PHP_EOL."\t{"; + $query .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get a db connection."; + $query .= PHP_EOL."\t\t\$db = JFactory::getDbo();"; + $query .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." get the columns"; + $query .= PHP_EOL."\t\t\$columns = \$db->getTableColumns(".'"#__'.$this->fileContentStatic['###component###'].'_'.$viewName_single.'");'; + $query .= PHP_EOL."\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkArray(\$columns))"; + $query .= PHP_EOL."\t\t{"; + $query .= PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." remove the headers you don't import/export."; + $query .= PHP_EOL."\t\t\tunset(\$columns['asset_id']);"; + $query .= PHP_EOL."\t\t\tunset(\$columns['checked_out']);"; + $query .= PHP_EOL."\t\t\tunset(\$columns['checked_out_time']);"; + $query .= PHP_EOL."\t\t\t\$headers = new stdClass();"; + $query .= PHP_EOL."\t\t\tforeach (\$columns as \$column => \$type)"; + $query .= PHP_EOL."\t\t\t{"; + $query .= PHP_EOL."\t\t\t\t\$headers->{\$column} = \$column;"; + $query .= PHP_EOL."\t\t\t}"; + $query .= PHP_EOL."\t\t\treturn \$headers;"; + $query .= PHP_EOL."\t\t}"; + $query .= PHP_EOL."\t\treturn false;"; + $query .= PHP_EOL."\t}"; } return $query; } @@ -7155,7 +7199,7 @@ class Interpretation extends Fields $method = array(); // add the export method - $method[] = "\n\n\tpublic function exportData()"; + $method[] = PHP_EOL.PHP_EOL."\tpublic function exportData()"; $method[] = "\t{"; $method[] = "\t\t//".$this->setLine(__LINE__)." Check for request forgeries"; $method[] = "\t\tJSession::checkToken() or die(JText::_('JINVALID_TOKEN'));"; @@ -7186,7 +7230,7 @@ class Interpretation extends Fields $method[] = "\t}"; // add the import method - $method[] = "\n\n\tpublic function importData()"; + $method[] = PHP_EOL.PHP_EOL."\tpublic function importData()"; $method[] = "\t{"; $method[] = "\t\t//".$this->setLine(__LINE__)." Check for request forgeries"; $method[] = "\t\tJSession::checkToken() or die(JText::_('JINVALID_TOKEN'));"; @@ -7231,7 +7275,7 @@ class Interpretation extends Fields $method[] = "\t\t\$this->setRedirect(JRoute::_('index.php?option=com_".$this->fileContentStatic['###component###']."&view=".$viewName_list."', false), \$message, 'error');"; $method[] = "\t\treturn;"; $method[] = "\t}"; - return implode("\n",$method); + return implode(PHP_EOL,$method); } return $method; } @@ -7249,11 +7293,11 @@ class Interpretation extends Fields $this->langContent[$this->lang][$langExport] = 'Export Data'; } $button = array(); - $button[] = "\n\n\t\t\tif (\$this->canDo->get('core.export') && \$this->canDo->get('".$viewName_single.".export'))"; + $button[] = PHP_EOL.PHP_EOL."\t\t\tif (\$this->canDo->get('core.export') && \$this->canDo->get('".$viewName_single.".export'))"; $button[] = "\t\t\t{"; $button[] = "\t\t\t\tJToolBarHelper::custom('".$viewName_list.".exportData', 'download', '', '".$langExport."', true);"; $button[] = "\t\t\t}"; - return implode("\n",$button); + return implode(PHP_EOL,$button); } return $button; } @@ -7271,11 +7315,11 @@ class Interpretation extends Fields $this->langContent[$this->lang][$langImport] = 'Import Data'; } $button = array(); - $button[] = "\n\n\t\tif (\$this->canDo->get('core.import') && \$this->canDo->get('".$viewName_single.".import'))"; + $button[] = PHP_EOL.PHP_EOL."\t\tif (\$this->canDo->get('core.import') && \$this->canDo->get('".$viewName_single.".import'))"; $button[] = "\t\t{"; $button[] = "\t\t\tJToolBarHelper::custom('".$viewName_list.".importData', 'upload', '', '".$langImport."', false);"; $button[] = "\t\t}"; - return implode("\n",$button); + return implode(PHP_EOL,$button); } return $button; } @@ -7287,15 +7331,15 @@ class Interpretation extends Fields $this->buildDynamique($target,'customimport'); // load the custom script to the files // ###IMPORT_DISPLAY_METHOD_CUSTOM### <<>> - $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_DISPLAY_METHOD_CUSTOM###'] = $this->getCustomScriptBuilder('php_import_display', 'import_'.$viewName_list, "\n", null, true); + $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_DISPLAY_METHOD_CUSTOM###'] = $this->getCustomScriptBuilder('php_import_display', 'import_'.$viewName_list, PHP_EOL, null, true); // ###IMPORT_SETDATE_METHOD_CUSTOM### <<>> - $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SETDATE_METHOD_CUSTOM###'] = $this->getCustomScriptBuilder('php_import_setdata', 'import_'.$viewName_list, "\n", null, true); + $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SETDATE_METHOD_CUSTOM###'] = $this->getCustomScriptBuilder('php_import_setdata', 'import_'.$viewName_list, PHP_EOL, null, true); // ###IMPORT_METHOD_CUSTOM### <<>> - $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_METHOD_CUSTOM###'] = $this->getCustomScriptBuilder('php_import', 'import_'.$viewName_list, "\n", null, true); + $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_METHOD_CUSTOM###'] = $this->getCustomScriptBuilder('php_import', 'import_'.$viewName_list, PHP_EOL, null, true); // ###IMPORT_SAVE_METHOD_CUSTOM### <<>> - $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SAVE_METHOD_CUSTOM###'] = $this->getCustomScriptBuilder('php_import_save', 'import_'.$viewName_list, "\n", null, true); + $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SAVE_METHOD_CUSTOM###'] = $this->getCustomScriptBuilder('php_import_save', 'import_'.$viewName_list, PHP_EOL, null, true); // ###IMPORT_DEFAULT_VIEW_CUSTOM### <<>> - $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_DEFAULT_VIEW_CUSTOM###'] = $this->getCustomScriptBuilder('html_import_view', 'import_'.$viewName_list, "\n", null, true); + $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_DEFAULT_VIEW_CUSTOM###'] = $this->getCustomScriptBuilder('html_import_view', 'import_'.$viewName_list, PHP_EOL, null, true); // insure we have the view placeholders setup $this->fileContentDynamic['import_'.$viewName_list]['###VIEW###'] = 'IMPORT_'.$this->placeholders['###VIEWS###']; @@ -7320,54 +7364,54 @@ class Interpretation extends Fields } // setup the query $query = "//".$this->setLine(__LINE__)." Get the user object."; - $query .= "\n\t\t\$user = JFactory::getUser();"; - $query .= "\n\t\t//".$this->setLine(__LINE__)." Create a new query object."; - $query .= "\n\t\t\$db = JFactory::getDBO();"; - $query .= "\n\t\t\$query = \$db->getQuery(true);"; - $query .= "\n\n\t\t//".$this->setLine(__LINE__)." Select some fields"; - $query .= "\n\t\t\$query->select('a.*');"; + $query .= PHP_EOL."\t\t\$user = JFactory::getUser();"; + $query .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Create a new query object."; + $query .= PHP_EOL."\t\t\$db = JFactory::getDBO();"; + $query .= PHP_EOL."\t\t\$query = \$db->getQuery(true);"; + $query .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Select some fields"; + $query .= PHP_EOL."\t\t\$query->select('a.*');"; // add the category if ($addCategory) { - $query .= "\n\t\t\$query->select(\$db->quoteName('c.title','category_title'));"; + $query .= PHP_EOL."\t\t\$query->select(\$db->quoteName('c.title','category_title'));"; } - $query .= "\n\n\t\t//".$this->setLine(__LINE__)." From the ".$this->fileContentStatic['###component###']."_item table"; - $query .= "\n\t\t\$query->from(\$db->quoteName('#__".$this->fileContentStatic['###component###']."_".$viewName_single."', 'a'));"; + $query .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." From the ".$this->fileContentStatic['###component###']."_item table"; + $query .= PHP_EOL."\t\t\$query->from(\$db->quoteName('#__".$this->fileContentStatic['###component###']."_".$viewName_single."', 'a'));"; // add the category if ($addCategory) { - $query .= "\n\t\t\$query->join('LEFT', \$db->quoteName('#__categories', 'c') . ' ON (' . \$db->quoteName('a.".$categoryCodeName."') . ' = ' . \$db->quoteName('c.id') . ')');"; + $query .= PHP_EOL."\t\t\$query->join('LEFT', \$db->quoteName('#__categories', 'c') . ' ON (' . \$db->quoteName('a.".$categoryCodeName."') . ' = ' . \$db->quoteName('c.id') . ')');"; } // add custom filtering php - $query .= $this->getCustomScriptBuilder('php_getlistquery', $viewName_single, "\n\n"); + $query .= $this->getCustomScriptBuilder('php_getlistquery', $viewName_single, PHP_EOL.PHP_EOL); // add the custom fields query $query .= $this->setCustomQuery($viewName_list, $viewName_single); - $query .= "\n\n\t\t//".$this->setLine(__LINE__)." Filter by published state"; - $query .= "\n\t\t\$published = \$this->getState('filter.published');"; - $query .= "\n\t\tif (is_numeric(\$published))"; - $query .= "\n\t\t{"; - $query .= "\n\t\t\t\$query->where('a.published = ' . (int) \$published);"; - $query .= "\n\t\t}"; - $query .= "\n\t\telseif (\$published === '')"; - $query .= "\n\t\t{"; - $query .= "\n\t\t\t\$query->where('(a.published = 0 OR a.published = 1)');"; - $query .= "\n\t\t}"; + $query .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Filter by published state"; + $query .= PHP_EOL."\t\t\$published = \$this->getState('filter.published');"; + $query .= PHP_EOL."\t\tif (is_numeric(\$published))"; + $query .= PHP_EOL."\t\t{"; + $query .= PHP_EOL."\t\t\t\$query->where('a.published = ' . (int) \$published);"; + $query .= PHP_EOL."\t\t}"; + $query .= PHP_EOL."\t\telseif (\$published === '')"; + $query .= PHP_EOL."\t\t{"; + $query .= PHP_EOL."\t\t\t\$query->where('(a.published = 0 OR a.published = 1)');"; + $query .= PHP_EOL."\t\t}"; if (isset($this->accessBuilder[$viewName_single]) && ComponentbuilderHelper::checkString($this->accessBuilder[$viewName_single])) { - $query .= "\n\n\t\t//".$this->setLine(__LINE__)." Join over the asset groups."; - $query .= "\n\t\t\$query->select('ag.title AS access_level');"; - $query .= "\n\t\t\$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');"; - $query .= "\n\t\t//".$this->setLine(__LINE__)." Filter by access level."; - $query .= "\n\t\tif (\$access = \$this->getState('filter.access'))"; - $query .= "\n\t\t{"; - $query .= "\n\t\t\t\$query->where('a.access = ' . (int) \$access);"; - $query .= "\n\t\t}"; - $query .= "\n\t\t//".$this->setLine(__LINE__)." Implement View Level Access"; - $query .= "\n\t\tif (!\$user->authorise('core.options', 'com_".$this->fileContentStatic['###component###']."'))"; - $query .= "\n\t\t{"; - $query .= "\n\t\t\t\$groups = implode(',', \$user->getAuthorisedViewLevels());"; - $query .= "\n\t\t\t\$query->where('a.access IN (' . \$groups . ')');"; - $query .= "\n\t\t}"; + $query .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Join over the asset groups."; + $query .= PHP_EOL."\t\t\$query->select('ag.title AS access_level');"; + $query .= PHP_EOL."\t\t\$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');"; + $query .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Filter by access level."; + $query .= PHP_EOL."\t\tif (\$access = \$this->getState('filter.access'))"; + $query .= PHP_EOL."\t\t{"; + $query .= PHP_EOL."\t\t\t\$query->where('a.access = ' . (int) \$access);"; + $query .= PHP_EOL."\t\t}"; + $query .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Implement View Level Access"; + $query .= PHP_EOL."\t\tif (!\$user->authorise('core.options', 'com_".$this->fileContentStatic['###component###']."'))"; + $query .= PHP_EOL."\t\t{"; + $query .= PHP_EOL."\t\t\t\$groups = implode(',', \$user->getAuthorisedViewLevels());"; + $query .= PHP_EOL."\t\t\t\$query->where('a.access IN (' . \$groups . ')');"; + $query .= PHP_EOL."\t\t}"; } // set the search query $query .= $this->setSearchQuery($viewName_list); @@ -7376,37 +7420,37 @@ class Interpretation extends Fields // add the category if ($addCategory) { - $query .= "\n\n\t\t//".$this->setLine(__LINE__)." Filter by a single or group of categories."; - $query .= "\n\t\t\$baselevel = 1;"; - $query .= "\n\t\t\$categoryId = \$this->getState('filter.category_id');"; - $query .= "\n"; - $query .= "\n\t\tif (is_numeric(\$categoryId))"; - $query .= "\n\t\t{"; - $query .= "\n\t\t\t\$cat_tbl = JTable::getInstance('Category', 'JTable');"; - $query .= "\n\t\t\t\$cat_tbl->load(\$categoryId);"; - $query .= "\n\t\t\t\$rgt = \$cat_tbl->rgt;"; - $query .= "\n\t\t\t\$lft = \$cat_tbl->lft;"; - $query .= "\n\t\t\t\$baselevel = (int) \$cat_tbl->level;"; - $query .= "\n\t\t\t\$query->where('c.lft >= ' . (int) \$lft)"; - $query .= "\n\t\t\t\t->where('c.rgt <= ' . (int) \$rgt);"; - $query .= "\n\t\t}"; - $query .= "\n\t\telseif (is_array(\$categoryId))"; - $query .= "\n\t\t{"; - $query .= "\n\t\t\tJArrayHelper::toInteger(\$categoryId);"; - $query .= "\n\t\t\t\$categoryId = implode(',', \$categoryId);"; - $query .= "\n\t\t\t\$query->where('a.category IN (' . \$categoryId . ')');"; - $query .= "\n\t\t}"; - $query .= "\n"; + $query .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Filter by a single or group of categories."; + $query .= PHP_EOL."\t\t\$baselevel = 1;"; + $query .= PHP_EOL."\t\t\$categoryId = \$this->getState('filter.category_id');"; + $query .= PHP_EOL; + $query .= PHP_EOL."\t\tif (is_numeric(\$categoryId))"; + $query .= PHP_EOL."\t\t{"; + $query .= PHP_EOL."\t\t\t\$cat_tbl = JTable::getInstance('Category', 'JTable');"; + $query .= PHP_EOL."\t\t\t\$cat_tbl->load(\$categoryId);"; + $query .= PHP_EOL."\t\t\t\$rgt = \$cat_tbl->rgt;"; + $query .= PHP_EOL."\t\t\t\$lft = \$cat_tbl->lft;"; + $query .= PHP_EOL."\t\t\t\$baselevel = (int) \$cat_tbl->level;"; + $query .= PHP_EOL."\t\t\t\$query->where('c.lft >= ' . (int) \$lft)"; + $query .= PHP_EOL."\t\t\t\t->where('c.rgt <= ' . (int) \$rgt);"; + $query .= PHP_EOL."\t\t}"; + $query .= PHP_EOL."\t\telseif (is_array(\$categoryId))"; + $query .= PHP_EOL."\t\t{"; + $query .= PHP_EOL."\t\t\tJArrayHelper::toInteger(\$categoryId);"; + $query .= PHP_EOL."\t\t\t\$categoryId = implode(',', \$categoryId);"; + $query .= PHP_EOL."\t\t\t\$query->where('a.category IN (' . \$categoryId . ')');"; + $query .= PHP_EOL."\t\t}"; + $query .= PHP_EOL; } - $query .= "\n\n\t\t//".$this->setLine(__LINE__)." Add the list ordering clause."; - $query .= "\n\t\t\$orderCol = \$this->state->get('list.ordering', 'a.id');"; - $query .= "\n\t\t\$orderDirn = \$this->state->get('list.direction', 'asc'); "; - $query .= "\n\t\tif (\$orderCol != '')"; - $query .= "\n\t\t{"; - $query .= "\n\t\t\t\$query->order(\$db->escape(\$orderCol . ' ' . \$orderDirn));"; - $query .= "\n\t\t}"; - $query .= "\n"; - $query .= "\n\t\treturn \$query;"; + $query .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Add the list ordering clause."; + $query .= PHP_EOL."\t\t\$orderCol = \$this->state->get('list.ordering', 'a.id');"; + $query .= PHP_EOL."\t\t\$orderDirn = \$this->state->get('list.direction', 'asc'); "; + $query .= PHP_EOL."\t\tif (\$orderCol != '')"; + $query .= PHP_EOL."\t\t{"; + $query .= PHP_EOL."\t\t\t\$query->order(\$db->escape(\$orderCol . ' ' . \$orderDirn));"; + $query .= PHP_EOL."\t\t}"; + $query .= PHP_EOL; + $query .= PHP_EOL."\t\treturn \$query;"; return $query; } @@ -7439,21 +7483,21 @@ class Interpretation extends Fields } $search .= ")'"; // now setup query - $query = "\n\t\t//".$this->setLine(__LINE__)." Filter by search."; - $query .= "\n\t\t\$search = \$this->getState('filter.search');"; - $query .= "\n\t\tif (!empty(\$search))"; - $query .= "\n\t\t{"; - $query .= "\n\t\t\tif (stripos(\$search, 'id:') === 0)"; - $query .= "\n\t\t\t{"; - $query .= "\n\t\t\t\t\$query->where('a.id = ' . (int) substr(\$search, 3));"; - $query .= "\n\t\t\t}"; - $query .= "\n\t\t\telse"; - $query .= "\n\t\t\t{"; - $query .= "\n\t\t\t\t\$search = \$db->quote('%' . \$db->escape(\$search) . '%');"; - $query .= "\n\t\t\t\t\$query->where(".$search.");"; - $query .= "\n\t\t\t}"; - $query .= "\n\t\t}"; - $query .= "\n"; + $query = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Filter by search."; + $query .= PHP_EOL."\t\t\$search = \$this->getState('filter.search');"; + $query .= PHP_EOL."\t\tif (!empty(\$search))"; + $query .= PHP_EOL."\t\t{"; + $query .= PHP_EOL."\t\t\tif (stripos(\$search, 'id:') === 0)"; + $query .= PHP_EOL."\t\t\t{"; + $query .= PHP_EOL."\t\t\t\t\$query->where('a.id = ' . (int) substr(\$search, 3));"; + $query .= PHP_EOL."\t\t\t}"; + $query .= PHP_EOL."\t\t\telse"; + $query .= PHP_EOL."\t\t\t{"; + $query .= PHP_EOL."\t\t\t\t\$search = \$db->quote('%' . \$db->escape(\$search) . '%');"; + $query .= PHP_EOL."\t\t\t\t\$query->where(".$search.");"; + $query .= PHP_EOL."\t\t\t}"; + $query .= PHP_EOL."\t\t}"; + $query .= PHP_EOL; return $query; } @@ -7474,9 +7518,9 @@ class Interpretation extends Fields && isset($filter['custom']['table']) && ComponentbuilderHelper::checkString($filter['custom']['table'])) { - $query .= "\n\n\t\t//".$this->setLine(__LINE__)." From the ".ComponentbuilderHelper::safeString(ComponentbuilderHelper::safeString($filter['custom']['table'],'w'))." table."; - $query .= "\n\t\t\$query->select(\$db->quoteName('".$filter['custom']['db'].".".$filter['custom']['text']."','".$filter['code']."_".$filter['custom']['text']."'));"; - $query .= "\n\t\t\$query->join('LEFT', \$db->quoteName('".$filter['custom']['table']."', '".$filter['custom']['db']."') . ' ON (' . \$db->quoteName('a.".$filter['code']."') . ' = ' . \$db->quoteName('".$filter['custom']['db'].".".$filter['custom']['id']."') . ')');"; + $query .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." From the ".ComponentbuilderHelper::safeString(ComponentbuilderHelper::safeString($filter['custom']['table'],'w'))." table."; + $query .= PHP_EOL."\t\t\$query->select(\$db->quoteName('".$filter['custom']['db'].".".$filter['custom']['text']."','".$filter['code']."_".$filter['custom']['text']."'));"; + $query .= PHP_EOL."\t\t\$query->join('LEFT', \$db->quoteName('".$filter['custom']['table']."', '".$filter['custom']['db']."') . ' ON (' . \$db->quoteName('a.".$filter['code']."') . ' = ' . \$db->quoteName('".$filter['custom']['db'].".".$filter['custom']['id']."') . ')');"; } // build the field type file $this->setCustomFieldTypeFile($filter, $viewName_list, $viewName_single); @@ -7488,7 +7532,7 @@ class Interpretation extends Fields public function setAddButttonToListField($targetView,$targetViews) { $addButton = array(); - $addButton[] = "\n\t/**"; + $addButton[] = PHP_EOL."\t/**"; $addButton[] = "\t * Override to add new button"; $addButton[] = "\t *"; $addButton[] = "\t * @return string The field input markup."; @@ -7612,7 +7656,7 @@ class Interpretation extends Fields $addButton[] = "\t\treturn \$html;"; $addButton[] = "\t}"; - return implode("\n",$addButton); + return implode(PHP_EOL,$addButton); } public function setFilterQuery($viewName_list) @@ -7624,20 +7668,20 @@ class Interpretation extends Fields { if ($filter['type'] != 'category' && ComponentbuilderHelper::checkArray($filter['custom'])) { - $filterQuery .= "\n\t\t//".$this->setLine(__LINE__)." Filter by ".$filter['code']."."; - $filterQuery .= "\n\t\tif (\$".$filter['code']." = \$this->getState('filter.".$filter['code']."'))"; - $filterQuery .= "\n\t\t{"; - $filterQuery .= "\n\t\t\t\$query->where('a.".$filter['code']." = ' . \$db->quote(\$db->escape(\$".$filter['code'].")));"; - $filterQuery .= "\n\t\t}"; + $filterQuery .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Filter by ".$filter['code']."."; + $filterQuery .= PHP_EOL."\t\tif (\$".$filter['code']." = \$this->getState('filter.".$filter['code']."'))"; + $filterQuery .= PHP_EOL."\t\t{"; + $filterQuery .= PHP_EOL."\t\t\t\$query->where('a.".$filter['code']." = ' . \$db->quote(\$db->escape(\$".$filter['code'].")));"; + $filterQuery .= PHP_EOL."\t\t}"; } elseif ($filter['type'] != 'category') { - $filterQuery .= "\n\t\t//".$this->setLine(__LINE__)." Filter by ".ucwords($filter['code'])."."; - $filterQuery .= "\n\t\tif (\$".$filter['code']." = \$this->getState('filter.".$filter['code']."'))"; - $filterQuery .= "\n\t\t{"; - $filterQuery .= "\n\t\t\t\$query->where('a.".$filter['code']." = ' . \$db->quote(\$db->escape(\$".$filter['code'].")));"; - $filterQuery .= "\n\t\t}"; + $filterQuery .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Filter by ".ucwords($filter['code'])."."; + $filterQuery .= PHP_EOL."\t\tif (\$".$filter['code']." = \$this->getState('filter.".$filter['code']."'))"; + $filterQuery .= PHP_EOL."\t\t{"; + $filterQuery .= PHP_EOL."\t\t\t\$query->where('a.".$filter['code']." = ' . \$db->quote(\$db->escape(\$".$filter['code'].")));"; + $filterQuery .= PHP_EOL."\t\t}"; } } return $filterQuery; @@ -7741,14 +7785,14 @@ class Interpretation extends Fields if (ComponentbuilderHelper::checkArray($functions)) { // now build the initial script - $initial .= "// Initial Script\njQuery(document).ready(function()"; - $initial .= "\n{"; + $initial .= "// Initial Script".PHP_EOL."jQuery(document).ready(function()"; + $initial .= PHP_EOL."{"; foreach ($functions as $function => $matchKeys) { $func_call = $this->buildFunctionCall($function,$matchKeys,$getValue); $initial .= $func_call['code']; } - $initial .= "});\n"; + $initial .= "});".PHP_EOL; // for modal fields $modal = ''; // now build the listener scripts @@ -7772,26 +7816,26 @@ class Interpretation extends Fields $name = $name.'_id'; } - $listener .= "\n// #jform_".$name." listeners for ".$l_matchKey." function"; - $listener .= "\njQuery('#jform_".$name."').on('keyup',function()"; - $listener .= "\n{"; + $listener .= PHP_EOL."// #jform_".$name." listeners for ".$l_matchKey." function"; + $listener .= PHP_EOL."jQuery('#jform_".$name."').on('keyup',function()"; + $listener .= PHP_EOL."{"; $listener .= $funcCall['code']; - $listener .= "\n});"; - $listener .= "\njQuery('#adminForm').on('change', '#jform_".$name."',function (e)"; - $listener .= "\n{"; - $listener .= "\n\te.preventDefault();"; + $listener .= PHP_EOL."});"; + $listener .= PHP_EOL."jQuery('#adminForm').on('change', '#jform_".$name."',function (e)"; + $listener .= PHP_EOL."{"; + $listener .= PHP_EOL."\te.preventDefault();"; $listener .= $funcCall['code']; - $listener .= "\n});\n"; + $listener .= PHP_EOL."});".PHP_EOL; } } } if (ComponentbuilderHelper::checkString($modal)) { - $listener .= "\nwindow.SqueezeBox.initialize({"; - $listener .= "\n\tonClose:function(){"; + $listener .= PHP_EOL."window.SqueezeBox.initialize({"; + $listener .= PHP_EOL."\tonClose:function(){"; $listener .= $modal; - $listener .= "\n\t}"; - $listener .= "\n});\n"; + $listener .= PHP_EOL."\t}"; + $listener .= PHP_EOL."});".PHP_EOL; } // now build the function @@ -7808,8 +7852,8 @@ class Interpretation extends Fields { $addArray = true; } - $func .= "\n// the ".$f_function." function"; - $func .= "\nfunction ".$f_function."("; + $func .= PHP_EOL."// the ".$f_function." function"; + $func .= PHP_EOL."function ".$f_function."("; $fucounter = 0; foreach ($f_matchKeys as $fu_matchKey) { @@ -7827,37 +7871,37 @@ class Interpretation extends Fields } } $func .= ")"; - $func .= "\n{"; + $func .= PHP_EOL."{"; if ($addArray) { foreach ($f_matchKeys as $a_matchKey) { $name = $matchNames[$a_matchKey]; - $func .= "\n\tif (isSet(".$a_matchKey.") && ".$a_matchKey.".constructor !== Array)\n\t{\n\t\tvar temp_".$f_function." = ".$a_matchKey.";\n\t\tvar ".$a_matchKey." = [];\n\t\t".$a_matchKey.".push(temp_".$f_function.");\n\t}"; - $func .= "\n\telse if (!isSet(".$a_matchKey."))\n\t{"; - $func .= "\n\t\tvar ".$a_matchKey." = [];"; - $func .= "\n\t}"; - $func .= "\n\tvar ".$name." = ".$a_matchKey.".some(".$a_matchKey."_SomeFunc);\n"; + $func .= PHP_EOL."\tif (isSet(".$a_matchKey.") && ".$a_matchKey.".constructor !== Array)".PHP_EOL."\t{".PHP_EOL."\t\tvar temp_".$f_function." = ".$a_matchKey.";".PHP_EOL."\t\tvar ".$a_matchKey." = [];".PHP_EOL."\t\t".$a_matchKey.".push(temp_".$f_function.");".PHP_EOL."\t}"; + $func .= PHP_EOL."\telse if (!isSet(".$a_matchKey."))".PHP_EOL."\t{"; + $func .= PHP_EOL."\t\tvar ".$a_matchKey." = [];"; + $func .= PHP_EOL."\t}"; + $func .= PHP_EOL."\tvar ".$name." = ".$a_matchKey.".some(".$a_matchKey."_SomeFunc);".PHP_EOL; // setup the map function - $map .= "\n// the ".$f_function." Some function"; - $map .= "\nfunction ".$a_matchKey."_SomeFunc(".$a_matchKey.")"; - $map .= "\n{"; - $map .= "\n\t//".$this->setLine(__LINE__)." set the function logic"; - $map .= "\n\tif ("; + $map .= PHP_EOL."// the ".$f_function." Some function"; + $map .= PHP_EOL."function ".$a_matchKey."_SomeFunc(".$a_matchKey.")"; + $map .= PHP_EOL."{"; + $map .= PHP_EOL."\t//".$this->setLine(__LINE__)." set the function logic"; + $map .= PHP_EOL."\tif ("; $if = $ifValue[$a_matchKey]; if (ComponentbuilderHelper::checkString($if)) { $map .= $if; } $map .= ")"; - $map .= "\n\t{"; - $map .= "\n\t\treturn true;"; - $map .= "\n\t}\n\treturn false;"; - $map .= "\n}\n"; + $map .= PHP_EOL."\t{"; + $map .= PHP_EOL."\t\treturn true;"; + $map .= PHP_EOL."\t}".PHP_EOL."\treturn false;"; + $map .= PHP_EOL."}".PHP_EOL; } - $func .= "\n\n\t//".$this->setLine(__LINE__)." set this function logic"; - $func .= "\n\tif ("; + $func .= PHP_EOL.PHP_EOL."\t//".$this->setLine(__LINE__)." set this function logic"; + $func .= PHP_EOL."\tif ("; // set if counter $aifcounter = 0; foreach ($f_matchKeys as $af_matchKey) @@ -7873,13 +7917,13 @@ class Interpretation extends Fields } $aifcounter++; } - $func .= ")\n\t{"; + $func .= ")".PHP_EOL."\t{"; } else { - $func .= "\n\t//".$this->setLine(__LINE__)." set the function logic"; - $func .= "\n\tif ("; + $func .= PHP_EOL."\t//".$this->setLine(__LINE__)." set the function logic"; + $func .= PHP_EOL."\tif ("; // set if counter $ifcounter = 0; foreach ($f_matchKeys as $f_matchKey) @@ -7898,7 +7942,7 @@ class Interpretation extends Fields $ifcounter++; } } - $func .= ")\n\t{"; + $func .= ")".PHP_EOL."\t{"; } // get the controles $controls = $targetControls[$f_matchKeys[0]]; @@ -7915,7 +7959,7 @@ class Interpretation extends Fields $head .= $action['requiredVar']; } } - $func .= "\n\t}\n\telse\n\t{"; + $func .= PHP_EOL."\t}".PHP_EOL."\telse".PHP_EOL."\t{"; foreach($controls as $target => $action) { $func .= $action['default']; @@ -7924,45 +7968,45 @@ class Interpretation extends Fields $func .= $action[$targetDefault]; } } - $func .= "\n\t}\n}\n".$map; + $func .= PHP_EOL."\t}".PHP_EOL."}".PHP_EOL.$map; } // add the needed validation to file if (isset($this->validationFixBuilder[$viewName]) && ComponentbuilderHelper::checkArray($this->validationFixBuilder[$viewName])) { - $validation .= "\n// update required fields"; - $validation .= "\nfunction updateFieldRequired(name,status)"; - $validation .= "\n{"; - $validation .= "\n\tvar not_required = jQuery('#jform_not_required').val();"; - $validation .= "\n\n\tif(status == 1)"; - $validation .= "\n\t{"; - $validation .= "\n\t\tif (isSet(not_required) && not_required != 0)"; - $validation .= "\n\t\t{"; - $validation .= "\n\t\t\tnot_required = not_required+','+name;"; - $validation .= "\n\t\t}"; - $validation .= "\n\t\telse"; - $validation .= "\n\t\t{"; - $validation .= "\n\t\t\tnot_required = ','+name;"; - $validation .= "\n\t\t}"; - $validation .= "\n\t}"; - $validation .= "\n\telse"; - $validation .= "\n\t{"; - $validation .= "\n\t\tif (isSet(not_required) && not_required != 0)"; - $validation .= "\n\t\t{"; - $validation .= "\n\t\t\tnot_required = not_required.replace(','+name,'');"; - $validation .= "\n\t\t}"; - $validation .= "\n\t}"; - $validation .= "\n\n\tjQuery('#jform_not_required').val(not_required);"; - $validation .= "\n}\n"; + $validation .= PHP_EOL."// update required fields"; + $validation .= PHP_EOL."function updateFieldRequired(name,status)"; + $validation .= PHP_EOL."{"; + $validation .= PHP_EOL."\tvar not_required = jQuery('#jform_not_required').val();"; + $validation .= PHP_EOL.PHP_EOL."\tif(status == 1)"; + $validation .= PHP_EOL."\t{"; + $validation .= PHP_EOL."\t\tif (isSet(not_required) && not_required != 0)"; + $validation .= PHP_EOL."\t\t{"; + $validation .= PHP_EOL."\t\t\tnot_required = not_required+','+name;"; + $validation .= PHP_EOL."\t\t}"; + $validation .= PHP_EOL."\t\telse"; + $validation .= PHP_EOL."\t\t{"; + $validation .= PHP_EOL."\t\t\tnot_required = ','+name;"; + $validation .= PHP_EOL."\t\t}"; + $validation .= PHP_EOL."\t}"; + $validation .= PHP_EOL."\telse"; + $validation .= PHP_EOL."\t{"; + $validation .= PHP_EOL."\t\tif (isSet(not_required) && not_required != 0)"; + $validation .= PHP_EOL."\t\t{"; + $validation .= PHP_EOL."\t\t\tnot_required = not_required.replace(','+name,'');"; + $validation .= PHP_EOL."\t\t}"; + $validation .= PHP_EOL."\t}"; + $validation .= PHP_EOL.PHP_EOL."\tjQuery('#jform_not_required').val(not_required);"; + $validation .= PHP_EOL."}".PHP_EOL; } // set the isSet function - $isSet = "\n// the isSet function"; - $isSet .= "\nfunction isSet(val)"; - $isSet .= "\n{"; - $isSet .= "\n\tif ((val != undefined) && (val != null) && 0 !== val.length){"; - $isSet .= "\n\t\treturn true;"; - $isSet .= "\n\t}"; - $isSet .= "\n\treturn false;"; - $isSet .= "\n}"; + $isSet = PHP_EOL."// the isSet function"; + $isSet .= PHP_EOL."function isSet(val)"; + $isSet .= PHP_EOL."{"; + $isSet .= PHP_EOL."\tif ((val != undefined) && (val != null) && 0 !== val.length){"; + $isSet .= PHP_EOL."\t\treturn true;"; + $isSet .= PHP_EOL."\t}"; + $isSet .= PHP_EOL."\treturn false;"; + $isSet .= PHP_EOL."}"; } // load to this buket $fileScript = $initial.$func.$validation.$isSet; @@ -7975,12 +8019,12 @@ class Interpretation extends Fields { $fileScript = ''; } - $fileScript .= "\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['view_file'][$viewName]); + $fileScript .= PHP_EOL.PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['view_file'][$viewName]); } // add custom script to footer if (isset($this->customScriptBuilder['view_footer'][$viewName]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['view_footer'][$viewName])) { - $customFooterScript = "\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['view_footer'][$viewName]); + $customFooterScript = PHP_EOL.PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['view_footer'][$viewName]); if (strpos($customFooterScript,'editBodyViewScriptBuilder[$viewName]['fileScript'] = $fileScript; @@ -8033,7 +8077,7 @@ class Interpretation extends Fields if (isset($footerScript) && ComponentbuilderHelper::checkString($footerScript)) { // add the needed script tags - $footerScript = "\n\n".'"; + $footerScript = PHP_EOL.PHP_EOL.'"; $this->editBodyViewScriptBuilder[$viewName]['footerScript'] = $footerScript; } } @@ -8048,13 +8092,13 @@ class Interpretation extends Fields $value = $getValue[$matchKey]; if ($value['isArray']) { - $initial .= "\n\t".$value['get']; + $initial .= PHP_EOL."\t".$value['get']; $funcsets[] = $matchKey; $array = true; } else { - $initial .= "\n\t".$value['get']; + $initial .= PHP_EOL."\t".$value['get']; $funcsets[] = $matchKey; } } @@ -8062,9 +8106,9 @@ class Interpretation extends Fields // make sure that the function is loaded only once if (ComponentbuilderHelper::checkArray($funcsets)) { - $initial .= "\n\t".$function."("; + $initial .= PHP_EOL."\t".$function."("; $initial .= implode(',',$funcsets); - $initial .= ");\n"; + $initial .= ");".PHP_EOL; } return array('code' => $initial, 'array' => $array); } @@ -8148,7 +8192,7 @@ class Interpretation extends Fields if($target['required'] === 'yes') { $unique = $uniqueVar.$this->uniquekey(3); - $bucket[$target['name']]['requiredVar'] = "jform_".$unique."_required = false;\n"; + $bucket[$target['name']]['requiredVar'] = "jform_".$unique."_required = false;".PHP_EOL; } else { @@ -8174,30 +8218,30 @@ class Interpretation extends Fields $targetType = "#jform_"; } // set the target behavior - $bucket[$target['name']]['behavior'] = "\n\t\tjQuery('".$targetType.$target['name'].$targetTypeSufix."').closest('.control-group').".$targetBehavior."();"; + $bucket[$target['name']]['behavior'] = PHP_EOL."\t\tjQuery('".$targetType.$target['name'].$targetTypeSufix."').closest('.control-group').".$targetBehavior."();"; // set the target default - $bucket[$target['name']]['default'] = "\n\t\tjQuery('".$targetType.$target['name'].$targetTypeSufix."').closest('.control-group').".$targetDefault."();"; + $bucket[$target['name']]['default'] = PHP_EOL."\t\tjQuery('".$targetType.$target['name'].$targetTypeSufix."').closest('.control-group').".$targetDefault."();"; // the hide required function if($target['required'] === 'yes') { - $hide = "\n\t\tif (!jform_".$unique."_required)"; - $hide .= "\n\t\t{"; - $hide .= "\n\t\t\tupdateFieldRequired('".$target['name']."',1);"; - $hide .= "\n\t\t\tjQuery('#jform_".$target['name']."').removeAttr('required');"; - $hide .= "\n\t\t\tjQuery('#jform_".$target['name']."').removeAttr('aria-required');"; - $hide .= "\n\t\t\tjQuery('#jform_".$target['name']."').removeClass('required');"; - $hide .= "\n\t\t\tjform_".$unique."_required = true;"; - $hide .= "\n\t\t}"; + $hide = PHP_EOL."\t\tif (!jform_".$unique."_required)"; + $hide .= PHP_EOL."\t\t{"; + $hide .= PHP_EOL."\t\t\tupdateFieldRequired('".$target['name']."',1);"; + $hide .= PHP_EOL."\t\t\tjQuery('#jform_".$target['name']."').removeAttr('required');"; + $hide .= PHP_EOL."\t\t\tjQuery('#jform_".$target['name']."').removeAttr('aria-required');"; + $hide .= PHP_EOL."\t\t\tjQuery('#jform_".$target['name']."').removeClass('required');"; + $hide .= PHP_EOL."\t\t\tjform_".$unique."_required = true;"; + $hide .= PHP_EOL."\t\t}"; $bucket[$target['name']]['hide'] = $hide; // the show required function - $show = "\n\t\tif (jform_".$unique."_required)"; - $show .= "\n\t\t{"; - $show .= "\n\t\t\tupdateFieldRequired('".$target['name']."',0);"; - $show .= "\n\t\t\tjQuery('#jform_".$target['name']."').prop('required','required');"; - $show .= "\n\t\t\tjQuery('#jform_".$target['name']."').attr('aria-required',true);"; - $show .= "\n\t\t\tjQuery('#jform_".$target['name']."').addClass('required');"; - $show .= "\n\t\t\tjform_".$unique."_required = false;"; - $show .= "\n\t\t}\n"; + $show = PHP_EOL."\t\tif (jform_".$unique."_required)"; + $show .= PHP_EOL."\t\t{"; + $show .= PHP_EOL."\t\t\tupdateFieldRequired('".$target['name']."',0);"; + $show .= PHP_EOL."\t\t\tjQuery('#jform_".$target['name']."').prop('required','required');"; + $show .= PHP_EOL."\t\t\tjQuery('#jform_".$target['name']."').attr('aria-required',true);"; + $show .= PHP_EOL."\t\t\tjQuery('#jform_".$target['name']."').addClass('required');"; + $show .= PHP_EOL."\t\t\tjform_".$unique."_required = false;"; + $show .= PHP_EOL."\t\t}".PHP_EOL; $bucket[$target['name']]['show'] = $show; // make sure that the axaj and other needed things for this view is loaded $this->validationFixBuilder[$viewName][] = $target['name']; @@ -8559,7 +8603,7 @@ class Interpretation extends Fields $keyName = $name.'_'.$unique; if ($type === 'checkboxes' || $extends === 'checkboxes') { - $select = "var ".$keyName." = [];\n\tjQuery('#jform_".$name." input[type=checkbox]').each(function()\n\t{\n\t\tif (jQuery(this).is(':checked'))\n\t\t{\n\t\t\t".$keyName.".push(jQuery(this).prop('value'));\n\t\t}\n\t});"; + $select = "var ".$keyName." = [];".PHP_EOL."\tjQuery('#jform_".$name." input[type=checkbox]').each(function()".PHP_EOL."\t{".PHP_EOL."\t\tif (jQuery(this).is(':checked'))".PHP_EOL."\t\t{".PHP_EOL."\t\t\t".$keyName.".push(jQuery(this).prop('value'));".PHP_EOL."\t\t}".PHP_EOL."\t});"; $isArray = true; } elseif($type === 'checkbox') @@ -8630,41 +8674,41 @@ class Interpretation extends Fields $fix = ''; if (isset($this->validationFixBuilder[$view]) && ComponentbuilderHelper::checkArray($this->validationFixBuilder[$view])) { - $fix .= "\n\n\t/**"; - $fix .= "\n\t* Method to validate the form data."; - $fix .= "\n\t*"; - $fix .= "\n\t* @param JForm \$form The form to validate against."; - $fix .= "\n\t* @param array \$data The data to validate."; - $fix .= "\n\t* @param string \$group The name of the field group to validate."; - $fix .= "\n\t*"; - $fix .= "\n\t* @return mixed Array of filtered data if valid, false otherwise."; - $fix .= "\n\t*"; - $fix .= "\n\t* @see JFormRule"; - $fix .= "\n\t* @see JFilterInput"; - $fix .= "\n\t* @since 12.2"; - $fix .= "\n\t*/"; - $fix .= "\n\tpublic function validate(\$form, \$data, \$group = null)"; - $fix .= "\n\t{"; - $fix .= "\n\t\t//".$this->setLine(__LINE__)." check if the not_required field is set"; - $fix .= "\n\t\tif (".$Component."Helper::checkString(\$data['not_required']))"; - $fix .= "\n\t\t{"; - $fix .= "\n\t\t\t\$requiredFields = (array) explode(',',(string) \$data['not_required']);"; - $fix .= "\n\t\t\t\$requiredFields = array_unique(\$requiredFields);"; - $fix .= "\n\t\t\t//".$this->setLine(__LINE__)." now change the required field attributes value"; - $fix .= "\n\t\t\tforeach (\$requiredFields as \$requiredField)"; - $fix .= "\n\t\t\t{"; - $fix .= "\n\t\t\t\t//".$this->setLine(__LINE__)." make sure there is a string value"; - $fix .= "\n\t\t\t\tif (".$Component."Helper::checkString(\$requiredField))"; - $fix .= "\n\t\t\t\t{"; - $fix .= "\n\t\t\t\t\t//".$this->setLine(__LINE__)." change to false"; - $fix .= "\n\t\t\t\t\t\$form->setFieldAttribute(\$requiredField, 'required', 'false');"; - $fix .= "\n\t\t\t\t\t//".$this->setLine(__LINE__)." also clear the data set"; - $fix .= "\n\t\t\t\t\t\$data[\$requiredField] = '';"; - $fix .= "\n\t\t\t\t}"; - $fix .= "\n\t\t\t}"; - $fix .= "\n\t\t}"; - $fix .= "\n\t\treturn parent::validate(\$form, \$data, \$group);"; - $fix .= "\n\t}"; + $fix .= PHP_EOL.PHP_EOL."\t/**"; + $fix .= PHP_EOL."\t* Method to validate the form data."; + $fix .= PHP_EOL."\t*"; + $fix .= PHP_EOL."\t* @param JForm \$form The form to validate against."; + $fix .= PHP_EOL."\t* @param array \$data The data to validate."; + $fix .= PHP_EOL."\t* @param string \$group The name of the field group to validate."; + $fix .= PHP_EOL."\t*"; + $fix .= PHP_EOL."\t* @return mixed Array of filtered data if valid, false otherwise."; + $fix .= PHP_EOL."\t*"; + $fix .= PHP_EOL."\t* @see JFormRule"; + $fix .= PHP_EOL."\t* @see JFilterInput"; + $fix .= PHP_EOL."\t* @since 12.2"; + $fix .= PHP_EOL."\t*/"; + $fix .= PHP_EOL."\tpublic function validate(\$form, \$data, \$group = null)"; + $fix .= PHP_EOL."\t{"; + $fix .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." check if the not_required field is set"; + $fix .= PHP_EOL."\t\tif (".$Component."Helper::checkString(\$data['not_required']))"; + $fix .= PHP_EOL."\t\t{"; + $fix .= PHP_EOL."\t\t\t\$requiredFields = (array) explode(',',(string) \$data['not_required']);"; + $fix .= PHP_EOL."\t\t\t\$requiredFields = array_unique(\$requiredFields);"; + $fix .= PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." now change the required field attributes value"; + $fix .= PHP_EOL."\t\t\tforeach (\$requiredFields as \$requiredField)"; + $fix .= PHP_EOL."\t\t\t{"; + $fix .= PHP_EOL."\t\t\t\t//".$this->setLine(__LINE__)." make sure there is a string value"; + $fix .= PHP_EOL."\t\t\t\tif (".$Component."Helper::checkString(\$requiredField))"; + $fix .= PHP_EOL."\t\t\t\t{"; + $fix .= PHP_EOL."\t\t\t\t\t//".$this->setLine(__LINE__)." change to false"; + $fix .= PHP_EOL."\t\t\t\t\t\$form->setFieldAttribute(\$requiredField, 'required', 'false');"; + $fix .= PHP_EOL."\t\t\t\t\t//".$this->setLine(__LINE__)." also clear the data set"; + $fix .= PHP_EOL."\t\t\t\t\t\$data[\$requiredField] = '';"; + $fix .= PHP_EOL."\t\t\t\t}"; + $fix .= PHP_EOL."\t\t\t}"; + $fix .= PHP_EOL."\t\t}"; + $fix .= PHP_EOL."\t\treturn parent::validate(\$form, \$data, \$group);"; + $fix .= PHP_EOL."\t}"; } return $fix; } @@ -8674,8 +8718,8 @@ class Interpretation extends Fields $fix = ''; if (isset($this->customScriptBuilder['token'][$view]) && $this->customScriptBuilder['token'][$view]) { - $fix .= "\n\t\t//".$this->setLine(__LINE__)." Add Ajax Token"; - $fix .= "\n\t\t\$document->addScriptDeclaration(\"var token = '\".JSession::getFormToken().\"';\");"; + $fix .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Add Ajax Token"; + $fix .= PHP_EOL."\t\t\$document->addScriptDeclaration(\"var token = '\".JSession::getFormToken().\"';\");"; } return $fix; } @@ -8697,7 +8741,7 @@ class Interpretation extends Fields { foreach ($taskArray as $name) { - $tasks .= "\n\t\t\$this->registerTask('".$name."', 'ajax');"; + $tasks .= PHP_EOL."\t\t\$this->registerTask('".$name."', 'ajax');"; } } } @@ -8716,9 +8760,9 @@ class Interpretation extends Fields { foreach ($view as $task) { - $input[$task['task_name']][] = "\n\t\t\t\t\t\t\$".$task['value_name']."Value = \$jinput->get('".$task['value_name']."', ".$task['input_default'].", '".$task['input_filter']."');"; + $input[$task['task_name']][] = PHP_EOL."\t\t\t\t\t\t\$".$task['value_name']."Value = \$jinput->get('".$task['value_name']."', ".$task['input_default'].", '".$task['input_filter']."');"; $valueArray[$task['task_name']][] = "\$".$task['value_name']."Value"; - $getModel[$task['task_name']] = "\n\t\t\t\t\t\t\t\$result = \$this->getModel('ajax')->".$task['method_name']."([[[valueArray]]]);"; + $getModel[$task['task_name']] = PHP_EOL."\t\t\t\t\t\t\t\$result = \$this->getModel('ajax')->".$task['method_name']."([[[valueArray]]]);"; // see user check is needed if (!isset($task['user_check']) || 1 == $task['user_check']) @@ -8737,10 +8781,10 @@ class Interpretation extends Fields { foreach ($getModel as $task => $getMethod) { - $cases .= "\n\t\t\t\tcase '".$task."':"; - $cases .= "\n\t\t\t\t\ttry"; - $cases .= "\n\t\t\t\t\t{"; - $cases .= "\n\t\t\t\t\t\t\$returnRaw = \$jinput->get('raw', false, 'BOOLEAN');"; + $cases .= PHP_EOL."\t\t\t\tcase '".$task."':"; + $cases .= PHP_EOL."\t\t\t\t\ttry"; + $cases .= PHP_EOL."\t\t\t\t\t{"; + $cases .= PHP_EOL."\t\t\t\t\t\t\$returnRaw = \$jinput->get('raw', false, 'BOOLEAN');"; foreach ($input[$task] as $string) { $cases .= $string; @@ -8750,39 +8794,39 @@ class Interpretation extends Fields $ifvalues = implode(' && ',$valueArray[$task]); // set the values to method $getMethod = str_replace('[[[valueArray]]]',$values,$getMethod); - $cases .= "\n\t\t\t\t\t\tif(".$ifvalues.$userCheck[$task].")"; - $cases .= "\n\t\t\t\t\t\t{"; + $cases .= PHP_EOL."\t\t\t\t\t\tif(".$ifvalues.$userCheck[$task].")"; + $cases .= PHP_EOL."\t\t\t\t\t\t{"; $cases .= $getMethod; - $cases .= "\n\t\t\t\t\t\t}"; - $cases .= "\n\t\t\t\t\t\telse"; - $cases .= "\n\t\t\t\t\t\t{"; - $cases .= "\n\t\t\t\t\t\t\t\$result = false;"; - $cases .= "\n\t\t\t\t\t\t}"; - $cases .= "\n\t\t\t\t\t\tif(\$callback = \$jinput->get('callback', null, 'CMD'))"; - $cases .= "\n\t\t\t\t\t\t{"; - $cases .= "\n\t\t\t\t\t\t\techo \$callback . \"(\".json_encode(\$result).\");\";"; - $cases .= "\n\t\t\t\t\t\t}"; - $cases .= "\n\t\t\t\t\t\telseif(\$returnRaw)"; - $cases .= "\n\t\t\t\t\t\t{"; - $cases .= "\n\t\t\t\t\t\t\techo json_encode(\$result);"; - $cases .= "\n\t\t\t\t\t\t}"; - $cases .= "\n\t\t\t\t\t\telse"; - $cases .= "\n\t\t\t\t\t\t{"; - $cases .= "\n\t\t\t\t\t\t\techo \"(\".json_encode(\$result).\");\";"; - $cases .= "\n\t\t\t\t\t\t}"; - $cases .= "\n\t\t\t\t\t}"; - $cases .= "\n\t\t\t\t\tcatch(Exception \$e)"; - $cases .= "\n\t\t\t\t\t{"; - $cases .= "\n\t\t\t\t\t\tif(\$callback = \$jinput->get('callback', null, 'CMD'))"; - $cases .= "\n\t\t\t\t\t\t{"; - $cases .= "\n\t\t\t\t\t\t\techo \$callback.\"(\".json_encode(\$e).\");\";"; - $cases .= "\n\t\t\t\t\t\t}"; - $cases .= "\n\t\t\t\t\t\telse"; - $cases .= "\n\t\t\t\t\t\t{"; - $cases .= "\n\t\t\t\t\t\t\techo \"(\".json_encode(\$e).\");\";"; - $cases .= "\n\t\t\t\t\t\t}"; - $cases .= "\n\t\t\t\t\t}"; - $cases .= "\n\t\t\t\tbreak;"; + $cases .= PHP_EOL."\t\t\t\t\t\t}"; + $cases .= PHP_EOL."\t\t\t\t\t\telse"; + $cases .= PHP_EOL."\t\t\t\t\t\t{"; + $cases .= PHP_EOL."\t\t\t\t\t\t\t\$result = false;"; + $cases .= PHP_EOL."\t\t\t\t\t\t}"; + $cases .= PHP_EOL."\t\t\t\t\t\tif(\$callback = \$jinput->get('callback', null, 'CMD'))"; + $cases .= PHP_EOL."\t\t\t\t\t\t{"; + $cases .= PHP_EOL."\t\t\t\t\t\t\techo \$callback . \"(\".json_encode(\$result).\");\";"; + $cases .= PHP_EOL."\t\t\t\t\t\t}"; + $cases .= PHP_EOL."\t\t\t\t\t\telseif(\$returnRaw)"; + $cases .= PHP_EOL."\t\t\t\t\t\t{"; + $cases .= PHP_EOL."\t\t\t\t\t\t\techo json_encode(\$result);"; + $cases .= PHP_EOL."\t\t\t\t\t\t}"; + $cases .= PHP_EOL."\t\t\t\t\t\telse"; + $cases .= PHP_EOL."\t\t\t\t\t\t{"; + $cases .= PHP_EOL."\t\t\t\t\t\t\techo \"(\".json_encode(\$result).\");\";"; + $cases .= PHP_EOL."\t\t\t\t\t\t}"; + $cases .= PHP_EOL."\t\t\t\t\t}"; + $cases .= PHP_EOL."\t\t\t\t\tcatch(Exception \$e)"; + $cases .= PHP_EOL."\t\t\t\t\t{"; + $cases .= PHP_EOL."\t\t\t\t\t\tif(\$callback = \$jinput->get('callback', null, 'CMD'))"; + $cases .= PHP_EOL."\t\t\t\t\t\t{"; + $cases .= PHP_EOL."\t\t\t\t\t\t\techo \$callback.\"(\".json_encode(\$e).\");\";"; + $cases .= PHP_EOL."\t\t\t\t\t\t}"; + $cases .= PHP_EOL."\t\t\t\t\t\telse"; + $cases .= PHP_EOL."\t\t\t\t\t\t{"; + $cases .= PHP_EOL."\t\t\t\t\t\t\techo \"(\".json_encode(\$e).\");\";"; + $cases .= PHP_EOL."\t\t\t\t\t\t}"; + $cases .= PHP_EOL."\t\t\t\t\t}"; + $cases .= PHP_EOL."\t\t\t\tbreak;"; } } } @@ -8796,7 +8840,7 @@ class Interpretation extends Fields { foreach ($this->customScriptBuilder[$target]['ajax_model'] as $view => $method) { - $methods .= "\n\n\t//".$this->setLine(__LINE__)." Used in ".$view."\n"; + $methods .= PHP_EOL.PHP_EOL."\t//".$this->setLine(__LINE__)." Used in ".$view.PHP_EOL; $methods .= str_replace(array_keys($this->placeholders),array_values($this->placeholders),$method); } } @@ -8815,13 +8859,13 @@ class Interpretation extends Fields { if ($filter['type'] != 'category' && ComponentbuilderHelper::checkArray($filter['custom']) && $filter['custom']['extends'] === 'user') { - $function[] = "\n\tprotected function getThe".$filter['function'].ComponentbuilderHelper::safeString($filter['custom']['text'],'F')."Selections()"; + $function[] = PHP_EOL."\tprotected function getThe".$filter['function'].ComponentbuilderHelper::safeString($filter['custom']['text'],'F')."Selections()"; $function[] = "\t{"; $function[] = "\t\t//".$this->setLine(__LINE__)." Get a db connection."; $function[] = "\t\t\$db = JFactory::getDbo();"; - $function[] = "\n\t\t//".$this->setLine(__LINE__)." Create a new query object."; + $function[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Create a new query object."; $function[] = "\t\t\$query = \$db->getQuery(true);"; - $function[] = "\n\t\t//".$this->setLine(__LINE__)." Select the text."; + $function[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Select the text."; $function[] = "\t\t\$query->select(\$db->quoteName(array('a.".$filter['custom']['id']."','a.".$filter['custom']['text']."')));"; $function[] = "\t\t\$query->from(\$db->quoteName('".$filter['custom']['table']."', 'a'));"; $function[] = "\t\t//".$this->setLine(__LINE__)." get the targeted groups"; @@ -8832,9 +8876,9 @@ class Interpretation extends Fields $function[] = "\t\t\t\$query->where('group.group_id IN (' . implode(',', \$groups) . ')');"; $function[] = "\t\t}"; $function[] = "\t\t\$query->order('a.".$filter['custom']['text']." ASC');"; - $function[] = "\n\t\t//".$this->setLine(__LINE__)." Reset the query using our newly populated query object."; + $function[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Reset the query using our newly populated query object."; $function[] = "\t\t\$db->setQuery(\$query);"; - $function[] = "\n\t\t\$results = \$db->loadObjectList();"; + $function[] = PHP_EOL."\t\t\$results = \$db->loadObjectList();"; $function[] = "\t\tif (\$results)"; $function[] = "\t\t{"; $function[] = "\t\t\t\$filter = array();"; @@ -8850,21 +8894,21 @@ class Interpretation extends Fields /* else { - $function[] = "\n\tprotected function getThe".$filter['function'].ComponentbuilderHelper::safeString($filter['custom']['text'],'F')."Selections()"; + $function[] = PHP_EOL."\tprotected function getThe".$filter['function'].ComponentbuilderHelper::safeString($filter['custom']['text'],'F')."Selections()"; $function[] = "\t{"; $function[] = "\t\t//".$this->setLine(__LINE__)." Get a db connection."; $function[] = "\t\t\$db = JFactory::getDbo();"; - $function[] = "\n\t\t//".$this->setLine(__LINE__)." Select the text."; + $function[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Select the text."; $function[] = "\t\t\$query = \$db->getQuery(true);"; - $function[] = "\n\t\t//".$this->setLine(__LINE__)." Select the text."; + $function[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Select the text."; $function[] = "\t\t\$query->select(\$db->quoteName(array('".$filter['custom']['id']."','".$filter['custom']['text']."')));"; $function[] = "\t\t\$query->from(\$db->quoteName('".$filter['custom']['table']."'));"; $function[] = "\t\t\$query->where(\$db->quoteName('published') . ' = 1');"; $function[] = "\t\t\$query->order(\$db->quoteName('".$filter['custom']['text']."') . ' ASC');"; - $function[] = "\n\t\t//".$this->setLine(__LINE__)." Reset the query using our newly populated query object."; + $function[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Reset the query using our newly populated query object."; $function[] = "\t\t\$db->setQuery(\$query);"; - $function[] = "\n\t\t\$results = \$db->loadObjectList();"; - $function[] = "\n\t\tif (\$results)"; + $function[] = PHP_EOL."\t\t\$results = \$db->loadObjectList();"; + $function[] = PHP_EOL."\t\tif (\$results)"; $function[] = "\t\t{"; $function[] = "\t\t\t\$filter = array();"; $function[] = "\t\t\t\$batch = array();"; @@ -8895,20 +8939,20 @@ class Interpretation extends Fields { $translation = true; } - $function[] = "\n\tprotected function getThe".$filter['function']."Selections()"; + $function[] = PHP_EOL."\tprotected function getThe".$filter['function']."Selections()"; $function[] = "\t{"; $function[] = "\t\t//".$this->setLine(__LINE__)." Get a db connection."; $function[] = "\t\t\$db = JFactory::getDbo();"; - $function[] = "\n\t\t//".$this->setLine(__LINE__)." Create a new query object."; + $function[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Create a new query object."; $function[] = "\t\t\$query = \$db->getQuery(true);"; - $function[] = "\n\t\t//".$this->setLine(__LINE__)." Select the text."; + $function[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Select the text."; $function[] = "\t\t\$query->select(\$db->quoteName('".$filter['code']."'));"; $function[] = "\t\t\$query->from(\$db->quoteName('#__".$component."_".$filter['database']."'));"; $function[] = "\t\t\$query->order(\$db->quoteName('".$filter['code']."') . ' ASC');"; - $function[] = "\n\t\t//".$this->setLine(__LINE__)." Reset the query using our newly populated query object."; + $function[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Reset the query using our newly populated query object."; $function[] = "\t\t\$db->setQuery(\$query);"; - $function[] = "\n\t\t\$results = \$db->loadColumn();"; - $function[] = "\n\t\tif (\$results)"; + $function[] = PHP_EOL."\t\t\$results = \$db->loadColumn();"; + $function[] = PHP_EOL."\t\tif (\$results)"; $function[] = "\t\t{"; // check if translated vlaue is used if ($translation) @@ -8949,7 +8993,7 @@ class Interpretation extends Fields if (ComponentbuilderHelper::checkArray($function)) { // return the function - return "\n".implode("\n",$function); + return PHP_EOL.implode(PHP_EOL,$function); } } return ''; @@ -8958,7 +9002,7 @@ class Interpretation extends Fields public function setUniqueFields(&$view) { $fields = array(); - $fields[] = "\n\n\t/**"; + $fields[] = PHP_EOL.PHP_EOL."\t/**"; $fields[] = "\t * Method to get the unique fields of this table."; $fields[] = "\t *"; $fields[] = "\t * @return mixed An array of field names, boolean false if none is set."; @@ -8977,7 +9021,7 @@ class Interpretation extends Fields } $fields[] = "\t}"; // return the unique fields - return implode("\n",$fields); + return implode(PHP_EOL,$fields); } public function setOtherFilter(&$view) @@ -8992,7 +9036,7 @@ class Interpretation extends Fields $CodeName = ComponentbuilderHelper::safeString($filter['code'].' '.$filter['custom']['text'],'W'); $codeName = $filter['code'].ComponentbuilderHelper::safeString($filter['custom']['text'],'F'); $type = ComponentbuilderHelper::safeString($filter['custom']['type'],'F'); - $otherFilter[] = "\n\t\t//".$this->setLine(__LINE__)." Set ".$CodeName." Selection"; + $otherFilter[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Set ".$CodeName." Selection"; $otherFilter[] = "\t\t\$this->".$codeName."Options = JFormHelper::loadFieldType('".$type."')->getOptions();"; $otherFilter[] = "\t\tif (\$this->".$codeName."Options)"; $otherFilter[] = "\t\t{"; @@ -9003,7 +9047,7 @@ class Interpretation extends Fields $otherFilter[] = "\t\t\t\tJHtml::_('select.options', \$this->".$codeName."Options, 'value', 'text', \$this->state->get('filter.".$filter['code']."'))"; $otherFilter[] = "\t\t\t);"; - $otherFilter[] = "\n\t\t\tif (\$this->canBatch && \$this->canCreate && \$this->canEdit)"; + $otherFilter[] = PHP_EOL."\t\t\tif (\$this->canBatch && \$this->canCreate && \$this->canEdit)"; $otherFilter[] = "\t\t\t{"; $otherFilter[] = "\t\t\t\t//".$this->setLine(__LINE__)." ".$CodeName." Batch Selection"; $otherFilter[] = "\t\t\t\tJHtmlBatch_::addListSelection("; @@ -9026,7 +9070,7 @@ class Interpretation extends Fields { $functionName = "\$this->getThe".$filter['function']."Selections();"; } - $otherFilter[] = "\n\t\t//".$this->setLine(__LINE__)." Set ".$Codename." Selection"; + $otherFilter[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Set ".$Codename." Selection"; $otherFilter[] = "\t\t\$this->".$filter['code']."Options = ".$functionName; $otherFilter[] = "\t\tif (\$this->".$filter['code']."Options)"; $otherFilter[] = "\t\t{"; @@ -9037,7 +9081,7 @@ class Interpretation extends Fields $otherFilter[] = "\t\t\t\tJHtml::_('select.options', \$this->".$filter['code']."Options, 'value', 'text', \$this->state->get('filter.".$filter['code']."'))"; $otherFilter[] = "\t\t\t);"; - $otherFilter[] = "\n\t\t\tif (\$this->canBatch && \$this->canCreate && \$this->canEdit)"; + $otherFilter[] = PHP_EOL."\t\t\tif (\$this->canBatch && \$this->canCreate && \$this->canEdit)"; $otherFilter[] = "\t\t\t{"; $otherFilter[] = "\t\t\t\t//".$this->setLine(__LINE__)." ".$Codename." Batch Selection"; $otherFilter[] = "\t\t\t\tJHtmlBatch_::addListSelection("; @@ -9053,7 +9097,7 @@ class Interpretation extends Fields if (ComponentbuilderHelper::checkArray($otherFilter)) { // return the filter - return "\n".implode("\n",$otherFilter); + return PHP_EOL.implode(PHP_EOL,$otherFilter); } } return ''; @@ -9077,7 +9121,7 @@ class Interpretation extends Fields $COMONENT = ComponentbuilderHelper::safeString($this->componentData->name_code,'U'); // set filter $filter = array(); - $filter[] = "\n\n\t\t//".$this->setLine(__LINE__)." Category Filter."; + $filter[] = PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Category Filter."; $filter[] = "\t\tJHtmlSidebar::addFilter("; $filter[] = "\t\t\tJText::_('JOPTION_SELECT_CATEGORY'),"; $filter[] = "\t\t\t'filter_category_id',"; @@ -9085,7 +9129,7 @@ class Interpretation extends Fields $filter[] = "\t\t);"; - $filter[] = "\n\t\tif (\$this->canBatch && \$this->canCreate && \$this->canEdit)"; + $filter[] = PHP_EOL."\t\tif (\$this->canBatch && \$this->canCreate && \$this->canEdit)"; $filter[] = "\t\t{"; $filter[] = "\t\t\t//".$this->setLine(__LINE__)." Category Batch selection."; $filter[] = "\t\t\tJHtmlBatch_::addListSelection("; @@ -9096,7 +9140,7 @@ class Interpretation extends Fields $filter[] = "\t\t}"; // return the filter - return implode("\n",$filter); + return implode(PHP_EOL,$filter); } return ''; } @@ -9122,11 +9166,11 @@ class Interpretation extends Fields // return category view string if (isset($this->fileContentStatic['###ROUTER_CATEGORY_VIEWS###']) && ComponentbuilderHelper::checkString($this->fileContentStatic['###ROUTER_CATEGORY_VIEWS###'])) { - return ",\n\t\t\t".'"com_'.$component.'.'.$otherViews.'" => "'.$otherView.'"'; + return ",".PHP_EOL."\t\t\t".'"com_'.$component.'.'.$otherViews.'" => "'.$otherView.'"'; } else { - return "\n\t\t\t".'"com_'.$component.'.'.$otherViews.'" => "'.$otherView.'"'; + return PHP_EOL."\t\t\t".'"com_'.$component.'.'.$otherViews.'" => "'.$otherView.'"'; } } return ''; @@ -9146,7 +9190,8 @@ class Interpretation extends Fields $coreLoad = true; } // check if item has category - if(isset($this->categoryBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->categoryBuilder[$viewName_list])){ + if(0) //isset($this->categoryBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->categoryBuilder[$viewName_list])) <-- remove category from check + { // check if category has another name if ($coreLoad && isset($this->catOtherName[$viewName_list]) && ComponentbuilderHelper::checkArray($this->catOtherName[$viewName_list])) { @@ -9159,12 +9204,12 @@ class Interpretation extends Fields $otherView = $viewName_single; } // setup the category script - $allow[] = "\n\t\t//".$this->setLine(__LINE__)." get the user object"; + $allow[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." get the user object"; $allow[] = "\t\t\$user = JFactory::getUser();"; // check if the item has permissions. if ($coreLoad && isset($core['core.access']) && isset($this->permissionBuilder['global'][$core['core.access']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.access']]) && in_array($otherView,$this->permissionBuilder['global'][$core['core.access']])) { - $allow[] = "\n\t\t//".$this->setLine(__LINE__)." Access check."; + $allow[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Access check."; $allow[] = "\t\t\$access = \$user->authorise('".$core['core.access']."', 'com_".$component."');"; $allow[] = "\t\tif (!\$access)"; $allow[] = "\t\t{"; @@ -9173,12 +9218,12 @@ class Interpretation extends Fields } $allow[] = "\t\t\$categoryId = JArrayHelper::getValue(\$data, 'catid', \$this->input->getInt('filter_category_id'), 'int');"; $allow[] = "\t\t\$allow = null;"; - $allow[] = "\n\t\tif (\$categoryId)"; + $allow[] = PHP_EOL."\t\tif (\$categoryId)"; $allow[] = "\t\t{"; $allow[] = "\t\t\t//".$this->setLine(__LINE__)." If the category has been passed in the URL check it."; $allow[] = "\t\t\t\$allow = \$user->authorise('core.create', \$this->option . '.".$otherViews.".category.' . \$categoryId);"; $allow[] = "\t\t}"; - $allow[] = "\n\t\tif (\$allow === null)"; + $allow[] = PHP_EOL."\t\tif (\$allow === null)"; $allow[] = "\t\t{"; // check if the item has permissions. if ($coreLoad && isset($core['core.create']) && isset($this->permissionBuilder['global'][$core['core.create']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.create']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.create']])) @@ -9204,7 +9249,7 @@ class Interpretation extends Fields // check if the item has permissions. if ($coreLoad && isset($core['core.access']) && isset($this->permissionBuilder['global'][$core['core.access']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.access']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.access']])) { - $allow[] = "\n\t\t//".$this->setLine(__LINE__)." Access check."; + $allow[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Access check."; $allow[] = "\t\t\$access = JFactory::getUser()->authorise('".$core['core.access']."', 'com_".$component."');"; $allow[] = "\t\tif (!\$access)"; $allow[] = "\t\t{"; @@ -9225,7 +9270,7 @@ class Interpretation extends Fields $allow[] = "\t\treturn parent::allowAdd(\$data);"; } } - return implode("\n",$allow); + return implode(PHP_EOL,$allow); } public function setJcontrollerAllowEdit($viewName_single,$viewName_list) @@ -9264,14 +9309,14 @@ class Interpretation extends Fields // check if the item has permissions. if ($coreLoad && isset($core['core.access']) && isset($this->permissionBuilder['global'][$core['core.access']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.access']]) && in_array($otherView,$this->permissionBuilder['global'][$core['core.access']])) { - $allow[] = "\n\t\t//".$this->setLine(__LINE__)." Access check."; + $allow[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Access check."; $allow[] = "\t\t\$access = (\$user->authorise('".$core['core.access']."', 'com_".$component.".".$otherView.".' . (int) \$recordId) && \$user->authorise('".$core['core.access']."', 'com_".$component."'));"; $allow[] = "\t\tif (!\$access)"; $allow[] = "\t\t{"; $allow[] = "\t\t\treturn false;"; $allow[] = "\t\t}"; } - $allow[] = "\n\t\tif (\$recordId)"; + $allow[] = PHP_EOL."\t\tif (\$recordId)"; $allow[] = "\t\t{"; $allow[] = "\t\t\t//".$this->setLine(__LINE__)." The record has been set. Check the record permissions."; // check if the item has permissions. @@ -9301,13 +9346,13 @@ class Interpretation extends Fields $allow[] = "\t\t\t\t\t{"; $allow[] = "\t\t\t\t\t\t//".$this->setLine(__LINE__)." Need to do a lookup from the model."; $allow[] = "\t\t\t\t\t\t\$record = \$this->getModel()->getItem(\$recordId);"; - $allow[] = "\n\t\t\t\t\t\tif (empty(\$record))"; + $allow[] = PHP_EOL."\t\t\t\t\t\tif (empty(\$record))"; $allow[] = "\t\t\t\t\t\t{"; $allow[] = "\t\t\t\t\t\t\treturn false;"; $allow[] = "\t\t\t\t\t\t}"; $allow[] = "\t\t\t\t\t\t\$ownerId = \$record->created_by;"; $allow[] = "\t\t\t\t\t}"; - $allow[] = "\n\t\t\t\t\t//".$this->setLine(__LINE__)." If the owner matches 'me' then do the test."; + $allow[] = PHP_EOL."\t\t\t\t\t//".$this->setLine(__LINE__)." If the owner matches 'me' then do the test."; $allow[] = "\t\t\t\t\tif (\$ownerId == \$user->id)"; $allow[] = "\t\t\t\t\t{"; // check if the item has permissions. @@ -9326,16 +9371,16 @@ class Interpretation extends Fields $allow[] = "\t\t\t\t}"; $allow[] = "\t\t\t\treturn false;"; $allow[] = "\t\t\t}"; - $allow[] = "\n\t\t\t\$categoryId = (int) isset(\$data['catid']) ? \$data['catid']: \$this->getModel()->getItem(\$recordId)->catid;"; - $allow[] = "\n\t\t\tif (\$categoryId)"; - $allow[] = "\t\t\t{"; - $allow[] = "\t\t\t\t//".$this->setLine(__LINE__)." The category has been set. Check the category permissions."; - $allow[] = "\t\t\t\t\$catpermission = \$user->authorise('core.edit', \$this->option . '.".$otherViews.".category.' . \$categoryId);"; - $allow[] = "\t\t\t\tif (!\$catpermission && !is_null(\$catpermission))"; - $allow[] = "\t\t\t\t{"; - $allow[] = "\t\t\t\t\treturn false;"; - $allow[] = "\t\t\t\t}"; - $allow[] = "\t\t\t}"; +// $allow[] = PHP_EOL."\t\t\t\$categoryId = (int) isset(\$data['catid']) ? \$data['catid']: \$this->getModel()->getItem(\$recordId)->catid;"; <-- remove category from check +// $allow[] = PHP_EOL."\t\t\tif (\$categoryId)"; +// $allow[] = "\t\t\t{"; +// $allow[] = "\t\t\t\t//".$this->setLine(__LINE__)." The category has been set. Check the category permissions."; +// $allow[] = "\t\t\t\t\$catpermission = \$user->authorise('core.edit', \$this->option . '.".$otherView.".category.' . \$categoryId);"; +// $allow[] = "\t\t\t\tif (!\$catpermission && !is_null(\$catpermission))"; +// $allow[] = "\t\t\t\t{"; +// $allow[] = "\t\t\t\t\treturn false;"; +// $allow[] = "\t\t\t\t}"; +// $allow[] = "\t\t\t}"; $allow[] = "\t\t}"; if ($coreLoad && isset($core['core.edit']) && isset($this->permissionBuilder['global'][$core['core.edit']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit']]) && in_array($otherView,$this->permissionBuilder['global'][$core['core.edit']])) { @@ -9351,7 +9396,7 @@ class Interpretation extends Fields else { // setup the category script - $allow[] = "\n\t\t//".$this->setLine(__LINE__)." get user object."; + $allow[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." get user object."; $allow[] = "\t\t\$user\t\t= JFactory::getUser();"; $allow[] = "\t\t//".$this->setLine(__LINE__)." get record id."; $allow[] = "\t\t\$recordId\t= (int) isset(\$data[\$key]) ? \$data[\$key] : 0;"; @@ -9360,14 +9405,14 @@ class Interpretation extends Fields // check if the item has permissions. if ($coreLoad && isset($core['core.access']) && isset($this->permissionBuilder[$core['core.access']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder[$core['core.access']]) && in_array($viewName_single,$this->permissionBuilder[$core['core.access']])) { - $allow[] = "\n\t\t//".$this->setLine(__LINE__)." Access check."; + $allow[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Access check."; $allow[] = "\t\t\$access = (\$user->authorise('".$core['core.access']."', 'com_".$component.".".$viewName_single.".' . (int) \$recordId) && \$user->authorise('".$core['core.access']."', 'com_".$component."'));"; $allow[] = "\t\tif (!\$access)"; $allow[] = "\t\t{"; $allow[] = "\t\t\treturn false;"; $allow[] = "\t\t}"; } - $allow[] = "\n\t\tif (\$recordId)"; + $allow[] = PHP_EOL."\t\tif (\$recordId)"; $allow[] = "\t\t{"; $allow[] = "\t\t\t//".$this->setLine(__LINE__)." The record has been set. Check the record permissions."; // check if the item has permissions. @@ -9397,13 +9442,13 @@ class Interpretation extends Fields $allow[] = "\t\t\t\t\t{"; $allow[] = "\t\t\t\t\t\t//".$this->setLine(__LINE__)." Need to do a lookup from the model."; $allow[] = "\t\t\t\t\t\t\$record = \$this->getModel()->getItem(\$recordId);"; - $allow[] = "\n\t\t\t\t\t\tif (empty(\$record))"; + $allow[] = PHP_EOL."\t\t\t\t\t\tif (empty(\$record))"; $allow[] = "\t\t\t\t\t\t{"; $allow[] = "\t\t\t\t\t\t\treturn false;"; $allow[] = "\t\t\t\t\t\t}"; $allow[] = "\t\t\t\t\t\t\$ownerId = \$record->created_by;"; $allow[] = "\t\t\t\t\t}"; - $allow[] = "\n\t\t\t\t\t//".$this->setLine(__LINE__)." If the owner matches 'me' then allow."; + $allow[] = PHP_EOL."\t\t\t\t\t//".$this->setLine(__LINE__)." If the owner matches 'me' then allow."; $allow[] = "\t\t\t\t\tif (\$ownerId == \$user->id)"; $allow[] = "\t\t\t\t\t{"; // check if the item has permissions. @@ -9435,7 +9480,7 @@ class Interpretation extends Fields } } - return implode("\n",$allow); + return implode(PHP_EOL,$allow); } public function setJmodelAdminGetForm($viewName_single,$viewName_list) @@ -9444,9 +9489,9 @@ class Interpretation extends Fields $component = ComponentbuilderHelper::safeString($this->componentData->name_code); // allways load these $allow = array(); - $allow[] = "\n\t\t//".$this->setLine(__LINE__)." Get the form."; + $allow[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the form."; $allow[] = "\t\t\$form = \$this->loadForm('com_".$component.".".$viewName_single."', '".$viewName_single."', array('control' => 'jform', 'load_data' => \$loadData));"; - $allow[] = "\n\t\tif (empty(\$form))"; + $allow[] = PHP_EOL."\t\tif (empty(\$form))"; $allow[] = "\t\t{"; $allow[] = "\t\t\treturn false;"; $allow[] = "\t\t}"; @@ -9462,7 +9507,8 @@ class Interpretation extends Fields $core = $this->permissionCore[$viewName_single]; $coreLoad = true; } - if(isset($this->categoryBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->categoryBuilder[$viewName_list])){ + if(0) //isset($this->categoryBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->categoryBuilder[$viewName_list])) <-- remove category from check + { // check if category has another name if ($coreLoad && isset($this->catOtherName[$viewName_list]) && ComponentbuilderHelper::checkArray($this->catOtherName[$viewName_list])) { @@ -9475,8 +9521,8 @@ class Interpretation extends Fields $otherView = $viewName_single; } // setup the category script - $allow[] = "\n\t\t\$jinput = JFactory::getApplication()->input;"; - $allow[] = "\n\t\t//".$this->setLine(__LINE__)." The front end calls this model and uses a_id to avoid id clashes so we need to check for that first."; + $allow[] = PHP_EOL."\t\t\$jinput = JFactory::getApplication()->input;"; + $allow[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." The front end calls this model and uses a_id to avoid id clashes so we need to check for that first."; $allow[] = "\t\tif (\$jinput->get('a_id'))"; $allow[] = "\t\t{"; $allow[] = "\t\t\t\$id = \$jinput->get('a_id', 0, 'INT');"; @@ -9490,14 +9536,14 @@ class Interpretation extends Fields $allow[] = "\t\tif (\$this->getState('".$viewName_single.".id'))"; $allow[] = "\t\t{"; $allow[] = "\t\t\t\$id = \$this->getState('".$viewName_single.".id');"; - $allow[] = "\n\t\t\t\$catid = 0;"; + $allow[] = PHP_EOL."\t\t\t\$catid = 0;"; $allow[] = "\t\t\tif (isset(\$this->getItem(\$id)->catid))"; $allow[] = "\t\t\t{"; $allow[] = "\t\t\t\t//".$this->setLine(__LINE__)." set catagory id"; $allow[] = "\t\t\t\t\$catid = \$this->getItem(\$id)->catid;"; - $allow[] = "\n\t\t\t\t//".$this->setLine(__LINE__)." Existing record. Can only edit in selected categories."; + $allow[] = PHP_EOL."\t\t\t\t//".$this->setLine(__LINE__)." Existing record. Can only edit in selected categories."; $allow[] = "\t\t\t\t\$form->setFieldAttribute('catid', 'action', 'core.edit');"; - $allow[] = "\n\t\t\t\t//".$this->setLine(__LINE__)." Existing record. Can only edit own items in selected categories."; + $allow[] = PHP_EOL."\t\t\t\t//".$this->setLine(__LINE__)." Existing record. Can only edit own items in selected categories."; $allow[] = "\t\t\t\t\$form->setFieldAttribute('catid', 'action', 'core.edit.own');"; $allow[] = "\t\t\t}"; $allow[] = "\t\t}"; @@ -9506,8 +9552,8 @@ class Interpretation extends Fields $allow[] = "\t\t\t//".$this->setLine(__LINE__)." New record. Can only create in selected categories."; $allow[] = "\t\t\t\$form->setFieldAttribute('catid', 'action', 'core.create');"; $allow[] = "\t\t}"; - $allow[] = "\n\t\t\$user = JFactory::getUser();"; - $allow[] = "\n\t\t//".$this->setLine(__LINE__)." Check for existing item."; + $allow[] = PHP_EOL."\t\t\$user = JFactory::getUser();"; + $allow[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Check for existing item."; $allow[] = "\t\t//".$this->setLine(__LINE__)." Modify the form based on Edit State access controls."; // check if the item has permissions. if ($coreLoad && isset($core['core.edit.state']) && isset($this->permissionBuilder[$core['core.edit.state']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder[$core['core.edit.state']]) && in_array($viewName_single,$this->permissionBuilder[$core['core.edit.state']])) @@ -9526,15 +9572,15 @@ class Interpretation extends Fields $allow[] = "\t\t\t//".$this->setLine(__LINE__)." Disable fields for display."; $allow[] = "\t\t\t\$form->setFieldAttribute('ordering', 'disabled', 'true');"; $allow[] = "\t\t\t\$form->setFieldAttribute('published', 'disabled', 'true');"; - $allow[] = "\n\t\t\t//".$this->setLine(__LINE__)." Disable fields while saving."; + $allow[] = PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Disable fields while saving."; $allow[] = "\t\t\t\$form->setFieldAttribute('ordering', 'filter', 'unset');"; $allow[] = "\t\t\t\$form->setFieldAttribute('published', 'filter', 'unset');"; $allow[] = "\t\t}"; } else { - $allow[] = "\n\t\t\$jinput = JFactory::getApplication()->input;"; - $allow[] = "\n\t\t//".$this->setLine(__LINE__)." The front end calls this model and uses a_id to avoid id clashes so we need to check for that first."; + $allow[] = PHP_EOL."\t\t\$jinput = JFactory::getApplication()->input;"; + $allow[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." The front end calls this model and uses a_id to avoid id clashes so we need to check for that first."; $allow[] = "\t\tif (\$jinput->get('a_id'))"; $allow[] = "\t\t{"; $allow[] = "\t\t\t\$id = \$jinput->get('a_id', 0, 'INT');"; @@ -9544,8 +9590,8 @@ class Interpretation extends Fields $allow[] = "\t\t{"; $allow[] = "\t\t\t\$id = \$jinput->get('id', 0, 'INT');"; $allow[] = "\t\t}"; - $allow[] = "\n\t\t\$user = JFactory::getUser();"; - $allow[] = "\n\t\t//".$this->setLine(__LINE__)." Check for existing item."; + $allow[] = PHP_EOL."\t\t\$user = JFactory::getUser();"; + $allow[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Check for existing item."; $allow[] = "\t\t//".$this->setLine(__LINE__)." Modify the form based on Edit State access controls."; // check if the item has permissions. if ($coreLoad && isset($core['core.edit.state']) && isset($this->permissionBuilder[$core['core.edit.state']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder[$core['core.edit.state']]) && in_array($viewName_single,$this->permissionBuilder[$core['core.edit.state']])) @@ -9653,9 +9699,9 @@ class Interpretation extends Fields $allow[] = "\t\t\t}"; $allow[] = "\t\t}"; // setup the default script - $allow[] = "\n\t\treturn \$form;"; + $allow[] = PHP_EOL."\t\treturn \$form;"; - return implode("\n",$allow); + return implode(PHP_EOL,$allow); } public function setJmodelAdminAllowEdit($viewName_single,$viewName_list) @@ -9664,7 +9710,7 @@ class Interpretation extends Fields // set component name $component = ComponentbuilderHelper::safeString($this->componentData->name_code); // prepare custom permission script - $customAllow = $this->getCustomScriptBuilder('php_allowedit', $viewName_single, "\t\t\$recordId\t= (int) isset(\$data[\$key]) ? \$data[\$key] : 0;\n"); + $customAllow = $this->getCustomScriptBuilder('php_allowedit', $viewName_single, "\t\t\$recordId\t= (int) isset(\$data[\$key]) ? \$data[\$key] : 0;".PHP_EOL); // setup correct core target $coreLoad = false; if (isset($this->permissionCore[$viewName_single])) @@ -9675,7 +9721,7 @@ class Interpretation extends Fields // check if the item has permissions. if ($coreLoad && isset($core['core.edit']) && isset($this->permissionBuilder[$core['core.edit']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder[$core['core.edit']]) && in_array($viewName_single,$this->permissionBuilder[$core['core.edit']])) { - $allow[] = "\n\t\t//".$this->setLine(__LINE__)." Check specific edit permission then general edit permission."; + $allow[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Check specific edit permission then general edit permission."; $allow[] = "\t\t\$user = JFactory::getUser();"; // load custom permission script $allow[] = $customAllow; @@ -9683,7 +9729,7 @@ class Interpretation extends Fields } else { - $allow[] = "\n\t\t//".$this->setLine(__LINE__)." Check specific edit permission then general edit permission."; + $allow[] = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Check specific edit permission then general edit permission."; if (ComponentbuilderHelper::checkString($customAllow)) { $allow[] = "\t\t\$user = JFactory::getUser();"; @@ -9693,7 +9739,7 @@ class Interpretation extends Fields $allow[] = "\t\treturn JFactory::getUser()->authorise('core.edit', 'com_".$component.".".$viewName_single.".'. ((int) isset(\$data[\$key]) ? \$data[\$key] : 0)) or parent::allowEdit(\$data, \$key);"; } - return implode("\n",$allow); + return implode(PHP_EOL,$allow); } public function setJmodelAdminCanDelete($viewName_single,$viewName_list) @@ -9708,7 +9754,8 @@ class Interpretation extends Fields $core = $this->permissionCore[$viewName_single]; $coreLoad = true; } - if(isset($this->categoryBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->categoryBuilder[$viewName_list])){ + if(0) //isset($this->categoryBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->categoryBuilder[$viewName_list])) <-- remove category from check + { // check if category has another name if ($coreLoad && isset($this->catOtherName[$viewName_list]) && ComponentbuilderHelper::checkArray($this->catOtherName[$viewName_list])) { @@ -9721,18 +9768,18 @@ class Interpretation extends Fields $otherView = $viewName_single; } // setup the category script - $allow[] = "\n\t\tif (!empty(\$record->id))"; + $allow[] = PHP_EOL."\t\tif (!empty(\$record->id))"; $allow[] = "\t\t{"; $allow[] = "\t\t\tif (\$record->published != -2)"; $allow[] = "\t\t\t{"; $allow[] = "\t\t\t\treturn;"; $allow[] = "\t\t\t}"; - $allow[] = "\n\t\t\t\$user = JFactory::getUser();"; + $allow[] = PHP_EOL."\t\t\t\$user = JFactory::getUser();"; $allow[] = "\t\t\t\$allow = \$user->authorise('core.delete', 'com_".$component.".".$otherViews.".category.' . (int) \$record->catid);"; // check if the item has permissions. if ($coreLoad && isset($this->permissionBuilder[$core['core.delete']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder[$core['core.delete']]) && in_array($otherView,$this->permissionBuilder[$core['core.delete']])) { - $allow[] = "\n\t\t\tif (\$allow)"; + $allow[] = PHP_EOL."\t\t\tif (\$allow)"; $allow[] = "\t\t\t{"; $allow[] = "\t\t\t\t//".$this->setLine(__LINE__)." The record has been set. Check the record permissions."; $allow[] = "\t\t\t\treturn \$user->authorise('".$core['core.delete']."', 'com_".$component.".".$otherView.".' . (int) \$record->id);"; @@ -9740,7 +9787,7 @@ class Interpretation extends Fields } else { - $allow[] = "\n\t\t\tif (\$allow)"; + $allow[] = PHP_EOL."\t\t\tif (\$allow)"; $allow[] = "\t\t\t{"; $allow[] = "\t\t\t\t//".$this->setLine(__LINE__)." The record has been set. Check the record permissions."; $allow[] = "\t\t\t\treturn \$user->authorise('core.delete', 'com_".$component.".".$otherView.".' . (int) \$record->id);"; @@ -9753,7 +9800,7 @@ class Interpretation extends Fields else { // setup the default script - $allow[] = "\n\t\tif (!empty(\$record->id))"; + $allow[] = PHP_EOL."\t\tif (!empty(\$record->id))"; $allow[] = "\t\t{"; $allow[] = "\t\t\tif (\$record->published != -2)"; $allow[] = "\t\t\t{"; @@ -9762,13 +9809,13 @@ class Interpretation extends Fields // check if the item has permissions. if ($coreLoad && (isset($core['core.delete']) && isset($this->permissionBuilder[$core['core.delete']])) && ComponentbuilderHelper::checkArray($this->permissionBuilder[$core['core.delete']]) && in_array($viewName_single,$this->permissionBuilder[$core['core.delete']])) { - $allow[] = "\n\t\t\t\$user = JFactory::getUser();"; + $allow[] = PHP_EOL."\t\t\t\$user = JFactory::getUser();"; $allow[] = "\t\t\t//".$this->setLine(__LINE__)." The record has been set. Check the record permissions."; $allow[] = "\t\t\treturn \$user->authorise('".$core['core.delete']."', 'com_".$component.".".$viewName_single.".' . (int) \$record->id);"; } else { - $allow[] = "\n\t\t\t\$user = JFactory::getUser();"; + $allow[] = PHP_EOL."\t\t\t\$user = JFactory::getUser();"; $allow[] = "\t\t\t//".$this->setLine(__LINE__)." The record has been set. Check the record permissions."; $allow[] = "\t\t\treturn \$user->authorise('core.delete', 'com_".$component.".".$viewName_single.".' . (int) \$record->id);"; } @@ -9776,7 +9823,7 @@ class Interpretation extends Fields $allow[] = "\t\treturn false;"; } - return implode("\n",$allow); + return implode(PHP_EOL,$allow); } public function setJmodelAdminCanEditState($viewName_single,$viewName_list) @@ -9791,7 +9838,8 @@ class Interpretation extends Fields $core = $this->permissionCore[$viewName_single]; $coreLoad = true; } - if(isset($this->categoryBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->categoryBuilder[$viewName_list])){ + if(0) // isset($this->categoryBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->categoryBuilder[$viewName_list])) <-- remove category from check + { // check if category has another name if (isset($this->catOtherName[$viewName_list]) && ComponentbuilderHelper::checkArray($this->catOtherName[$viewName_list])) { @@ -9803,9 +9851,9 @@ class Interpretation extends Fields $otherViews = $viewName_list; $otherView = $viewName_single; } - $allow[] = "\n\t\t\$user = JFactory::getUser();"; + $allow[] = PHP_EOL."\t\t\$user = JFactory::getUser();"; $allow[] = "\t\t\$recordId\t= (!empty(\$record->id)) ? \$record->id : 0;"; - $allow[] = "\n\t\tif (\$recordId)"; + $allow[] = PHP_EOL."\t\tif (\$recordId)"; $allow[] = "\t\t{"; $allow[] = "\t\t\t//".$this->setLine(__LINE__)." The record has been set. Check the record permissions."; // check if the item has permissions. @@ -9846,9 +9894,9 @@ class Interpretation extends Fields else { // setup the default script - $allow[] = "\n\t\t\$user = JFactory::getUser();"; + $allow[] = PHP_EOL."\t\t\$user = JFactory::getUser();"; $allow[] = "\t\t\$recordId\t= (!empty(\$record->id)) ? \$record->id : 0;"; - $allow[] = "\n\t\tif (\$recordId)"; + $allow[] = PHP_EOL."\t\tif (\$recordId)"; $allow[] = "\t\t{"; $allow[] = "\t\t\t//".$this->setLine(__LINE__)." The record has been set. Check the record permissions."; // check if the item has permissions. @@ -9876,7 +9924,7 @@ class Interpretation extends Fields $allow[] = "\t\treturn parent::canEditState(\$record);"; } } - return implode("\n",$allow); + return implode(PHP_EOL,$allow); } @@ -9896,11 +9944,11 @@ class Interpretation extends Fields // check if the item has permissions for edit. if ($coreLoad && isset($core['core.edit']) && isset($this->permissionBuilder['global'][$core['core.edit']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.edit']])) { - $allow[] = "\n\t\t\$this->canEdit\t\t= \$this->canDo->get('".$core['core.edit']."');"; + $allow[] = PHP_EOL."\t\t\$this->canEdit\t\t= \$this->canDo->get('".$core['core.edit']."');"; } else { - $allow[] = "\n\t\t\$this->canEdit\t\t= \$this->canDo->get('core.edit');"; + $allow[] = PHP_EOL."\t\t\$this->canEdit\t\t= \$this->canDo->get('core.edit');"; } // check if the item has permissions for edit state. if ($coreLoad && isset($core['core.edit.state']) && isset($this->permissionBuilder['global'][$core['core.edit.state']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit.state']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.edit.state']])) @@ -9939,7 +9987,7 @@ class Interpretation extends Fields $allow[] = "\t\t\$this->canBatch\t= \$this->canDo->get('core.batch');"; } - return implode("\n",$allow); + return implode(PHP_EOL,$allow); } public function setFieldSetAccessControl(&$view) @@ -9953,26 +10001,26 @@ class Interpretation extends Fields $label = 'Permissions in relation to this '.$view; // set the access fieldset $access = ""; - $access .= "\n\t".'
'; - $access .= "\n\t\t"; - $access .= "\n\t\t".''; - $access .= "\n\t\t"; - $access .= "\n\t\t".''; - $access .= "\n\t".'
'; + $access .= PHP_EOL."\t".'
'; + $access .= PHP_EOL."\t\t"; + $access .= PHP_EOL."\t\t".''; + $access .= PHP_EOL."\t\t"; + $access .= PHP_EOL."\t\t".''; + $access .= PHP_EOL."\t".'
'; } // return access field set return $access; @@ -9984,14 +10032,14 @@ class Interpretation extends Fields $donelist = array('id','search','published','access','created_by','modified_by'); // default filter fields $fields = "'a.id','id'"; - $fields .= ",\n\t\t\t\t'a.published','published'"; + $fields .= ",".PHP_EOL."\t\t\t\t'a.published','published'"; if (isset($this->accessBuilder[$view]) && ComponentbuilderHelper::checkString($this->accessBuilder[$view])) { - $fields .= ",\n\t\t\t\t'a.access','access'"; + $fields .= ",".PHP_EOL."\t\t\t\t'a.access','access'"; } - $fields .= ",\n\t\t\t\t'a.ordering','ordering'"; - $fields .= ",\n\t\t\t\t'a.created_by','created_by'"; - $fields .= ",\n\t\t\t\t'a.modified_by','modified_by'"; + $fields .= ",".PHP_EOL."\t\t\t\t'a.ordering','ordering'"; + $fields .= ",".PHP_EOL."\t\t\t\t'a.created_by','created_by'"; + $fields .= ",".PHP_EOL."\t\t\t\t'a.modified_by','modified_by'"; // add the rest of the set filters if (isset($this->sortBuilder[$view]) && ComponentbuilderHelper::checkArray($this->sortBuilder[$view])) @@ -10002,11 +10050,11 @@ class Interpretation extends Fields { if ($filter['type'] === 'category') { - $fields .= ",\n\t\t\t\t'c.title','category_title'"; - $fields .= ",\n\t\t\t\t'c.id', 'category_id'"; + $fields .= ",".PHP_EOL."\t\t\t\t'c.title','category_title'"; + $fields .= ",".PHP_EOL."\t\t\t\t'c.id', 'category_id'"; if ($filter['code'] != 'category') { - $fields .= ",\n\t\t\t\t'a.".$filter['code']."', '".$filter['code']."'"; + $fields .= ",".PHP_EOL."\t\t\t\t'a.".$filter['code']."', '".$filter['code']."'"; } } else @@ -10014,9 +10062,9 @@ class Interpretation extends Fields // check if custom field is set /*if (ComponentbuilderHelper::checkArray($filter['custom'])) { - $fields .= ",\n\t\t\t\t'".$filter['custom']['db'].".".$filter['custom']['text']."','".$filter['code']."_".$filter['custom']['text']."'"; + $fields .= ",".PHP_EOL."\t\t\t\t'".$filter['custom']['db'].".".$filter['custom']['text']."','".$filter['code']."_".$filter['custom']['text']."'"; }*/ - $fields .= ",\n\t\t\t\t'a.".$filter['code']."','".$filter['code']."'"; + $fields .= ",".PHP_EOL."\t\t\t\t'a.".$filter['code']."','".$filter['code']."'"; } $donelist[] = $filter['code']; } @@ -10031,11 +10079,11 @@ class Interpretation extends Fields { if ($filter['type'] === 'category') { - $fields .= ",\n\t\t\t\t'c.title','category_title'"; - $fields .= ",\n\t\t\t\t'c.id', 'category_id'"; + $fields .= ",".PHP_EOL."\t\t\t\t'c.title','category_title'"; + $fields .= ",".PHP_EOL."\t\t\t\t'c.id', 'category_id'"; if ($filter['code'] != 'category') { - $fields .= ",\n\t\t\t\t'a.".$filter['code']."', '".$filter['code']."'"; + $fields .= ",".PHP_EOL."\t\t\t\t'a.".$filter['code']."', '".$filter['code']."'"; } } else @@ -10043,9 +10091,9 @@ class Interpretation extends Fields // check if custom field is set /*if (ComponentbuilderHelper::checkArray($filter['custom'])) { - $fields .= ",\n\t\t\t\t'".$filter['custom']['db'].".".$filter['custom']['text']."','".$filter['code']."_".$filter['custom']['text']."'"; + $fields .= ",".PHP_EOL."\t\t\t\t'".$filter['custom']['db'].".".$filter['custom']['text']."','".$filter['code']."_".$filter['custom']['text']."'"; }*/ - $fields .= ",\n\t\t\t\t'a.".$filter['code']."','".$filter['code']."'"; + $fields .= ",".PHP_EOL."\t\t\t\t'a.".$filter['code']."','".$filter['code']."'"; } $donelist[] = $filter['code']; } @@ -10060,16 +10108,16 @@ class Interpretation extends Fields $donelist = array('id','search','published','access','created_by','modified_by'); // set the defaults first $stored = "//".$this->setLine(__LINE__)." Compile the store id."; - $stored .= "\n\t\t\$id .= ':' . \$this->getState('filter.id');"; - $stored .= "\n\t\t\$id .= ':' . \$this->getState('filter.search');"; - $stored .= "\n\t\t\$id .= ':' . \$this->getState('filter.published');"; + $stored .= PHP_EOL."\t\t\$id .= ':' . \$this->getState('filter.id');"; + $stored .= PHP_EOL."\t\t\$id .= ':' . \$this->getState('filter.search');"; + $stored .= PHP_EOL."\t\t\$id .= ':' . \$this->getState('filter.published');"; if (isset($this->accessBuilder[$view]) && ComponentbuilderHelper::checkString($this->accessBuilder[$view])) { - $stored .= "\n\t\t\$id .= ':' . \$this->getState('filter.access');"; + $stored .= PHP_EOL."\t\t\$id .= ':' . \$this->getState('filter.access');"; } - $stored .= "\n\t\t\$id .= ':' . \$this->getState('filter.ordering');"; - $stored .= "\n\t\t\$id .= ':' . \$this->getState('filter.created_by');"; - $stored .= "\n\t\t\$id .= ':' . \$this->getState('filter.modified_by');"; + $stored .= PHP_EOL."\t\t\$id .= ':' . \$this->getState('filter.ordering');"; + $stored .= PHP_EOL."\t\t\$id .= ':' . \$this->getState('filter.created_by');"; + $stored .= PHP_EOL."\t\t\$id .= ':' . \$this->getState('filter.modified_by');"; // add the rest of the set filters if (isset($this->sortBuilder[$view]) && ComponentbuilderHelper::checkArray($this->sortBuilder[$view])) { @@ -10079,11 +10127,11 @@ class Interpretation extends Fields { if ($filter['type'] === 'category') { - $stored .= "\n\t\t\$id .= ':' . \$this->getState('filter.category');"; - $stored .= "\n\t\t\$id .= ':' . \$this->getState('filter.category_id');"; + $stored .= PHP_EOL."\t\t\$id .= ':' . \$this->getState('filter.category');"; + $stored .= PHP_EOL."\t\t\$id .= ':' . \$this->getState('filter.category_id');"; if ($filter['code'] != 'category') { - $stored .= "\n\t\t\$id .= ':' . \$this->getState('filter.".$filter['code']."');"; + $stored .= PHP_EOL."\t\t\$id .= ':' . \$this->getState('filter.".$filter['code']."');"; } } else @@ -10091,9 +10139,9 @@ class Interpretation extends Fields // check if custom field is set /*if (ComponentbuilderHelper::checkArray($filter['custom'])) { - $stored .= "\n\t\t\$id .= ':' . \$this->getState('filter.".$filter['code']."_".$filter['custom']['text']."');"; + $stored .= PHP_EOL."\t\t\$id .= ':' . \$this->getState('filter.".$filter['code']."_".$filter['custom']['text']."');"; }*/ - $stored .= "\n\t\t\$id .= ':' . \$this->getState('filter.".$filter['code']."');"; + $stored .= PHP_EOL."\t\t\$id .= ':' . \$this->getState('filter.".$filter['code']."');"; } $donelist[] = $filter['code']; } @@ -10108,11 +10156,11 @@ class Interpretation extends Fields { if ($filter['type'] === 'category') { - $stored .= "\n\t\t\$id .= ':' . \$this->getState('filter.category');"; - $stored .= "\n\t\t\$id .= ':' . \$this->getState('filter.category_id');"; + $stored .= PHP_EOL."\t\t\$id .= ':' . \$this->getState('filter.category');"; + $stored .= PHP_EOL."\t\t\$id .= ':' . \$this->getState('filter.category_id');"; if ($filter['code'] != 'category') { - $stored .= "\n\t\t\$id .= ':' . \$this->getState('filter.".$filter['code']."');"; + $stored .= PHP_EOL."\t\t\$id .= ':' . \$this->getState('filter.".$filter['code']."');"; } } else @@ -10120,9 +10168,9 @@ class Interpretation extends Fields // check if custom field is set /*if (ComponentbuilderHelper::checkArray($filter['custom'])) { - $stored .= "\n\t\t\$id .= ':' . \$this->getState('filter.".$filter['code']."_".$filter['custom']['text']."');"; + $stored .= PHP_EOL."\t\t\$id .= ':' . \$this->getState('filter.".$filter['code']."_".$filter['custom']['text']."');"; }*/ - $stored .= "\n\t\t\$id .= ':' . \$this->getState('filter.".$filter['code']."');"; + $stored .= PHP_EOL."\t\t\$id .= ':' . \$this->getState('filter.".$filter['code']."');"; } $donelist[] = $filter['code']; } @@ -10152,8 +10200,8 @@ class Interpretation extends Fields // build toolbar $toolBar = "JFactory::getApplication()->input->set('hidemainmenu', true);"; - $toolBar .= "\n\t\tJToolBarHelper::title(JText::_('".$viewNameLang_readonly."'), '".$viewName."');"; - $toolBar .= "\n\t\tJToolBarHelper::cancel('".$viewName.".cancel', 'JTOOLBAR_CLOSE');"; + $toolBar .= PHP_EOL."\t\tJToolBarHelper::title(JText::_('".$viewNameLang_readonly."'), '".$viewName."');"; + $toolBar .= PHP_EOL."\t\tJToolBarHelper::cancel('".$viewName.".cancel', 'JTOOLBAR_CLOSE');"; } else { @@ -10165,141 +10213,141 @@ class Interpretation extends Fields $this->langContent[$this->lang][$viewNameLang_edit] = 'Editing the '.$view['settings']->name_single; // build toolbar $toolBar = "JFactory::getApplication()->input->set('hidemainmenu', true);"; - $toolBar .= "\n\t\t\$user = JFactory::getUser();"; - $toolBar .= "\n\t\t\$userId = \$user->id;"; - $toolBar .= "\n\t\t\$isNew = \$this->item->id == 0;"; - $toolBar .= "\n\n\t\tJToolbarHelper::title( JText::_(\$isNew ? '".$viewNameLang_new."' : '".$viewNameLang_edit."'), 'pencil-2 article-add');"; - $toolBar .= "\n\t\t//".$this->setLine(__LINE__)." Built the actions for new and existing records."; - $toolBar .= "\n\t\tif (\$this->refid || \$this->ref)"; - $toolBar .= "\n\t\t{"; + $toolBar .= PHP_EOL."\t\t\$user = JFactory::getUser();"; + $toolBar .= PHP_EOL."\t\t\$userId = \$user->id;"; + $toolBar .= PHP_EOL."\t\t\$isNew = \$this->item->id == 0;"; + $toolBar .= PHP_EOL.PHP_EOL."\t\tJToolbarHelper::title( JText::_(\$isNew ? '".$viewNameLang_new."' : '".$viewNameLang_edit."'), 'pencil-2 article-add');"; + $toolBar .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Built the actions for new and existing records."; + $toolBar .= PHP_EOL."\t\tif (\$this->refid || \$this->ref)"; + $toolBar .= PHP_EOL."\t\t{"; if ($coreLoad && isset($core['core.create']) && isset($this->permissionBuilder['global'][$core['core.create']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.create']]) && in_array($viewName,$this->permissionBuilder['global'][$core['core.create']])) { - $toolBar .= "\n\t\t\tif (\$this->canDo->get('".$core['core.create']."') && \$isNew)"; + $toolBar .= PHP_EOL."\t\t\tif (\$this->canDo->get('".$core['core.create']."') && \$isNew)"; } else { - $toolBar .= "\n\t\t\tif (\$this->canDo->get('core.create') && \$isNew)"; + $toolBar .= PHP_EOL."\t\t\tif (\$this->canDo->get('core.create') && \$isNew)"; } - $toolBar .= "\n\t\t\t{"; - $toolBar .= "\n\t\t\t\t//".$this->setLine(__LINE__)." We can create the record."; - $toolBar .= "\n\t\t\t\tJToolBarHelper::save('".$viewName.".save', 'JTOOLBAR_SAVE');"; - $toolBar .= "\n\t\t\t}"; + $toolBar .= PHP_EOL."\t\t\t{"; + $toolBar .= PHP_EOL."\t\t\t\t//".$this->setLine(__LINE__)." We can create the record."; + $toolBar .= PHP_EOL."\t\t\t\tJToolBarHelper::save('".$viewName.".save', 'JTOOLBAR_SAVE');"; + $toolBar .= PHP_EOL."\t\t\t}"; if ($coreLoad && isset($core['core.edit']) && isset($this->permissionBuilder['global'][$core['core.edit']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit']]) && in_array($viewName,$this->permissionBuilder['global'][$core['core.edit']])) { - $toolBar .= "\n\t\t\telseif (\$this->canDo->get('".$core['core.edit']."'))"; + $toolBar .= PHP_EOL."\t\t\telseif (\$this->canDo->get('".$core['core.edit']."'))"; } else { - $toolBar .= "\n\t\t\telseif (\$this->canDo->get('core.edit'))"; + $toolBar .= PHP_EOL."\t\t\telseif (\$this->canDo->get('core.edit'))"; } - $toolBar .= "\n\t\t\t{"; - $toolBar .= "\n\t\t\t\t//".$this->setLine(__LINE__)." We can save the record."; - $toolBar .= "\n\t\t\t\tJToolBarHelper::save('".$viewName.".save', 'JTOOLBAR_SAVE');"; - $toolBar .= "\n\t\t\t}"; - $toolBar .= "\n\t\t\tif (\$isNew)"; - $toolBar .= "\n\t\t\t{"; - $toolBar .= "\n\t\t\t\t//".$this->setLine(__LINE__)." Do not creat but cancel."; - $toolBar .= "\n\t\t\t\tJToolBarHelper::cancel('".$viewName.".cancel', 'JTOOLBAR_CANCEL');"; - $toolBar .= "\n\t\t\t}"; - $toolBar .= "\n\t\t\telse"; - $toolBar .= "\n\t\t\t{"; - $toolBar .= "\n\t\t\t\t//".$this->setLine(__LINE__)." We can close it."; - $toolBar .= "\n\t\t\t\tJToolBarHelper::cancel('".$viewName.".cancel', 'JTOOLBAR_CLOSE');"; - $toolBar .= "\n\t\t\t}"; - $toolBar .= "\n\t\t}"; - $toolBar .= "\n\t\telse"; - $toolBar .= "\n\t\t{"; - $toolBar .= "\n\t\t\tif (\$isNew)"; - $toolBar .= "\n\t\t\t{"; - $toolBar .= "\n\t\t\t\t//".$this->setLine(__LINE__)." For new records, check the create permission."; + $toolBar .= PHP_EOL."\t\t\t{"; + $toolBar .= PHP_EOL."\t\t\t\t//".$this->setLine(__LINE__)." We can save the record."; + $toolBar .= PHP_EOL."\t\t\t\tJToolBarHelper::save('".$viewName.".save', 'JTOOLBAR_SAVE');"; + $toolBar .= PHP_EOL."\t\t\t}"; + $toolBar .= PHP_EOL."\t\t\tif (\$isNew)"; + $toolBar .= PHP_EOL."\t\t\t{"; + $toolBar .= PHP_EOL."\t\t\t\t//".$this->setLine(__LINE__)." Do not creat but cancel."; + $toolBar .= PHP_EOL."\t\t\t\tJToolBarHelper::cancel('".$viewName.".cancel', 'JTOOLBAR_CANCEL');"; + $toolBar .= PHP_EOL."\t\t\t}"; + $toolBar .= PHP_EOL."\t\t\telse"; + $toolBar .= PHP_EOL."\t\t\t{"; + $toolBar .= PHP_EOL."\t\t\t\t//".$this->setLine(__LINE__)." We can close it."; + $toolBar .= PHP_EOL."\t\t\t\tJToolBarHelper::cancel('".$viewName.".cancel', 'JTOOLBAR_CLOSE');"; + $toolBar .= PHP_EOL."\t\t\t}"; + $toolBar .= PHP_EOL."\t\t}"; + $toolBar .= PHP_EOL."\t\telse"; + $toolBar .= PHP_EOL."\t\t{"; + $toolBar .= PHP_EOL."\t\t\tif (\$isNew)"; + $toolBar .= PHP_EOL."\t\t\t{"; + $toolBar .= PHP_EOL."\t\t\t\t//".$this->setLine(__LINE__)." For new records, check the create permission."; if ($coreLoad && isset($core['core.create']) && isset($this->permissionBuilder['global'][$core['core.create']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.create']]) && in_array($viewName,$this->permissionBuilder['global'][$core['core.create']])) { - $toolBar .= "\n\t\t\t\tif (\$this->canDo->get('".$core['core.create']."'))"; + $toolBar .= PHP_EOL."\t\t\t\tif (\$this->canDo->get('".$core['core.create']."'))"; } else { - $toolBar .= "\n\t\t\t\tif (\$this->canDo->get('core.create'))"; + $toolBar .= PHP_EOL."\t\t\t\tif (\$this->canDo->get('core.create'))"; } - $toolBar .= "\n\t\t\t\t{"; - $toolBar .= "\n\t\t\t\t\tJToolBarHelper::apply('".$viewName.".apply', 'JTOOLBAR_APPLY');"; - $toolBar .= "\n\t\t\t\t\tJToolBarHelper::save('".$viewName.".save', 'JTOOLBAR_SAVE');"; - $toolBar .= "\n\t\t\t\t\tJToolBarHelper::custom('".$viewName.".save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);"; - $toolBar .= "\n\t\t\t\t};"; - $toolBar .= "\n\t\t\t\tJToolBarHelper::cancel('".$viewName.".cancel', 'JTOOLBAR_CANCEL');"; - $toolBar .= "\n\t\t\t}"; - $toolBar .= "\n\t\t\telse"; - $toolBar .= "\n\t\t\t{"; + $toolBar .= PHP_EOL."\t\t\t\t{"; + $toolBar .= PHP_EOL."\t\t\t\t\tJToolBarHelper::apply('".$viewName.".apply', 'JTOOLBAR_APPLY');"; + $toolBar .= PHP_EOL."\t\t\t\t\tJToolBarHelper::save('".$viewName.".save', 'JTOOLBAR_SAVE');"; + $toolBar .= PHP_EOL."\t\t\t\t\tJToolBarHelper::custom('".$viewName.".save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);"; + $toolBar .= PHP_EOL."\t\t\t\t};"; + $toolBar .= PHP_EOL."\t\t\t\tJToolBarHelper::cancel('".$viewName.".cancel', 'JTOOLBAR_CANCEL');"; + $toolBar .= PHP_EOL."\t\t\t}"; + $toolBar .= PHP_EOL."\t\t\telse"; + $toolBar .= PHP_EOL."\t\t\t{"; if ($coreLoad && isset($core['core.edit']) && isset($this->permissionBuilder['global'][$core['core.edit']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit']]) && in_array($viewName,$this->permissionBuilder['global'][$core['core.edit']])) { - $toolBar .= "\n\t\t\t\tif (\$this->canDo->get('".$core['core.edit']."'))"; + $toolBar .= PHP_EOL."\t\t\t\tif (\$this->canDo->get('".$core['core.edit']."'))"; } else { - $toolBar .= "\n\t\t\t\tif (\$this->canDo->get('core.edit'))"; + $toolBar .= PHP_EOL."\t\t\t\tif (\$this->canDo->get('core.edit'))"; } - $toolBar .= "\n\t\t\t\t{"; - $toolBar .= "\n\t\t\t\t\t//".$this->setLine(__LINE__)." We can save the new record"; - $toolBar .= "\n\t\t\t\t\tJToolBarHelper::apply('".$viewName.".apply', 'JTOOLBAR_APPLY');"; - $toolBar .= "\n\t\t\t\t\tJToolBarHelper::save('".$viewName.".save', 'JTOOLBAR_SAVE');"; - $toolBar .= "\n\t\t\t\t\t//".$this->setLine(__LINE__)." We can save this record, but check the create permission to see"; - $toolBar .= "\n\t\t\t\t\t//".$this->setLine(__LINE__)." if we can return to make a new one."; + $toolBar .= PHP_EOL."\t\t\t\t{"; + $toolBar .= PHP_EOL."\t\t\t\t\t//".$this->setLine(__LINE__)." We can save the new record"; + $toolBar .= PHP_EOL."\t\t\t\t\tJToolBarHelper::apply('".$viewName.".apply', 'JTOOLBAR_APPLY');"; + $toolBar .= PHP_EOL."\t\t\t\t\tJToolBarHelper::save('".$viewName.".save', 'JTOOLBAR_SAVE');"; + $toolBar .= PHP_EOL."\t\t\t\t\t//".$this->setLine(__LINE__)." We can save this record, but check the create permission to see"; + $toolBar .= PHP_EOL."\t\t\t\t\t//".$this->setLine(__LINE__)." if we can return to make a new one."; if ($coreLoad && isset($core['core.create']) && isset($this->permissionBuilder['global'][$core['core.create']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.create']]) && in_array($viewName,$this->permissionBuilder['global'][$core['core.create']])) { - $toolBar .= "\n\t\t\t\t\tif (\$this->canDo->get('".$core['core.create']."'))"; + $toolBar .= PHP_EOL."\t\t\t\t\tif (\$this->canDo->get('".$core['core.create']."'))"; } else { - $toolBar .= "\n\t\t\t\t\tif (\$this->canDo->get('core.create'))"; + $toolBar .= PHP_EOL."\t\t\t\t\tif (\$this->canDo->get('core.create'))"; } - $toolBar .= "\n\t\t\t\t\t{"; - $toolBar .= "\n\t\t\t\t\t\tJToolBarHelper::custom('".$viewName.".save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);"; - $toolBar .= "\n\t\t\t\t\t}"; - $toolBar .= "\n\t\t\t\t}"; + $toolBar .= PHP_EOL."\t\t\t\t\t{"; + $toolBar .= PHP_EOL."\t\t\t\t\t\tJToolBarHelper::custom('".$viewName.".save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);"; + $toolBar .= PHP_EOL."\t\t\t\t\t}"; + $toolBar .= PHP_EOL."\t\t\t\t}"; if ($coreLoad && isset($core['core.edit']) && isset($this->permissionBuilder['global'][$core['core.edit']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit']]) && in_array($viewName,$this->permissionBuilder['global'][$core['core.edit']])) { if ($coreLoad && isset($this->historyBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->historyBuilder[$viewName])) { - $toolBar .= "\n\t\t\t\t\$canVersion = (\$this->canDo->get('core.version') && \$this->canDo->get('".$core['core.version']."'));"; - $toolBar .= "\n\t\t\t\tif (\$this->state->params->get('save_history', 1) && \$this->canDo->get('".$core['core.edit']."') && \$canVersion)"; - $toolBar .= "\n\t\t\t\t{"; - $toolBar .= "\n\t\t\t\t\tJToolbarHelper::versions('com_".$this->fileContentStatic['###component###'].".".$viewName."', \$this->item->id);"; - $toolBar .= "\n\t\t\t\t}"; + $toolBar .= PHP_EOL."\t\t\t\t\$canVersion = (\$this->canDo->get('core.version') && \$this->canDo->get('".$core['core.version']."'));"; + $toolBar .= PHP_EOL."\t\t\t\tif (\$this->state->params->get('save_history', 1) && \$this->canDo->get('".$core['core.edit']."') && \$canVersion)"; + $toolBar .= PHP_EOL."\t\t\t\t{"; + $toolBar .= PHP_EOL."\t\t\t\t\tJToolbarHelper::versions('com_".$this->fileContentStatic['###component###'].".".$viewName."', \$this->item->id);"; + $toolBar .= PHP_EOL."\t\t\t\t}"; } } else { if ($coreLoad && isset($this->historyBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->historyBuilder[$viewName])) { - $toolBar .= "\n\t\t\t\t\$canVersion = (\$this->canDo->get('core.version') && \$this->canDo->get('".$core['core.version']."'));"; - $toolBar .= "\n\t\t\t\tif (\$this->state->params->get('save_history', 1) && \$this->canDo->get('core.edit') && \$canVersion)"; - $toolBar .= "\n\t\t\t\t{"; - $toolBar .= "\n\t\t\t\t\tJToolbarHelper::versions('com_".$this->fileContentStatic['###component###'].".".$viewName."', \$this->item->id);"; - $toolBar .= "\n\t\t\t\t}"; + $toolBar .= PHP_EOL."\t\t\t\t\$canVersion = (\$this->canDo->get('core.version') && \$this->canDo->get('".$core['core.version']."'));"; + $toolBar .= PHP_EOL."\t\t\t\tif (\$this->state->params->get('save_history', 1) && \$this->canDo->get('core.edit') && \$canVersion)"; + $toolBar .= PHP_EOL."\t\t\t\t{"; + $toolBar .= PHP_EOL."\t\t\t\t\tJToolbarHelper::versions('com_".$this->fileContentStatic['###component###'].".".$viewName."', \$this->item->id);"; + $toolBar .= PHP_EOL."\t\t\t\t}"; } } if ($coreLoad && isset($core['core.create']) && isset($this->permissionBuilder['global'][$core['core.create']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.create']]) && in_array($viewName,$this->permissionBuilder['global'][$core['core.create']])) { - $toolBar .= "\n\t\t\t\tif (\$this->canDo->get('".$core['core.create']."'))"; + $toolBar .= PHP_EOL."\t\t\t\tif (\$this->canDo->get('".$core['core.create']."'))"; } else { - $toolBar .= "\n\t\t\t\tif (\$this->canDo->get('core.create'))"; + $toolBar .= PHP_EOL."\t\t\t\tif (\$this->canDo->get('core.create'))"; } - $toolBar .= "\n\t\t\t\t{"; - $toolBar .= "\n\t\t\t\t\tJToolBarHelper::custom('".$viewName.".save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false);"; - $toolBar .= "\n\t\t\t\t}"; + $toolBar .= PHP_EOL."\t\t\t\t{"; + $toolBar .= PHP_EOL."\t\t\t\t\tJToolBarHelper::custom('".$viewName.".save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false);"; + $toolBar .= PHP_EOL."\t\t\t\t}"; // add custom buttons $toolBar .= $this->setCustomButtons($view, 2, "\t\t"); - $toolBar .= "\n\t\t\t\tJToolBarHelper::cancel('".$viewName.".cancel', 'JTOOLBAR_CLOSE');"; - $toolBar .= "\n\t\t\t}"; - $toolBar .= "\n\t\t}"; - $toolBar .= "\n\t\tJToolbarHelper::divider();"; - $toolBar .= "\n\t\t//".$this->setLine(__LINE__)." set help url for this view if found"; - $toolBar .= "\n\t\t\$help_url = ".$this->fileContentStatic['###Component###']."Helper::getHelpUrl('".$viewName."');"; - $toolBar .= "\n\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkString(\$help_url))"; - $toolBar .= "\n\t\t{"; - $toolBar .= "\n\t\t\tJToolbarHelper::help('".$this->langPrefix."_HELP_MANAGER', false, \$help_url);"; - $toolBar .= "\n\t\t}"; + $toolBar .= PHP_EOL."\t\t\t\tJToolBarHelper::cancel('".$viewName.".cancel', 'JTOOLBAR_CLOSE');"; + $toolBar .= PHP_EOL."\t\t\t}"; + $toolBar .= PHP_EOL."\t\t}"; + $toolBar .= PHP_EOL."\t\tJToolbarHelper::divider();"; + $toolBar .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." set help url for this view if found"; + $toolBar .= PHP_EOL."\t\t\$help_url = ".$this->fileContentStatic['###Component###']."Helper::getHelpUrl('".$viewName."');"; + $toolBar .= PHP_EOL."\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkString(\$help_url))"; + $toolBar .= PHP_EOL."\t\t{"; + $toolBar .= PHP_EOL."\t\t\tJToolbarHelper::help('".$this->langPrefix."_HELP_MANAGER', false, \$help_url);"; + $toolBar .= PHP_EOL."\t\t}"; } return $toolBar; } @@ -10326,16 +10374,16 @@ class Interpretation extends Fields } else { - $spacer = "\n\n\t\t"; + $spacer = PHP_EOL.PHP_EOL."\t\t"; } $state .= $spacer."\$category = \$app->getUserStateFromRequest(\$this->context . '.filter.category', 'filter_category');"; - $state .= "\n\t\t\$this->setState('filter.category', \$category);"; - $state .= "\n\n\t\t\$categoryId = \$this->getUserStateFromRequest(\$this->context . '.filter.category_id', 'filter_category_id');"; - $state .= "\n\t\t\$this->setState('filter.category_id', \$categoryId);"; + $state .= PHP_EOL."\t\t\$this->setState('filter.category', \$category);"; + $state .= PHP_EOL.PHP_EOL."\t\t\$categoryId = \$this->getUserStateFromRequest(\$this->context . '.filter.category_id', 'filter_category_id');"; + $state .= PHP_EOL."\t\t\$this->setState('filter.category_id', \$categoryId);"; if ($filter['code'] != 'category') { - $state .= "\n\n\t\t\$".$filter['code']." = \$app->getUserStateFromRequest(\$this->context . '.filter.".$filter['code']."', 'filter_".$filter['code']."');"; - $state .= "\n\t\t\$this->setState('filter.".$filter['code']."', \$".$filter['code'].");"; + $state .= PHP_EOL.PHP_EOL."\t\t\$".$filter['code']." = \$app->getUserStateFromRequest(\$this->context . '.filter.".$filter['code']."', 'filter_".$filter['code']."');"; + $state .= PHP_EOL."\t\t\$this->setState('filter.".$filter['code']."', \$".$filter['code'].");"; } } else @@ -10346,17 +10394,17 @@ class Interpretation extends Fields } else { - $spacer = "\n\n\t\t"; + $spacer = PHP_EOL.PHP_EOL."\t\t"; } // check if custom field is set /*if (ComponentbuilderHelper::checkArray($filter['custom'])) { $state .= $spacer."\$".$filter['code']."_".$filter['custom']['text']." = \$this->getUserStateFromRequest(\$this->context . '.filter.".$filter['code']."_".$filter['custom']['text']."', 'filter_".$filter['code']."_".$filter['custom']['text']."');"; - $state .= "\n\t\t\$this->setState('filter.".$filter['code']."_".$filter['custom']['text']."', \$".$filter['code']."_".$filter['custom']['text'].");"; - $spacer = "\n\n\t\t"; + $state .= PHP_EOL."\t\t\$this->setState('filter.".$filter['code']."_".$filter['custom']['text']."', \$".$filter['code']."_".$filter['custom']['text'].");"; + $spacer = PHP_EOL.PHP_EOL."\t\t"; }*/ $state .= $spacer."\$".$filter['code']." = \$this->getUserStateFromRequest(\$this->context . '.filter.".$filter['code']."', 'filter_".$filter['code']."');"; - $state .= "\n\t\t\$this->setState('filter.".$filter['code']."', \$".$filter['code'].");"; + $state .= PHP_EOL."\t\t\$this->setState('filter.".$filter['code']."', \$".$filter['code'].");"; } $donelist[] = $filter['code']; } @@ -10377,16 +10425,16 @@ class Interpretation extends Fields } else { - $spacer = "\n\n\t\t"; + $spacer = PHP_EOL.PHP_EOL."\t\t"; } $state .= $spacer."\$category = \$app->getUserStateFromRequest(\$this->context . '.filter.category', 'filter_category');"; - $state .= "\n\t\t\$this->setState('filter.category', \$category);"; - $state .= "\n\n\t\t\$categoryId = \$this->getUserStateFromRequest(\$this->context . '.filter.category_id', 'filter_category_id');"; - $state .= "\n\t\t\$this->setState('filter.category_id', \$categoryId);"; + $state .= PHP_EOL."\t\t\$this->setState('filter.category', \$category);"; + $state .= PHP_EOL.PHP_EOL."\t\t\$categoryId = \$this->getUserStateFromRequest(\$this->context . '.filter.category_id', 'filter_category_id');"; + $state .= PHP_EOL."\t\t\$this->setState('filter.category_id', \$categoryId);"; if ($filter['code'] != 'category') { - $state .= "\n\n\t\t\$".$filter['code']." = \$app->getUserStateFromRequest(\$this->context . '.filter.".$filter['code']."', 'filter_".$filter['code']."');"; - $state .= "\n\t\t\$this->setState('filter.".$filter['code']."', \$".$filter['code'].");"; + $state .= PHP_EOL.PHP_EOL."\t\t\$".$filter['code']." = \$app->getUserStateFromRequest(\$this->context . '.filter.".$filter['code']."', 'filter_".$filter['code']."');"; + $state .= PHP_EOL."\t\t\$this->setState('filter.".$filter['code']."', \$".$filter['code'].");"; } } else @@ -10397,19 +10445,19 @@ class Interpretation extends Fields } else { - $spacer = "\n\n\t\t"; + $spacer = PHP_EOL.PHP_EOL."\t\t"; } // check if custom field is set /*if (ComponentbuilderHelper::checkArray($filter['custom'])) { $state .= $spacer."\$".$filter['custom']['text']." = \$this->getUserStateFromRequest(\$this->context . '.filter.".$filter['custom']['text']."', 'filter_".$filter['custom']['text']."');"; - $state .= "\n\t\t\$this->setState('filter.".$filter['custom']['text']."', \$".$filter['custom']['text'].");"; - $state .= "\n\t\t\$".$filter['code']."_".$filter['custom']['text']." = \$this->getUserStateFromRequest(\$this->context . '.filter.".$filter['code']."_".$filter['custom']['text']."', 'filter_".$filter['code']."_".$filter['custom']['text']."');"; - $state .= "\n\t\t\$this->setState('filter.".$filter['code']."_".$filter['custom']['text']."', \$".$filter['code']."_".$filter['custom']['text'].");"; - $spacer = "\n\n\t\t"; + $state .= PHP_EOL."\t\t\$this->setState('filter.".$filter['custom']['text']."', \$".$filter['custom']['text'].");"; + $state .= PHP_EOL."\t\t\$".$filter['code']."_".$filter['custom']['text']." = \$this->getUserStateFromRequest(\$this->context . '.filter.".$filter['code']."_".$filter['custom']['text']."', 'filter_".$filter['code']."_".$filter['custom']['text']."');"; + $state .= PHP_EOL."\t\t\$this->setState('filter.".$filter['code']."_".$filter['custom']['text']."', \$".$filter['code']."_".$filter['custom']['text'].");"; + $spacer = PHP_EOL.PHP_EOL."\t\t"; }*/ $state .= $spacer."\$".$filter['code']." = \$this->getUserStateFromRequest(\$this->context . '.filter.".$filter['code']."', 'filter_".$filter['code']."');"; - $state .= "\n\t\t\$this->setState('filter.".$filter['code']."', \$".$filter['code'].");"; + $state .= PHP_EOL."\t\t\$this->setState('filter.".$filter['code']."', \$".$filter['code'].");"; } $donelist[] = $filter['code']; } @@ -10424,8 +10472,8 @@ class Interpretation extends Fields $donelist = array('sorting','published'); // set the default first $fields = "return array("; - $fields .= "\n\t\t\t'a.sorting' => JText::_('JGRID_HEADING_ORDERING')"; - $fields .= ",\n\t\t\t'a.published' => JText::_('JSTATUS')"; + $fields .= PHP_EOL."\t\t\t'a.sorting' => JText::_('JGRID_HEADING_ORDERING')"; + $fields .= ",".PHP_EOL."\t\t\t'a.published' => JText::_('JSTATUS')"; // add the rest of the set filters if (isset($this->sortBuilder[$view]) && ComponentbuilderHelper::checkArray($this->sortBuilder[$view])) @@ -10436,80 +10484,80 @@ class Interpretation extends Fields { if ($filter['type'] === 'category') { - $fields .= ",\n\t\t\t'c.category_title' => JText::_('".$filter['lang']."')"; + $fields .= ",".PHP_EOL."\t\t\t'c.category_title' => JText::_('".$filter['lang']."')"; } elseif (ComponentbuilderHelper::checkArray($filter['custom'])) { - $fields .= ",\n\t\t\t'".$filter['custom']['db'].".".$filter['custom']['text']."' => JText::_('".$filter['lang']."')"; + $fields .= ",".PHP_EOL."\t\t\t'".$filter['custom']['db'].".".$filter['custom']['text']."' => JText::_('".$filter['lang']."')"; } else { - $fields .= ",\n\t\t\t'a.".$filter['code']."' => JText::_('".$filter['lang']."')"; + $fields .= ",".PHP_EOL."\t\t\t'a.".$filter['code']."' => JText::_('".$filter['lang']."')"; } } } } - $fields .= ",\n\t\t\t'a.id' => JText::_('JGRID_HEADING_ID')"; - $fields .= "\n\t\t);"; + $fields .= ",".PHP_EOL."\t\t\t'a.id' => JText::_('JGRID_HEADING_ID')"; + $fields .= PHP_EOL."\t\t);"; // return fields return $fields; } public function setCheckinCall() { - $call = "\n\t\t//".$this->setLine(__LINE__)." check in items"; - $call .= "\n\t\t\$this->checkInNow();\n"; + $call = PHP_EOL."\t\t//".$this->setLine(__LINE__)." check in items"; + $call .= PHP_EOL."\t\t\$this->checkInNow();".PHP_EOL; return $call; } public function setAutoCheckin($view,$component) { - $checkin = "\n\n\t/**"; - $checkin .= "\n\t* Build an SQL query to checkin all items left checked out longer then a set time."; - $checkin .= "\n\t*"; - $checkin .= "\n\t* @return a bool"; - $checkin .= "\n\t*"; - $checkin .= "\n\t*/"; - $checkin .= "\n\tprotected function checkInNow()"; - $checkin .= "\n\t{"; - $checkin .= "\n\t\t//".$this->setLine(__LINE__)." Get set check in time"; - $checkin .= "\n\t\t\$time = JComponentHelper::getParams('com_".$component."')->get('check_in');"; - $checkin .= "\n\t\t"; - $checkin .= "\n\t\tif (\$time)"; - $checkin .= "\n\t\t{"; - $checkin .= "\n\n\t\t\t//".$this->setLine(__LINE__)." Get a db connection."; - $checkin .= "\n\t\t\t\$db = JFactory::getDbo();"; - $checkin .= "\n\t\t\t//".$this->setLine(__LINE__)." reset query"; - $checkin .= "\n\t\t\t\$query = \$db->getQuery(true);"; - $checkin .= "\n\t\t\t\$query->select('*');"; - $checkin .= "\n\t\t\t\$query->from(\$db->quoteName('#__".$component."_".$view."'));"; - $checkin .= "\n\t\t\t\$db->setQuery(\$query);"; - $checkin .= "\n\t\t\t\$db->execute();"; - $checkin .= "\n\t\t\tif (\$db->getNumRows())"; - $checkin .= "\n\t\t\t{"; - $checkin .= "\n\t\t\t\t//".$this->setLine(__LINE__)." Get Yesterdays date"; - $checkin .= "\n\t\t\t\t\$date = JFactory::getDate()->modify(\$time)->toSql();"; - $checkin .= "\n\t\t\t\t//".$this->setLine(__LINE__)." reset query"; - $checkin .= "\n\t\t\t\t\$query = \$db->getQuery(true);"; - $checkin .= "\n\n\t\t\t\t//".$this->setLine(__LINE__)." Fields to update."; - $checkin .= "\n\t\t\t\t\$fields = array("; - $checkin .= "\n\t\t\t\t\t\$db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'',"; - $checkin .= "\n\t\t\t\t\t\$db->quoteName('checked_out') . '=0'"; - $checkin .= "\n\t\t\t\t);"; - $checkin .= "\n\n\t\t\t\t//".$this->setLine(__LINE__)." Conditions for which records should be updated."; - $checkin .= "\n\t\t\t\t\$conditions = array("; - $checkin .= "\n\t\t\t\t\t\$db->quoteName('checked_out') . '!=0', "; - $checkin .= "\n\t\t\t\t\t\$db->quoteName('checked_out_time') . '<\''.\$date.'\''"; - $checkin .= "\n\t\t\t\t);"; - $checkin .= "\n\n\t\t\t\t//".$this->setLine(__LINE__)." Check table"; - $checkin .= "\n\t\t\t\t\$query->update(\$db->quoteName('#__".$component."_".$view."'))->set(\$fields)->where(\$conditions); "; - $checkin .= "\n\n\t\t\t\t\$db->setQuery(\$query);"; - $checkin .= "\n\n\t\t\t\t\$db->execute();"; - $checkin .= "\n\t\t\t}"; - $checkin .= "\n\t\t}"; - $checkin .= "\n\n\t\treturn false;"; - $checkin .= "\n\t}"; + $checkin = PHP_EOL.PHP_EOL."\t/**"; + $checkin .= PHP_EOL."\t* Build an SQL query to checkin all items left checked out longer then a set time."; + $checkin .= PHP_EOL."\t*"; + $checkin .= PHP_EOL."\t* @return a bool"; + $checkin .= PHP_EOL."\t*"; + $checkin .= PHP_EOL."\t*/"; + $checkin .= PHP_EOL."\tprotected function checkInNow()"; + $checkin .= PHP_EOL."\t{"; + $checkin .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get set check in time"; + $checkin .= PHP_EOL."\t\t\$time = JComponentHelper::getParams('com_".$component."')->get('check_in');"; + $checkin .= PHP_EOL."\t\t"; + $checkin .= PHP_EOL."\t\tif (\$time)"; + $checkin .= PHP_EOL."\t\t{"; + $checkin .= PHP_EOL.PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Get a db connection."; + $checkin .= PHP_EOL."\t\t\t\$db = JFactory::getDbo();"; + $checkin .= PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." reset query"; + $checkin .= PHP_EOL."\t\t\t\$query = \$db->getQuery(true);"; + $checkin .= PHP_EOL."\t\t\t\$query->select('*');"; + $checkin .= PHP_EOL."\t\t\t\$query->from(\$db->quoteName('#__".$component."_".$view."'));"; + $checkin .= PHP_EOL."\t\t\t\$db->setQuery(\$query);"; + $checkin .= PHP_EOL."\t\t\t\$db->execute();"; + $checkin .= PHP_EOL."\t\t\tif (\$db->getNumRows())"; + $checkin .= PHP_EOL."\t\t\t{"; + $checkin .= PHP_EOL."\t\t\t\t//".$this->setLine(__LINE__)." Get Yesterdays date"; + $checkin .= PHP_EOL."\t\t\t\t\$date = JFactory::getDate()->modify(\$time)->toSql();"; + $checkin .= PHP_EOL."\t\t\t\t//".$this->setLine(__LINE__)." reset query"; + $checkin .= PHP_EOL."\t\t\t\t\$query = \$db->getQuery(true);"; + $checkin .= PHP_EOL.PHP_EOL."\t\t\t\t//".$this->setLine(__LINE__)." Fields to update."; + $checkin .= PHP_EOL."\t\t\t\t\$fields = array("; + $checkin .= PHP_EOL."\t\t\t\t\t\$db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'',"; + $checkin .= PHP_EOL."\t\t\t\t\t\$db->quoteName('checked_out') . '=0'"; + $checkin .= PHP_EOL."\t\t\t\t);"; + $checkin .= PHP_EOL.PHP_EOL."\t\t\t\t//".$this->setLine(__LINE__)." Conditions for which records should be updated."; + $checkin .= PHP_EOL."\t\t\t\t\$conditions = array("; + $checkin .= PHP_EOL."\t\t\t\t\t\$db->quoteName('checked_out') . '!=0', "; + $checkin .= PHP_EOL."\t\t\t\t\t\$db->quoteName('checked_out_time') . '<\''.\$date.'\''"; + $checkin .= PHP_EOL."\t\t\t\t);"; + $checkin .= PHP_EOL.PHP_EOL."\t\t\t\t//".$this->setLine(__LINE__)." Check table"; + $checkin .= PHP_EOL."\t\t\t\t\$query->update(\$db->quoteName('#__".$component."_".$view."'))->set(\$fields)->where(\$conditions); "; + $checkin .= PHP_EOL.PHP_EOL."\t\t\t\t\$db->setQuery(\$query);"; + $checkin .= PHP_EOL.PHP_EOL."\t\t\t\t\$db->execute();"; + $checkin .= PHP_EOL."\t\t\t}"; + $checkin .= PHP_EOL."\t\t}"; + $checkin .= PHP_EOL.PHP_EOL."\t\treturn false;"; + $checkin .= PHP_EOL."\t}"; return $checkin; } @@ -10532,19 +10580,19 @@ class Interpretation extends Fields // check if the item has permissions. if ($coreLoad && isset($core['core.access']) && isset($this->permissionBuilder[$core['core.access']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder[$core['core.access']]) && in_array($view,$this->permissionBuilder[$core['core.access']])) { - $fix .= "\n\n\t".$tab."\t//".$this->setLine(__LINE__)." set values to display correctly."; - $fix .= "\n\t".$tab."\tif (".$Component."Helper::checkArray(\$items))"; - $fix .= "\n\t".$tab."\t{"; - $fix .= "\n\t".$tab."\t\t//".$this->setLine(__LINE__)." get user object."; - $fix .= "\n\t".$tab."\t\t\$user = JFactory::getUser();"; - $fix .= "\n\t".$tab."\t\tforeach (\$items as \$nr => &\$item)"; - $fix .= "\n\t".$tab."\t\t{"; - $fix .= "\n\t".$tab."\t\t\t\$access = (\$user->authorise('".$core['core.access']."', 'com_".$component.".".$view.".' . (int) \$item->id) && \$user->authorise('".$core['core.access']."', 'com_".$component."'));"; - $fix .= "\n\t".$tab."\t\t\tif (!\$access)"; - $fix .= "\n\t".$tab."\t\t\t{"; - $fix .= "\n\t".$tab."\t\t\t\tunset(\$items[\$nr]);"; - $fix .= "\n\t".$tab."\t\t\t\tcontinue;"; - $fix .= "\n\t".$tab."\t\t\t}\n"; + $fix .= PHP_EOL.PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." set values to display correctly."; + $fix .= PHP_EOL."\t".$tab."\tif (".$Component."Helper::checkArray(\$items))"; + $fix .= PHP_EOL."\t".$tab."\t{"; + $fix .= PHP_EOL."\t".$tab."\t\t//".$this->setLine(__LINE__)." get user object."; + $fix .= PHP_EOL."\t".$tab."\t\t\$user = JFactory::getUser();"; + $fix .= PHP_EOL."\t".$tab."\t\tforeach (\$items as \$nr => &\$item)"; + $fix .= PHP_EOL."\t".$tab."\t\t{"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\$access = (\$user->authorise('".$core['core.access']."', 'com_".$component.".".$view.".' . (int) \$item->id) && \$user->authorise('".$core['core.access']."', 'com_".$component."'));"; + $fix .= PHP_EOL."\t".$tab."\t\t\tif (!\$access)"; + $fix .= PHP_EOL."\t".$tab."\t\t\t{"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\tunset(\$items[\$nr]);"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\tcontinue;"; + $fix .= PHP_EOL."\t".$tab."\t\t\t}".PHP_EOL; } @@ -10561,11 +10609,11 @@ class Interpretation extends Fields { if (!ComponentbuilderHelper::checkString($fix)) { - $fix .= "\n\n\t".$tab."\t//".$this->setLine(__LINE__)." set values to display correctly."; - $fix .= "\n\t".$tab."\tif (".$Component."Helper::checkArray(\$items))"; - $fix .= "\n\t".$tab."\t{"; - $fix .= "\n\t".$tab."\t\tforeach (\$items as \$nr => &\$item)"; - $fix .= "\n\t".$tab."\t\t{"; + $fix .= PHP_EOL.PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." set values to display correctly."; + $fix .= PHP_EOL."\t".$tab."\tif (".$Component."Helper::checkArray(\$items))"; + $fix .= PHP_EOL."\t".$tab."\t{"; + $fix .= PHP_EOL."\t".$tab."\t\tforeach (\$items as \$nr => &\$item)"; + $fix .= PHP_EOL."\t".$tab."\t\t{"; } foreach ($this->{$methodName}[$view] as $item) @@ -10603,58 +10651,58 @@ class Interpretation extends Fields if ($item['type'] === 'usergroup' && !$export) { - $fix .= "\n\t".$tab."\t\t\t//".$this->setLine(__LINE__)." decode ".$item['name']; - $fix .= "\n\t".$tab."\t\t\t\$".$item['name']."Array = ".$decode."(\$item->".$item['name'].$suffix_decode.");"; - $fix .= "\n\t".$tab."\t\t\tif (".$Component."Helper::checkArray(\$".$item['name']."Array))"; - $fix .= "\n\t".$tab."\t\t\t{"; - $fix .= "\n\t".$tab."\t\t\t\t\$".$item['name']."Names = '';"; - $fix .= "\n\t".$tab."\t\t\t\t\$counter = 0;"; - $fix .= "\n\t".$tab."\t\t\t\tforeach (\$".$item['name']."Array as \$".$item['name'].")"; - $fix .= "\n\t".$tab."\t\t\t\t{"; - $fix .= "\n\t".$tab."\t\t\t\t\tif (\$counter == 0)"; - $fix .= "\n\t".$tab."\t\t\t\t\t{"; - $fix .= "\n\t".$tab."\t\t\t\t\t\t\$".$item['name']."Names .= ".$Component."Helper::getGroupName(\$".$item['name'].");"; - $fix .= "\n\t".$tab."\t\t\t\t\t}"; - $fix .= "\n\t".$tab."\t\t\t\t\telse"; - $fix .= "\n\t".$tab."\t\t\t\t\t{"; - $fix .= "\n\t".$tab."\t\t\t\t\t\t\$".$item['name']."Names .= ', '.".$Component."Helper::getGroupName(\$".$item['name'].");"; - $fix .= "\n\t".$tab."\t\t\t\t\t}"; - $fix .= "\n\t".$tab."\t\t\t\t\t\$counter++;"; - $fix .= "\n\t".$tab."\t\t\t\t}"; - $fix .= "\n\t".$tab."\t\t\t\t\$item->".$item['name']." = \$".$item['name']."Names;"; - $fix .= "\n\t".$tab."\t\t\t}"; + $fix .= PHP_EOL."\t".$tab."\t\t\t//".$this->setLine(__LINE__)." decode ".$item['name']; + $fix .= PHP_EOL."\t".$tab."\t\t\t\$".$item['name']."Array = ".$decode."(\$item->".$item['name'].$suffix_decode.");"; + $fix .= PHP_EOL."\t".$tab."\t\t\tif (".$Component."Helper::checkArray(\$".$item['name']."Array))"; + $fix .= PHP_EOL."\t".$tab."\t\t\t{"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\$".$item['name']."Names = '';"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\$counter = 0;"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\tforeach (\$".$item['name']."Array as \$".$item['name'].")"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t{"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\tif (\$counter == 0)"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\t{"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\t\t\$".$item['name']."Names .= ".$Component."Helper::getGroupName(\$".$item['name'].");"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\t}"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\telse"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\t{"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\t\t\$".$item['name']."Names .= ', '.".$Component."Helper::getGroupName(\$".$item['name'].");"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\t}"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\t\$counter++;"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t}"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\$item->".$item['name']." = \$".$item['name']."Names;"; + $fix .= PHP_EOL."\t".$tab."\t\t\t}"; } /*elseif ($item['type'] === 'usergroup' && $export) { - $fix .= "\n\t".$tab."\t\t\t//".$this->setLine(__LINE__)." decode ".$item['name']; - $fix .= "\n\t".$tab."\t\t\t\$".$item['name']."Array = ".$decode."(\$item->".$item['name'].$suffix_decode.");"; - $fix .= "\n\t".$tab."\t\t\tif (".$Component."Helper::checkArray(\$".$item['name']."Array))"; - $fix .= "\n\t".$tab."\t\t\t{"; - $fix .= "\n\t".$tab."\t\t\t\t\$item->".$item['name']." = implode('|',\$".$item['name']."Array);"; - $fix .= "\n\t".$tab."\t\t\t}"; + $fix .= PHP_EOL."\t".$tab."\t\t\t//".$this->setLine(__LINE__)." decode ".$item['name']; + $fix .= PHP_EOL."\t".$tab."\t\t\t\$".$item['name']."Array = ".$decode."(\$item->".$item['name'].$suffix_decode.");"; + $fix .= PHP_EOL."\t".$tab."\t\t\tif (".$Component."Helper::checkArray(\$".$item['name']."Array))"; + $fix .= PHP_EOL."\t".$tab."\t\t\t{"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\$item->".$item['name']." = implode('|',\$".$item['name']."Array);"; + $fix .= PHP_EOL."\t".$tab."\t\t\t}"; }*/ elseif ($item['translation'] && !$export) { - $fix .= "\n\t".$tab."\t\t\t//".$this->setLine(__LINE__)." convert ".$item['name']; - $fix .= "\n\t".$tab."\t\t\t\$".$item['name']."Array = ".$decode."(\$item->".$item['name'].$suffix_decode.");"; - $fix .= "\n\t".$tab."\t\t\tif (".$Component."Helper::checkArray(\$".$item['name']."Array))"; - $fix .= "\n\t".$tab."\t\t\t{"; - $fix .= "\n\t".$tab."\t\t\t\t\$".$item['name']."Names = '';"; - $fix .= "\n\t".$tab."\t\t\t\t\$counter = 0;"; - $fix .= "\n\t".$tab."\t\t\t\tforeach (\$".$item['name']."Array as \$".$item['name'].")"; - $fix .= "\n\t".$tab."\t\t\t\t{"; - $fix .= "\n\t".$tab."\t\t\t\t\tif (\$counter == 0)"; - $fix .= "\n\t".$tab."\t\t\t\t\t{"; - $fix .= "\n\t".$tab."\t\t\t\t\t\t\$".$item['name']."Names .= JText::_(\$this->selectionTranslation(\$".$item['name'].", '".$item['name']."'));"; - $fix .= "\n\t".$tab."\t\t\t\t\t}"; - $fix .= "\n\t".$tab."\t\t\t\t\telse"; - $fix .= "\n\t".$tab."\t\t\t\t\t{"; - $fix .= "\n\t".$tab."\t\t\t\t\t\t\$".$item['name']."Names .= ', '.JText::_(\$this->selectionTranslation(\$".$item['name'].", '".$item['name']."'));"; - $fix .= "\n\t".$tab."\t\t\t\t\t}"; - $fix .= "\n\t".$tab."\t\t\t\t\t\$counter++;"; - $fix .= "\n\t".$tab."\t\t\t\t}"; - $fix .= "\n\t".$tab."\t\t\t\t\$item->".$item['name']." = \$".$item['name']."Names;"; - $fix .= "\n\t".$tab."\t\t\t}"; + $fix .= PHP_EOL."\t".$tab."\t\t\t//".$this->setLine(__LINE__)." convert ".$item['name']; + $fix .= PHP_EOL."\t".$tab."\t\t\t\$".$item['name']."Array = ".$decode."(\$item->".$item['name'].$suffix_decode.");"; + $fix .= PHP_EOL."\t".$tab."\t\t\tif (".$Component."Helper::checkArray(\$".$item['name']."Array))"; + $fix .= PHP_EOL."\t".$tab."\t\t\t{"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\$".$item['name']."Names = '';"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\$counter = 0;"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\tforeach (\$".$item['name']."Array as \$".$item['name'].")"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t{"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\tif (\$counter == 0)"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\t{"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\t\t\$".$item['name']."Names .= JText::_(\$this->selectionTranslation(\$".$item['name'].", '".$item['name']."'));"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\t}"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\telse"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\t{"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\t\t\$".$item['name']."Names .= ', '.JText::_(\$this->selectionTranslation(\$".$item['name'].", '".$item['name']."'));"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\t}"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\t\$counter++;"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t}"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\$item->".$item['name']." = \$".$item['name']."Names;"; + $fix .= PHP_EOL."\t".$tab."\t\t\t}"; } else { @@ -10664,71 +10712,71 @@ class Interpretation extends Fields if ($item['method'] == 3) { $taber = "\t"; - $fix .= "\n\t".$tab."\t\t\tif (\$basickey && !is_numeric(\$item->".$item['name'].") && \$item->".$item['name']." === base64_encode(base64_decode(\$item->".$item['name'].", true)))"; - $fix .= "\n\t".$tab."\t\t\t{"; + $fix .= PHP_EOL."\t".$tab."\t\t\tif (\$basickey && !is_numeric(\$item->".$item['name'].") && \$item->".$item['name']." === base64_encode(base64_decode(\$item->".$item['name'].", true)))"; + $fix .= PHP_EOL."\t".$tab."\t\t\t{"; } if ($item['method'] == 4) { $taber = "\t"; - $fix .= "\n\t".$tab."\t\t\tif (\$advancedkey && !is_numeric(\$item->".$item['name'].") && \$item->".$item['name']." === base64_encode(base64_decode(\$item->".$item['name'].", true)))"; - $fix .= "\n\t".$tab."\t\t\t{"; + $fix .= PHP_EOL."\t".$tab."\t\t\tif (\$advancedkey && !is_numeric(\$item->".$item['name'].") && \$item->".$item['name']." === base64_encode(base64_decode(\$item->".$item['name'].", true)))"; + $fix .= PHP_EOL."\t".$tab."\t\t\t{"; } if ($item['method'] == 3 || $item['method'] == 4) { - $fix .= "\n\t".$tab."\t\t\t\t//".$this->setLine(__LINE__)." decrypt ".$item['name']; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t//".$this->setLine(__LINE__)." decrypt ".$item['name']; } else { - $fix .= "\n\t".$tab.$taber."\t\t\t//".$this->setLine(__LINE__)." decode ".$item['name']; + $fix .= PHP_EOL."\t".$tab.$taber."\t\t\t//".$this->setLine(__LINE__)." decode ".$item['name']; } - $fix .= "\n\t".$tab.$taber."\t\t\t\$item->".$item['name']." = ".$decode."(\$item->".$item['name'].");"; + $fix .= PHP_EOL."\t".$tab.$taber."\t\t\t\$item->".$item['name']." = ".$decode."(\$item->".$item['name'].");"; if ($item['method'] == 3 || $item['method'] == 4) { - $fix .= "\n\t".$tab."\t\t\t}"; + $fix .= PHP_EOL."\t".$tab."\t\t\t}"; } } else { if ($export && $item['type'] === 'repeatable') { - $fix .= "\n\t".$tab."\t\t\t//".$this->setLine(__LINE__)." decode repeatable ".$item['name']; - $fix .= "\n\t".$tab."\t\t\t\$".$item['name']."Array = ".$decode."(\$item->".$item['name'].$suffix_decode.");"; - $fix .= "\n\t".$tab."\t\t\tif (".$Component."Helper::checkArray(\$".$item['name']."Array))"; - $fix .= "\n\t".$tab."\t\t\t{"; - $fix .= "\n\t".$tab."\t\t\t\t\$bucket".$item['name']." = array();"; - $fix .= "\n\t".$tab."\t\t\t\tforeach (\$".$item['name']."Array as \$".$item['name']."FieldName => \$".$item['name'].")"; - $fix .= "\n\t".$tab."\t\t\t\t{"; - $fix .= "\n\t".$tab."\t\t\t\t\tif (".$Component."Helper::checkArray(\$".$item['name']."))"; - $fix .= "\n\t".$tab."\t\t\t\t\t{"; - $fix .= "\n\t".$tab."\t\t\t\t\t\t\$bucket".$item['name']."[] = \$".$item['name']."FieldName . '<||VDM||>' . implode('<|VDM|>',\$".$item['name'].");"; - $fix .= "\n\t".$tab."\t\t\t\t\t}"; - $fix .= "\n\t".$tab."\t\t\t\t}"; - $fix .= "\n\t".$tab."\t\t\t\t//".$this->setLine(__LINE__)." make sure the bucket has values."; - $fix .= "\n\t".$tab."\t\t\t\tif (".$Component."Helper::checkArray(\$bucket".$item['name']."))"; - $fix .= "\n\t".$tab."\t\t\t\t{"; - $fix .= "\n\t".$tab."\t\t\t\t\t//".$this->setLine(__LINE__)." clear the repeatable field."; - $fix .= "\n\t".$tab."\t\t\t\t\tunset(\$item->".$item['name'].");"; - $fix .= "\n\t".$tab."\t\t\t\t\t//".$this->setLine(__LINE__)." set repeatable field for export."; - $fix .= "\n\t".$tab."\t\t\t\t\t\$item->".$item['name']." = implode('<|||VDM|||>',\$bucket".$item['name'].");"; - $fix .= "\n\t".$tab."\t\t\t\t\t//".$this->setLine(__LINE__)." unset the bucket."; - $fix .= "\n\t".$tab."\t\t\t\t\tunset(\$bucket".$item['name'].");"; - $fix .= "\n\t".$tab."\t\t\t\t}"; - $fix .= "\n\t".$tab."\t\t\t}"; + $fix .= PHP_EOL."\t".$tab."\t\t\t//".$this->setLine(__LINE__)." decode repeatable ".$item['name']; + $fix .= PHP_EOL."\t".$tab."\t\t\t\$".$item['name']."Array = ".$decode."(\$item->".$item['name'].$suffix_decode.");"; + $fix .= PHP_EOL."\t".$tab."\t\t\tif (".$Component."Helper::checkArray(\$".$item['name']."Array))"; + $fix .= PHP_EOL."\t".$tab."\t\t\t{"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\$bucket".$item['name']." = array();"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\tforeach (\$".$item['name']."Array as \$".$item['name']."FieldName => \$".$item['name'].")"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t{"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\tif (".$Component."Helper::checkArray(\$".$item['name']."))"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\t{"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\t\t\$bucket".$item['name']."[] = \$".$item['name']."FieldName . '<||VDM||>' . implode('<|VDM|>',\$".$item['name'].");"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\t}"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t}"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t//".$this->setLine(__LINE__)." make sure the bucket has values."; + $fix .= PHP_EOL."\t".$tab."\t\t\t\tif (".$Component."Helper::checkArray(\$bucket".$item['name']."))"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t{"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\t//".$this->setLine(__LINE__)." clear the repeatable field."; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\tunset(\$item->".$item['name'].");"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\t//".$this->setLine(__LINE__)." set repeatable field for export."; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\t\$item->".$item['name']." = implode('<|||VDM|||>',\$bucket".$item['name'].");"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\t//".$this->setLine(__LINE__)." unset the bucket."; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t\tunset(\$bucket".$item['name'].");"; + $fix .= PHP_EOL."\t".$tab."\t\t\t\t}"; + $fix .= PHP_EOL."\t".$tab."\t\t\t}"; } elseif ($item['method'] == 1 && !$export) { // TODO we check if this works well. - $fix .= "\n\t".$tab."\t\t\t//".$this->setLine(__LINE__)." convert ".$item['name']; - $fix .= "\n\t".$tab."\t\t\t\$item->".$item['name']." = ".$Component."Helper::jsonToString(\$item->".$item['name'].", ', ', '".$item['name']."');"; + $fix .= PHP_EOL."\t".$tab."\t\t\t//".$this->setLine(__LINE__)." convert ".$item['name']; + $fix .= PHP_EOL."\t".$tab."\t\t\t\$item->".$item['name']." = ".$Component."Helper::jsonToString(\$item->".$item['name'].", ', ', '".$item['name']."');"; } else { if (!$export) { // For thos we have not cached yet. - $fix .= "\n\t".$tab."\t\t\t//".$this->setLine(__LINE__)." convert ".$item['name']; - $fix .= "\n\t".$tab."\t\t\t\$item->".$item['name']." = ".$Component."Helper::jsonToString(\$item->".$item['name'].");"; + $fix .= PHP_EOL."\t".$tab."\t\t\t//".$this->setLine(__LINE__)." convert ".$item['name']; + $fix .= PHP_EOL."\t".$tab."\t\t\t\$item->".$item['name']." = ".$Component."Helper::jsonToString(\$item->".$item['name'].");"; } } } @@ -10739,11 +10787,11 @@ class Interpretation extends Fields // close the foreach if needed if (!ComponentbuilderHelper::checkString($fix) && $export) { - $fix .= "\n\n\t".$tab."\t//".$this->setLine(__LINE__)." set values to display correctly."; - $fix .= "\n\t".$tab."\tif (".$Component."Helper::checkArray(\$items))"; - $fix .= "\n\t".$tab."\t{"; - $fix .= "\n\t".$tab."\t\tforeach (\$items as \$nr => &\$item)"; - $fix .= "\n\t".$tab."\t\t{"; + $fix .= PHP_EOL.PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." set values to display correctly."; + $fix .= PHP_EOL."\t".$tab."\tif (".$Component."Helper::checkArray(\$items))"; + $fix .= PHP_EOL."\t".$tab."\t{"; + $fix .= PHP_EOL."\t".$tab."\t\tforeach (\$items as \$nr => &\$item)"; + $fix .= PHP_EOL."\t".$tab."\t\t{"; } // close the foreach if needed if (ComponentbuilderHelper::checkString($fix)) @@ -10751,43 +10799,43 @@ class Interpretation extends Fields // remove these values if export if ($export) { - $fix .= "\n\t".$tab."\t\t\t//".$this->setLine(__LINE__)." unset the values we don't want exported."; - $fix .= "\n\t".$tab."\t\t\tunset(\$item->asset_id);"; - $fix .= "\n\t".$tab."\t\t\tunset(\$item->checked_out);"; - $fix .= "\n\t".$tab."\t\t\tunset(\$item->checked_out_time);"; + $fix .= PHP_EOL."\t".$tab."\t\t\t//".$this->setLine(__LINE__)." unset the values we don't want exported."; + $fix .= PHP_EOL."\t".$tab."\t\t\tunset(\$item->asset_id);"; + $fix .= PHP_EOL."\t".$tab."\t\t\tunset(\$item->checked_out);"; + $fix .= PHP_EOL."\t".$tab."\t\t\tunset(\$item->checked_out_time);"; } - $fix .= "\n\t".$tab."\t\t}"; - $fix .= "\n\t".$tab."\t}"; + $fix .= PHP_EOL."\t".$tab."\t\t}"; + $fix .= PHP_EOL."\t".$tab."\t}"; if ($export) { - $fix .= "\n\t".$tab."\t//".$this->setLine(__LINE__)." Add headers to items array."; - $fix .= "\n\t".$tab."\t\$headers = \$this->getExImPortHeaders();"; - $fix .= "\n\t".$tab."\tif (".$Component."Helper::checkObject(\$headers))"; - $fix .= "\n\t".$tab."\t{"; - $fix .= "\n\t".$tab."\t\tarray_unshift(\$items,\$headers);"; - $fix .= "\n\t".$tab."\t}"; + $fix .= PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Add headers to items array."; + $fix .= PHP_EOL."\t".$tab."\t\$headers = \$this->getExImPortHeaders();"; + $fix .= PHP_EOL."\t".$tab."\tif (".$Component."Helper::checkObject(\$headers))"; + $fix .= PHP_EOL."\t".$tab."\t{"; + $fix .= PHP_EOL."\t".$tab."\t\tarray_unshift(\$items,\$headers);"; + $fix .= PHP_EOL."\t".$tab."\t}"; } } // add custom php to getitems method - $fix .= $this->getCustomScriptBuilder('php_getitems', $view, "\n\n".$tab); + $fix .= $this->getCustomScriptBuilder('php_getitems', $view, PHP_EOL.PHP_EOL.$tab); if ($basicCrypt) { - $script = "\n\n\t".$tab."\t//".$this->setLine(__LINE__)." Get the basic encription key."; - $script .= "\n\t".$tab."\t\$basickey = ".$Component."Helper::getCryptKey('basic');"; - $script .= "\n\t".$tab."\t//".$this->setLine(__LINE__)." Get the encription object."; - $script .= "\n\t".$tab."\t\$basic = new FOFEncryptAes(\$basickey, 128);"; + $script = PHP_EOL.PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get the basic encription key."; + $script .= PHP_EOL."\t".$tab."\t\$basickey = ".$Component."Helper::getCryptKey('basic');"; + $script .= PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get the encription object."; + $script .= PHP_EOL."\t".$tab."\t\$basic = new FOFEncryptAes(\$basickey, 128);"; // add the encryption script $fix = $script . $fix; } if ($advancedCrypt) { - $script = "\n\n\t".$tab."\t//".$this->setLine(__LINE__)." Get the advanced encription key."; - $script .= "\n\t".$tab."\t\$advancedkey = ".$Component."Helper::getCryptKey('advanced');"; - $script .= "\n\t".$tab."\t//".$this->setLine(__LINE__)." Get the encription object."; - $script .= "\n\t".$tab."\t\$advanced = new FOFEncryptAes(\$advancedkey, 256);"; + $script = PHP_EOL.PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get the advanced encription key."; + $script .= PHP_EOL."\t".$tab."\t\$advancedkey = ".$Component."Helper::getCryptKey('advanced');"; + $script .= PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get the encription object."; + $script .= PHP_EOL."\t".$tab."\t\$advanced = new FOFEncryptAes(\$advancedkey, 256);"; // add the encryption script $fix = $script . $fix; } @@ -10801,18 +10849,18 @@ class Interpretation extends Fields $fix = ''; if (isset($this->selectionTranslationFixBuilder[$views]) && ComponentbuilderHelper::checkArray($this->selectionTranslationFixBuilder[$views])) { - $fix .= "\n\n\t".$tab."\t//".$this->setLine(__LINE__)." set selection value to a translatable value"; - $fix .= "\n\t".$tab."\tif (".$Component."Helper::checkArray(\$items))"; - $fix .= "\n\t".$tab."\t{"; - $fix .= "\n\t".$tab."\t\tforeach (\$items as \$nr => &\$item)"; - $fix .= "\n\t".$tab."\t\t{"; + $fix .= PHP_EOL.PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." set selection value to a translatable value"; + $fix .= PHP_EOL."\t".$tab."\tif (".$Component."Helper::checkArray(\$items))"; + $fix .= PHP_EOL."\t".$tab."\t{"; + $fix .= PHP_EOL."\t".$tab."\t\tforeach (\$items as \$nr => &\$item)"; + $fix .= PHP_EOL."\t".$tab."\t\t{"; foreach ($this->selectionTranslationFixBuilder[$views] as $name => $values) { - $fix .= "\n\t".$tab."\t\t\t//".$this->setLine(__LINE__)." convert ".$name; - $fix .= "\n\t".$tab."\t\t\t\$item->".$name." = \$this->selectionTranslation(\$item->".$name.", '".$name."');"; + $fix .= PHP_EOL."\t".$tab."\t\t\t//".$this->setLine(__LINE__)." convert ".$name; + $fix .= PHP_EOL."\t".$tab."\t\t\t\$item->".$name." = \$this->selectionTranslation(\$item->".$name.", '".$name."');"; } - $fix .= "\n\t".$tab."\t\t}"; - $fix .= "\n\t".$tab."\t}\n"; + $fix .= PHP_EOL."\t".$tab."\t\t}"; + $fix .= PHP_EOL."\t".$tab."\t}".PHP_EOL; } return $fix; } @@ -10823,21 +10871,21 @@ class Interpretation extends Fields $fix = ''; if (isset( $this->selectionTranslationFixBuilder[$views]) && ComponentbuilderHelper::checkArray($this->selectionTranslationFixBuilder[$views])) { - $fix .= "\n\n\t/**"; - $fix .= "\n\t* Method to convert selection values to translatable string."; - $fix .= "\n\t*"; - $fix .= "\n\t* @return translatable string"; - $fix .= "\n\t*/"; - $fix .= "\n\tpublic function selectionTranslation(\$value,\$name)"; - $fix .= "\n\t{"; + $fix .= PHP_EOL.PHP_EOL."\t/**"; + $fix .= PHP_EOL."\t* Method to convert selection values to translatable string."; + $fix .= PHP_EOL."\t*"; + $fix .= PHP_EOL."\t* @return translatable string"; + $fix .= PHP_EOL."\t*/"; + $fix .= PHP_EOL."\tpublic function selectionTranslation(\$value,\$name)"; + $fix .= PHP_EOL."\t{"; foreach ($this->selectionTranslationFixBuilder[$views] as $name => $values) { if (ComponentbuilderHelper::checkArray($values)) { - $fix .= "\n\t\t//".$this->setLine(__LINE__)." Array of ".$name." language strings"; - $fix .= "\n\t\tif (\$name === '".$name."')"; - $fix .= "\n\t\t{"; - $fix .= "\n\t\t\t\$".$name."Array = array("; + $fix .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Array of ".$name." language strings"; + $fix .= PHP_EOL."\t\tif (\$name === '".$name."')"; + $fix .= PHP_EOL."\t\t{"; + $fix .= PHP_EOL."\t\t\t\$".$name."Array = array("; $counter = 0; foreach ($values as $value => $translang) { @@ -10856,25 +10904,25 @@ class Interpretation extends Fields } if ($counter == 0) { - $fix .= "\n\t\t\t\t".$key." => '".$translang."'"; + $fix .= PHP_EOL."\t\t\t\t".$key." => '".$translang."'"; } else { - $fix .= ",\n\t\t\t\t".$key." => '".$translang."'"; + $fix .= ",".PHP_EOL."\t\t\t\t".$key." => '".$translang."'"; } $counter++; } - $fix .= "\n\t\t\t);"; - $fix .= "\n\t\t\t//".$this->setLine(__LINE__)." Now check if value is found in this array"; - $fix .= "\n\t\t\tif (isset(\$".$name."Array[\$value]) && ".$Component."Helper::checkString(\$".$name."Array[\$value]))"; - $fix .= "\n\t\t\t{"; - $fix .= "\n\t\t\t\treturn \$".$name."Array[\$value];"; - $fix .= "\n\t\t\t}"; - $fix .= "\n\t\t}"; + $fix .= PHP_EOL."\t\t\t);"; + $fix .= PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Now check if value is found in this array"; + $fix .= PHP_EOL."\t\t\tif (isset(\$".$name."Array[\$value]) && ".$Component."Helper::checkString(\$".$name."Array[\$value]))"; + $fix .= PHP_EOL."\t\t\t{"; + $fix .= PHP_EOL."\t\t\t\treturn \$".$name."Array[\$value];"; + $fix .= PHP_EOL."\t\t\t}"; + $fix .= PHP_EOL."\t\t}"; } } - $fix .= "\n\t\treturn \$value;"; - $fix .= "\n\t}"; + $fix .= PHP_EOL."\t\treturn \$value;"; + $fix .= PHP_EOL."\t}"; } return $fix; } @@ -10883,11 +10931,11 @@ class Interpretation extends Fields { if (strlen($viewName) > 0) { - $router = "\n\t\tcase '".$viewName."':"; - $router .= "\n\t\t\t\$id = explode(':', \$segments[$count-1]);"; - $router .= "\n\t\t\t\$vars['id'] = (int) \$id[0];"; - $router .= "\n\t\t\t\$vars['view'] = '".$viewName."';"; - $router .= "\n\t\tbreak;"; + $router = PHP_EOL."\t\tcase '".$viewName."':"; + $router .= PHP_EOL."\t\t\t\$id = explode(':', \$segments[$count-1]);"; + $router .= PHP_EOL."\t\t\t\$vars['id'] = (int) \$id[0];"; + $router .= PHP_EOL."\t\t\t\$vars['view'] = '".$viewName."';"; + $router .= PHP_EOL."\t\tbreak;"; return $router; } @@ -10917,7 +10965,7 @@ class Interpretation extends Fields if (isset($this->permissionDashboard) && ComponentbuilderHelper::checkArray($this->permissionDashboard)) { $this->permissionDashboard = array_unique($this->permissionDashboard); - return "\n\t\t//".$this->setLine(__LINE__)." view access array\n\t\t\$viewAccess = array(\n\t\t\t".implode(",\n\t\t\t",$this->permissionDashboard).");"; + return PHP_EOL."\t\t//".$this->setLine(__LINE__)." view access array".PHP_EOL."\t\t\$viewAccess = array(".PHP_EOL."\t\t\t".implode(",".PHP_EOL."\t\t\t",$this->permissionDashboard).");"; } return ''; @@ -11090,7 +11138,7 @@ class Interpretation extends Fields $this->DashboardGetCustomData = ComponentbuilderHelper::getAllBetween($this->componentData->php_dashboard_methods,'public function get','()'); // return the methods - return "\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->componentData->php_dashboard_methods); + return PHP_EOL.PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->componentData->php_dashboard_methods); } return ''; } @@ -11109,7 +11157,7 @@ class Interpretation extends Fields $gets[] = "\$this->".$string.$tabs."= \$this->get('".$get."');"; } // return the gets - return "\n\t\t".implode("\n\t\t",$gets); + return PHP_EOL."\t\t".implode(PHP_EOL."\t\t",$gets); } return ''; } @@ -11134,7 +11182,7 @@ class Interpretation extends Fields $display[] = '
'; $display[] = "\t".'
'; $display[] = "\t 'cpanel')); ?>"; - $display[] = "\n\t\t"; + $display[] = PHP_EOL."\t\t"; $display[] = "\t\t".'
'; // set the tab to insure correct spacing $tab = "\t\t\t"; @@ -11170,7 +11218,7 @@ class Interpretation extends Fields foreach($builder as $tabname => $accordians) { $alias = ComponentbuilderHelper::safeString($tabname); - $display[] = "\n\t\t"; + $display[] = PHP_EOL."\t\t"; $display[] = "\t\t".'
'; $display[] = $tab.'
'; $display[] = $tab."\t 'one')); ?>"; @@ -11190,7 +11238,7 @@ class Interpretation extends Fields // set the file data $TARGET = ComponentbuilderHelper::safeString($this->target,'U'); // ###SITE_TEMPLATE_BODY### <<>> - $this->fileContentDynamic[$this->fileContentStatic['###component###'].'_'.$tempName]['###CUSTOM_ADMIN_TEMPLATE_BODY###'] = "\n".$html; + $this->fileContentDynamic[$this->fileContentStatic['###component###'].'_'.$tempName]['###CUSTOM_ADMIN_TEMPLATE_BODY###'] = PHP_EOL.$html; // ###SITE_TEMPLATE_CODE_BODY### <<>> $this->fileContentDynamic[$this->fileContentStatic['###component###'].'_'.$tempName]['###CUSTOM_ADMIN_TEMPLATE_CODE_BODY###'] = ''; } @@ -11200,12 +11248,12 @@ class Interpretation extends Fields $display[] = "\t\t"; } - $display[] = "\n\t"; + $display[] = PHP_EOL."\t"; $display[] = "\t
"; } $display[] = "
"; // return the display - return "\n".implode("\n",$display); + return PHP_EOL.implode(PHP_EOL,$display); } public function addCustomDashboardIcons(&$view,&$counter) @@ -11379,14 +11427,14 @@ class Interpretation extends Fields // check if the item has permissions. if ($coreLoad && isset($core['core.access']) && isset($this->permissionBuilder['global'][$core['core.access']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.access']]) && in_array($nameSingle,$this->permissionBuilder['global'][$core['core.access']])) { - $menus .= "\n\t\tif (\$user->authorise('".$core['core.access']."', 'com_".$codeName."') && \$user->authorise('".$nameSingle.".submenu', 'com_".$codeName."'))"; - $menus .= "\n\t\t{"; + $menus .= PHP_EOL."\t\tif (\$user->authorise('".$core['core.access']."', 'com_".$codeName."') && \$user->authorise('".$nameSingle.".submenu', 'com_".$codeName."'))"; + $menus .= PHP_EOL."\t\t{"; // add tab to lines to follow $tab = "\t"; } $nameList = ComponentbuilderHelper::safeString($view['settings']->name_list); $nameUpper = ComponentbuilderHelper::safeString($view['settings']->name_list, 'U'); - $menus .= "\n\t\t".$tab."JHtmlSidebar::addEntry(JText::_('".$lang."_".$nameUpper."'), 'index.php?option=com_".$codeName."&view=".$nameList."', \$submenu === '".$nameList."');"; + $menus .= PHP_EOL."\t\t".$tab."JHtmlSidebar::addEntry(JText::_('".$lang."_".$nameUpper."'), 'index.php?option=com_".$codeName."&view=".$nameList."', \$submenu === '".$nameList."');"; $this->langContent[$this->lang][$lang."_".$nameUpper] = $view['settings']->name_list; // check if category has another name if (isset($this->catOtherName[$nameList]) && ComponentbuilderHelper::checkArray($this->catOtherName[$nameList])) @@ -11399,14 +11447,14 @@ class Interpretation extends Fields } if (isset($this->categoryBuilder[$nameList]) && ComponentbuilderHelper::checkArray($this->categoryBuilder[$nameList]) && !in_array($otherViews,$catArray)) { - $menus .= "\n\t\t".$tab."JHtmlSidebar::addEntry(JText::_('".$this->categoryBuilder[$nameList]['name']."'), 'index.php?option=com_categories&view=categories&extension=com_".$codeName.".".$otherViews."', \$submenu === 'categories.".$otherViews."');"; + $menus .= PHP_EOL."\t\t".$tab."JHtmlSidebar::addEntry(JText::_('".$this->categoryBuilder[$nameList]['name']."'), 'index.php?option=com_categories&view=categories&extension=com_".$codeName.".".$otherViews."', \$submenu === 'categories.".$otherViews."');"; // make sure we add a category only once $catArray[] = $otherViews; } // check if the item has permissions. if ($coreLoad && isset($core['core.access']) && isset($this->permissionBuilder['global'][$core['core.access']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.access']]) && in_array($nameSingle,$this->permissionBuilder['global'][$core['core.access']])) { - $menus .= "\n\t\t}"; + $menus .= PHP_EOL."\t\t}"; } } } @@ -11487,17 +11535,17 @@ class Interpretation extends Fields // check if the item has permissions. if ($coreLoad && isset($core['core.access']) && isset($this->permissionBuilder['global'][$core['core.access']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.access']]) && in_array($nameSingle,$this->permissionBuilder['global'][$core['core.access']])) { - $custom .= "\n\t\t//".$this->setLine(__LINE__)." Access control (".$core['core.access']." && ".$nameSingle.".submenu)."; - $custom .= "\n\t\tif (\$user->authorise('".$core['core.access']."', 'com_".$codeName."') && \$user->authorise('".$nameSingle.".submenu', 'com_".$codeName."'))"; - $custom .= "\n\t\t{"; + $custom .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Access control (".$core['core.access']." && ".$nameSingle.".submenu)."; + $custom .= PHP_EOL."\t\tif (\$user->authorise('".$core['core.access']."', 'com_".$codeName."') && \$user->authorise('".$nameSingle.".submenu', 'com_".$codeName."'))"; + $custom .= PHP_EOL."\t\t{"; // add tab to lines to follow $tab = "\t"; } else { - $custom .= "\n\t\t//".$this->setLine(__LINE__)." Access control (".$nameSingle.".submenu)."; - $custom .= "\n\t\tif (\$user->authorise('".$nameSingle.".submenu', 'com_".$codeName."'))"; - $custom .= "\n\t\t{"; + $custom .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Access control (".$nameSingle.".submenu)."; + $custom .= PHP_EOL."\t\tif (\$user->authorise('".$nameSingle.".submenu', 'com_".$codeName."'))"; + $custom .= PHP_EOL."\t\t{"; // add tab to lines to follow $tab = "\t"; } @@ -11506,16 +11554,16 @@ class Interpretation extends Fields $this->langContent[$this->lang][$lang.'_'.$nameUpper] = $name; // add custom menu - $custom .= "\n\t\t".$tab."JHtmlSidebar::addEntry(JText::_('".$lang."_".$nameUpper."'), '".$menu['link']."', \$submenu === '".$nameList."');"; + $custom .= PHP_EOL."\t\t".$tab."JHtmlSidebar::addEntry(JText::_('".$lang."_".$nameUpper."'), '".$menu['link']."', \$submenu === '".$nameList."');"; } else { $this->langContent[$this->lang][$lang.'_'.$nameUpper] = $name; // add custom menu - $custom .= "\n\t\t".$tab."JHtmlSidebar::addEntry(JText::_('".$lang."_".$nameUpper."'), 'index.php?option=com_".$codeName."&view=".$nameList."', \$submenu === '".$nameList."');"; + $custom .= PHP_EOL."\t\t".$tab."JHtmlSidebar::addEntry(JText::_('".$lang."_".$nameUpper."'), 'index.php?option=com_".$codeName."&view=".$nameList."', \$submenu === '".$nameList."');"; } // check if the item has permissions. - $custom .= "\n\t\t}"; + $custom .= PHP_EOL."\t\t}"; return $custom; } @@ -11534,15 +11582,15 @@ class Interpretation extends Fields // check if the item has permissions. if ($coreLoad && isset($core['core.access']) && isset($this->permissionBuilder['global'][$core['core.access']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.access']]) && in_array($nameSingle,$this->permissionBuilder['global'][$core['core.access']])) { - $this->lastCustomSubMenu[$nr] .= "\n\t\tif (\$user->authorise('".$core['core.access']."', 'com_".$codeName."') && \$user->authorise('".$nameSingle.".submenu', 'com_".$codeName."'))"; - $this->lastCustomSubMenu[$nr] .= "\n\t\t{"; + $this->lastCustomSubMenu[$nr] .= PHP_EOL."\t\tif (\$user->authorise('".$core['core.access']."', 'com_".$codeName."') && \$user->authorise('".$nameSingle.".submenu', 'com_".$codeName."'))"; + $this->lastCustomSubMenu[$nr] .= PHP_EOL."\t\t{"; // add tab to lines to follow $tab = "\t"; } else { - $this->lastCustomSubMenu[$nr] .= "\n\t\tif (\$user->authorise('".$nameSingle.".submenu', 'com_".$codeName."'))"; - $this->lastCustomSubMenu[$nr] .= "\n\t\t{"; + $this->lastCustomSubMenu[$nr] .= PHP_EOL."\t\tif (\$user->authorise('".$nameSingle.".submenu', 'com_".$codeName."'))"; + $this->lastCustomSubMenu[$nr] .= PHP_EOL."\t\t{"; // add tab to lines to follow $tab = "\t"; } @@ -11550,16 +11598,16 @@ class Interpretation extends Fields { $this->langContent[$this->lang][$lang.'_'.$nameUpper] = $name; // add custom menu - $this->lastCustomSubMenu[$nr] .= "\n\t\t".$tab."JHtmlSidebar::addEntry(JText::_('".$lang."_".$nameUpper."'), '".$menu['link']."', \$submenu === '".$nameList."');"; + $this->lastCustomSubMenu[$nr] .= PHP_EOL."\t\t".$tab."JHtmlSidebar::addEntry(JText::_('".$lang."_".$nameUpper."'), '".$menu['link']."', \$submenu === '".$nameList."');"; } else { $this->langContent[$this->lang][$lang.'_'.$nameUpper] = $name; // add custom menu - $this->lastCustomSubMenu[$nr] .= "\n\t\t".$tab."JHtmlSidebar::addEntry(JText::_('".$lang."_".$nameUpper."'), 'index.php?option=com_".$codeName."&view=".$nameList."', \$submenu === '".$nameList."');"; + $this->lastCustomSubMenu[$nr] .= PHP_EOL."\t\t".$tab."JHtmlSidebar::addEntry(JText::_('".$lang."_".$nameUpper."'), 'index.php?option=com_".$codeName."&view=".$nameList."', \$submenu === '".$nameList."');"; } // check if the item has permissions. - $this->lastCustomSubMenu[$nr] .= "\n\t\t}"; + $this->lastCustomSubMenu[$nr] .= PHP_EOL."\t\t}"; } return false; } @@ -11583,7 +11631,7 @@ class Interpretation extends Fields { $nameList = ComponentbuilderHelper::safeString($view['settings']->name_list); $nameUpper = ComponentbuilderHelper::safeString($view['settings']->name_list, 'U'); - $menus .= "\n\t\t\t".''.$lang.'_'.$nameUpper.''; + $menus .= PHP_EOL."\t\t\t".''.$lang.'_'.$nameUpper.''; $this->langContent['adminsys'][$lang.'_'.$nameUpper] = $view['settings']->name_list; } } @@ -11614,13 +11662,13 @@ class Interpretation extends Fields { $this->langContent['adminsys'][$lang.'_'.$menu['settings']->CODE] = $menu['settings']->name; // add custom menu - $customMenu .= "\n\t\t\t".''.$lang.'_'.$menu['settings']->CODE.''; + $customMenu .= PHP_EOL."\t\t\t".''.$lang.'_'.$menu['settings']->CODE.''; } elseif($menu['mainmenu'] == 1 && empty($menu['before'])) { $this->langContent['adminsys'][$lang.'_'.$menu['settings']->CODE] = $menu['settings']->name; // add custom menu - $this->lastCustomMainMenu[$nr] = "\n\t\t\t".''.$lang.'_'.$menu['settings']->CODE.''; + $this->lastCustomMainMenu[$nr] = PHP_EOL."\t\t\t".''.$lang.'_'.$menu['settings']->CODE.''; } } } @@ -11639,7 +11687,7 @@ class Interpretation extends Fields $nameUpper = ComponentbuilderHelper::safeString($menu['name'], 'U'); $this->langContent['adminsys'][$lang.'_'.$nameUpper] = $menu['name']; // add custom menu - $customMenu .= "\n\t\t\t".''.$lang.'_'.$nameUpper.''; + $customMenu .= PHP_EOL."\t\t\t".''.$lang.'_'.$nameUpper.''; } else { @@ -11647,7 +11695,7 @@ class Interpretation extends Fields $nameUpper = ComponentbuilderHelper::safeString($menu['name_code'], 'U'); $this->langContent['adminsys'][$lang.'_'.$nameUpper] = $menu['name']; // add custom menu - $customMenu .= "\n\t\t\t".''.$lang.'_'.$nameUpper.''; + $customMenu .= PHP_EOL."\t\t\t".''.$lang.'_'.$nameUpper.''; } } elseif($menu['mainmenu'] == 1 && empty($menu['before'])) @@ -11658,7 +11706,7 @@ class Interpretation extends Fields $nameUpper = ComponentbuilderHelper::safeString($menu['name'], 'U'); $this->langContent['adminsys'][$lang.'_'.$nameUpper] = $menu['name']; // add custom menu - $this->lastCustomMainMenu[$nr] = "\n\t\t\t".''.$lang.'_'.$nameUpper.''; + $this->lastCustomMainMenu[$nr] = PHP_EOL."\t\t\t".''.$lang.'_'.$nameUpper.''; } else { @@ -11666,7 +11714,7 @@ class Interpretation extends Fields $nameUpper = ComponentbuilderHelper::safeString($menu['name_code'], 'U'); $this->langContent['adminsys'][$lang.'_'.$nameUpper] = $menu['name']; // add custom menu - $this->lastCustomMainMenu[$nr] = "\n\t\t\t".''.$lang.'_'.$nameUpper.''; + $this->lastCustomMainMenu[$nr] = PHP_EOL."\t\t\t".''.$lang.'_'.$nameUpper.''; } } } @@ -12098,7 +12146,7 @@ class Interpretation extends Fields $this->configFieldSets[] = "\t\t\t".''; $this->configFieldSets[] = "\t\t"; // add the contributor - $this->theContributors .= "\n\t@".strtolower($contributor['title'])."\t\t".$contributor['name'].' <'.$contributor['website'].'>'; + $this->theContributors .= PHP_EOL."\t@".strtolower($contributor['title'])."\t\t".$contributor['name'].' <'.$contributor['website'].'>'; // setup lang $Counter = ComponentbuilderHelper::safeString($counter,'Ww'); $this->langContent[$this->lang][$langCont.'_'.$COUNTER] = "Contributor ".$Counter; @@ -12321,7 +12369,7 @@ for developing fast and powerful web interfaces. For more info visit langContent[$this->lang][$lang.'_MAIL_CONFIGURATION'] = "Mail Configuration"; $this->langContent[$this->lang][$lang.'_DKIM'] = "DKIM"; // start building field set for email helper functions - $this->configFieldSets[] = "\n\tconfigFieldSets[] = PHP_EOL."\tconfigFieldSets[] = "\t\tname=\"mail_configuration_custom_config\""; $this->configFieldSets[] = "\t\tlabel=\"".$lang."_MAIL_CONFIGURATION\">"; // add custom Mail Configurations @@ -12380,7 +12428,7 @@ for developing fast and powerful web interfaces. For more info visit langContent[$this->lang][$lang.'_SMTPHOST_HINT'] = "localhost"; // set the mailer fields - $this->configFieldSets[] = "\n\t\t"; + $this->configFieldSets[] = PHP_EOL."\t\t"; $this->configFieldSets[] = "\t\tconfigFieldSets[] = "\t\t\ttype=\"radio\""; $this->configFieldSets[] = "\t\t\tname=\"mailonline\""; @@ -12649,7 +12697,7 @@ function vdm_dkim() { $this->langContent[$this->lang][$lang.'_DKIM_VALUE_HINT'] = "v=DKIM1;k=rsa;g=*;s=email;h=sha1;t=s;p=PUBLICKEY"; - $this->configFieldSets[] = "\n\t\t"; + $this->configFieldSets[] = PHP_EOL."\t\t"; $this->configFieldSets[] = "\t\tconfigFieldSets[] = "\t\t\ttype=\"radio\""; $this->configFieldSets[] = "\t\t\tname=\"dkim\""; @@ -12785,7 +12833,7 @@ function vdm_dkim() { { if ($this->googlechart) { - $this->configFieldSets[] = "\n\tconfigFieldSets[] = PHP_EOL."\tconfigFieldSets[] = "\t\tname=\"googlechart_config\""; $this->configFieldSets[] = "\t\tlabel=\"".$lang."_CHART_SETTINGS_LABEL\""; $this->configFieldSets[] = "\t\tdescription=\"".$lang."_CHART_SETTINGS_DESC\">"; @@ -13141,13 +13189,13 @@ function vdm_dkim() { $otherViews = $this->catCodeBuilder[$viewName_single]['views']; if ($otherViews == $viewName_list) { - $component .= "\n\t".'
'; - $component .= "\n\t\t".''; - $component .= "\n\t\t".''; - $component .= "\n\t\t".''; - $component .= "\n\t\t".''; - $component .= "\n\t\t".''; - $component .= "\n\t
"; + $component .= PHP_EOL."\t".'
'; + $component .= PHP_EOL."\t\t".''; + $component .= PHP_EOL."\t\t".''; + $component .= PHP_EOL."\t\t".''; + $component .= PHP_EOL."\t\t".''; + $component .= PHP_EOL."\t\t".''; + $component .= PHP_EOL."\t
"; } } return $component; @@ -13397,13 +13445,13 @@ function vdm_dkim() { } } /// now build the section - $component = implode("\n",$this->componentHead); + $component = implode(PHP_EOL,$this->componentHead); // sort the array to insure easy search ksort($this->componentGlobal,SORT_STRING); // add global to the compnent section - $component .= "\n".implode("\n",$this->componentGlobal)."\n\t"; + $component .= PHP_EOL.implode(PHP_EOL,$this->componentGlobal).PHP_EOL."\t"; // add views to the compnent section - $component .= "\n".implode("\n",$componentViews); + $component .= PHP_EOL.implode(PHP_EOL,$componentViews); // be sure to reset again. (memory) $this->componentHead = null; $this->componentGlobal = null; diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php index c34918c23..c67718d56 100644 --- a/admin/helpers/compiler/f_Infusion.php +++ b/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###'] .= "\n".$this->fileContentStatic['###Component###'].'Helper::globalEvent($document);'; + $this->fileContentStatic['###ADMIN_GLOBAL_EVENT###'] = PHP_EOL.PHP_EOL.'// Triger the Global Admin Event'; + $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###'] .= "\n\t".'* The Global Admin Event Method.'; - $this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= "\n\t".'**/'; - $this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= "\n\t".'public static function globalEvent($document)'; - $this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= "\n\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###'] .= "\n\t".'}'; + $this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] = PHP_EOL.PHP_EOL."\t".'/**'; + $this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'* The Global Admin Event Method.'; + $this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'**/'; + $this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'public static function globalEvent($document)'; + $this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'{'; + $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###'] .= PHP_EOL."\t".'}'; } // now load the readme file if needed if ($this->componentData->addreadme == 1) { - $this->fileContentStatic['###EXSTRA_ADMIN_FILES###'] .= "\n\t\t\tREADME.txt"; + $this->fileContentStatic['###EXSTRA_ADMIN_FILES###'] .= PHP_EOL."\t\t\tREADME.txt"; } // ###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### <<>> $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### <<>> - $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### <<>> - $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### <<>> - $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### <<>> - $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### <<>> $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### <<>> - $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### <<>> - $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### <<>> $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### <<>> $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### <<>> $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### <<>> $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### <<>> $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### <<>> $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###'] .= "\n".$this->fileContentStatic['###Component###'].'Helper::globalEvent($document);'; + $this->fileContentStatic['###SITE_GLOBAL_EVENT###'] = PHP_EOL.PHP_EOL.'// Triger the Global Site Event'; + $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###'] .= "\n\t".'* The Global Site Event Method.'; - $this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= "\n\t".'**/'; - $this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= "\n\t".'public static function globalEvent($document)'; - $this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= "\n\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###'] .= "\n\t".'}'; + $this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] = PHP_EOL.PHP_EOL."\t".'/**'; + $this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'* The Global Site Event Method.'; + $this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'**/'; + $this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'public static function globalEvent($document)'; + $this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'{'; + $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###'] .= 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###'])) diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index 06ae1da7e..01e6b4a3a 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index 12c22af6b..c840a3a15 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage headercheck.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 00cf560f4..3ace1ff82 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage batch_.php diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php index 7901be86f..55e457e86 100644 --- a/admin/helpers/indenter.php +++ b/admin/helpers/indenter.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage indenter.php diff --git a/admin/helpers/js.php b/admin/helpers/js.php index 1d1fb4515..fdba337a5 100644 --- a/admin/helpers/js.php +++ b/admin/helpers/js.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage js.php diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php index 76f8073ca..7bdf7a072 100644 --- a/admin/helpers/minify.php +++ b/admin/helpers/minify.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage minify.php diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index c06cd3856..3884eb668 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/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="[save to see]" +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.
Hash automation means it is added using the hash target of the lines surrounding the code.
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" diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php index 35fe9e7b2..a4056a1f2 100644 --- a/admin/layouts/admin_view/css_fullwidth.php +++ b/admin/layouts/admin_view/css_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage css_fullwidth.php diff --git a/admin/layouts/admin_view/custom_buttons_fullwidth.php b/admin/layouts/admin_view/custom_buttons_fullwidth.php index 4ca6f56a5..bb4f30410 100644 --- a/admin/layouts/admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/admin_view/custom_buttons_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/admin_view/custom_buttons_left.php b/admin/layouts/admin_view/custom_buttons_left.php index d041e5939..56fb52116 100644 --- a/admin/layouts/admin_view/custom_buttons_left.php +++ b/admin/layouts/admin_view/custom_buttons_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/admin_view/custom_import_fullwidth.php b/admin/layouts/admin_view/custom_import_fullwidth.php index 57efe9bf2..19d02ef59 100644 --- a/admin/layouts/admin_view/custom_import_fullwidth.php +++ b/admin/layouts/admin_view/custom_import_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_import_fullwidth.php diff --git a/admin/layouts/admin_view/fields_fullwidth.php b/admin/layouts/admin_view/fields_fullwidth.php index da7d4216c..561bae7d2 100644 --- a/admin/layouts/admin_view/fields_fullwidth.php +++ b/admin/layouts/admin_view/fields_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php diff --git a/admin/layouts/admin_view/javascript_fullwidth.php b/admin/layouts/admin_view/javascript_fullwidth.php index 32716e600..db9cc5cfd 100644 --- a/admin/layouts/admin_view/javascript_fullwidth.php +++ b/admin/layouts/admin_view/javascript_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage javascript_fullwidth.php diff --git a/admin/layouts/admin_view/linked_components_fullwidth.php b/admin/layouts/admin_view/linked_components_fullwidth.php index fd4981d6d..527932e6b 100644 --- a/admin/layouts/admin_view/linked_components_fullwidth.php +++ b/admin/layouts/admin_view/linked_components_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php index f99efc08c..045f3016e 100644 --- a/admin/layouts/admin_view/mysql_fullwidth.php +++ b/admin/layouts/admin_view/mysql_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_left.php b/admin/layouts/admin_view/mysql_left.php index 0796204a4..be4cb1e7c 100644 --- a/admin/layouts/admin_view/mysql_left.php +++ b/admin/layouts/admin_view/mysql_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_left.php diff --git a/admin/layouts/admin_view/php_fullwidth.php b/admin/layouts/admin_view/php_fullwidth.php index 3ca02da35..29b84a189 100644 --- a/admin/layouts/admin_view/php_fullwidth.php +++ b/admin/layouts/admin_view/php_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/admin_view/publishing.php b/admin/layouts/admin_view/publishing.php index 5e1e74011..207fb46f6 100644 --- a/admin/layouts/admin_view/publishing.php +++ b/admin/layouts/admin_view/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_view/publlshing.php b/admin/layouts/admin_view/publlshing.php index 90e3e69b5..1181b73bc 100644 --- a/admin/layouts/admin_view/publlshing.php +++ b/admin/layouts/admin_view/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_view/settings_above.php b/admin/layouts/admin_view/settings_above.php index db43e6467..95b5b6c4c 100644 --- a/admin/layouts/admin_view/settings_above.php +++ b/admin/layouts/admin_view/settings_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_above.php diff --git a/admin/layouts/admin_view/settings_left.php b/admin/layouts/admin_view/settings_left.php index df1b9292b..fabf70d9f 100644 --- a/admin/layouts/admin_view/settings_left.php +++ b/admin/layouts/admin_view/settings_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/admin_view/settings_right.php b/admin/layouts/admin_view/settings_right.php index 22289f15b..46c66b2d1 100644 --- a/admin/layouts/admin_view/settings_right.php +++ b/admin/layouts/admin_view/settings_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/admin_view/settings_under.php b/admin/layouts/admin_view/settings_under.php index b386721f6..b0f65fd43 100644 --- a/admin/layouts/admin_view/settings_under.php +++ b/admin/layouts/admin_view/settings_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_under.php diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 705ee2383..a313783b0 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage batchselection.php diff --git a/admin/layouts/component/admin_views_fullwidth.php b/admin/layouts/component/admin_views_fullwidth.php index 85b6f0816..56e5b0f02 100644 --- a/admin/layouts/component/admin_views_fullwidth.php +++ b/admin/layouts/component/admin_views_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views_fullwidth.php diff --git a/admin/layouts/component/custom_admin_views_fullwidth.php b/admin/layouts/component/custom_admin_views_fullwidth.php index 6007d92bc..24d168c48 100644 --- a/admin/layouts/component/custom_admin_views_fullwidth.php +++ b/admin/layouts/component/custom_admin_views_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views_fullwidth.php diff --git a/admin/layouts/component/details_above.php b/admin/layouts/component/details_above.php index 24dbf567f..8fec09077 100644 --- a/admin/layouts/component/details_above.php +++ b/admin/layouts/component/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/component/details_left.php b/admin/layouts/component/details_left.php index c1546bcd9..1cb7fa6cf 100644 --- a/admin/layouts/component/details_left.php +++ b/admin/layouts/component/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/component/details_right.php b/admin/layouts/component/details_right.php index f6f57d82c..79825cf9e 100644 --- a/admin/layouts/component/details_right.php +++ b/admin/layouts/component/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/component/details_under.php b/admin/layouts/component/details_under.php index 9d22ae0bf..d354fe1d3 100644 --- a/admin/layouts/component/details_under.php +++ b/admin/layouts/component/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/component/dynamic_build_beta_fullwidth.php b/admin/layouts/component/dynamic_build_beta_fullwidth.php index 180af9db5..a02871c5e 100644 --- a/admin/layouts/component/dynamic_build_beta_fullwidth.php +++ b/admin/layouts/component/dynamic_build_beta_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_build_beta_fullwidth.php diff --git a/admin/layouts/component/dynamic_integration_fullwidth.php b/admin/layouts/component/dynamic_integration_fullwidth.php index b2affe7e1..a6aae0d88 100644 --- a/admin/layouts/component/dynamic_integration_fullwidth.php +++ b/admin/layouts/component/dynamic_integration_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_integration_fullwidth.php diff --git a/admin/layouts/component/libs_helpers_fullwidth.php b/admin/layouts/component/libs_helpers_fullwidth.php index 93d88e431..840db7d60 100644 --- a/admin/layouts/component/libs_helpers_fullwidth.php +++ b/admin/layouts/component/libs_helpers_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage libs_helpers_fullwidth.php diff --git a/admin/layouts/component/mysql_fullwidth.php b/admin/layouts/component/mysql_fullwidth.php index f3edfc3fd..f838801fb 100644 --- a/admin/layouts/component/mysql_fullwidth.php +++ b/admin/layouts/component/mysql_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/component/php_fullwidth.php b/admin/layouts/component/php_fullwidth.php index e187a8d1e..c7f438118 100644 --- a/admin/layouts/component/php_fullwidth.php +++ b/admin/layouts/component/php_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/component/publishing.php b/admin/layouts/component/publishing.php index 5e1e74011..207fb46f6 100644 --- a/admin/layouts/component/publishing.php +++ b/admin/layouts/component/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/component/publlshing.php b/admin/layouts/component/publlshing.php index 90e3e69b5..1181b73bc 100644 --- a/admin/layouts/component/publlshing.php +++ b/admin/layouts/component/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/component/readme_left.php b/admin/layouts/component/readme_left.php index 0d930d259..5e5fe4350 100644 --- a/admin/layouts/component/readme_left.php +++ b/admin/layouts/component/readme_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_left.php diff --git a/admin/layouts/component/readme_right.php b/admin/layouts/component/readme_right.php index 0cd45d087..65e19455e 100644 --- a/admin/layouts/component/readme_right.php +++ b/admin/layouts/component/readme_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_right.php diff --git a/admin/layouts/component/settings_left.php b/admin/layouts/component/settings_left.php index 02d79a6d6..b2fe26bba 100644 --- a/admin/layouts/component/settings_left.php +++ b/admin/layouts/component/settings_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/component/settings_right.php b/admin/layouts/component/settings_right.php index a69177ada..f1bca19f7 100644 --- a/admin/layouts/component/settings_right.php +++ b/admin/layouts/component/settings_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/component/site_views_fullwidth.php b/admin/layouts/component/site_views_fullwidth.php index 2de3b0b32..9cd57ffb9 100644 --- a/admin/layouts/component/site_views_fullwidth.php +++ b/admin/layouts/component/site_views_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage site_views_fullwidth.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php index 4ca6f56a5..bb4f30410 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_left.php b/admin/layouts/custom_admin_view/custom_buttons_left.php index d041e5939..56fb52116 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_left.php +++ b/admin/layouts/custom_admin_view/custom_buttons_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/custom_admin_view/custom_script_fullwidth.php b/admin/layouts/custom_admin_view/custom_script_fullwidth.php index c79680a3d..4c9747182 100644 --- a/admin/layouts/custom_admin_view/custom_script_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_above.php b/admin/layouts/custom_admin_view/details_above.php index 24dbf567f..8fec09077 100644 --- a/admin/layouts/custom_admin_view/details_above.php +++ b/admin/layouts/custom_admin_view/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_admin_view/details_fullwidth.php b/admin/layouts/custom_admin_view/details_fullwidth.php index ff1952306..64fa76537 100644 --- a/admin/layouts/custom_admin_view/details_fullwidth.php +++ b/admin/layouts/custom_admin_view/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_left.php b/admin/layouts/custom_admin_view/details_left.php index cee74484b..656b53062 100644 --- a/admin/layouts/custom_admin_view/details_left.php +++ b/admin/layouts/custom_admin_view/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_admin_view/details_right.php b/admin/layouts/custom_admin_view/details_right.php index d103427a8..86acbb59f 100644 --- a/admin/layouts/custom_admin_view/details_right.php +++ b/admin/layouts/custom_admin_view/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_admin_view/details_rightside.php b/admin/layouts/custom_admin_view/details_rightside.php index 0551cd22e..1d8ec310f 100644 --- a/admin/layouts/custom_admin_view/details_rightside.php +++ b/admin/layouts/custom_admin_view/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/custom_admin_view/details_under.php b/admin/layouts/custom_admin_view/details_under.php index 9d22ae0bf..d354fe1d3 100644 --- a/admin/layouts/custom_admin_view/details_under.php +++ b/admin/layouts/custom_admin_view/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_admin_view/linked_components_fullwidth.php b/admin/layouts/custom_admin_view/linked_components_fullwidth.php index 4067a6b54..fedb068ff 100644 --- a/admin/layouts/custom_admin_view/linked_components_fullwidth.php +++ b/admin/layouts/custom_admin_view/linked_components_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php index 5e1e74011..207fb46f6 100644 --- a/admin/layouts/custom_admin_view/publishing.php +++ b/admin/layouts/custom_admin_view/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_admin_view/publlshing.php b/admin/layouts/custom_admin_view/publlshing.php index 90e3e69b5..1181b73bc 100644 --- a/admin/layouts/custom_admin_view/publlshing.php +++ b/admin/layouts/custom_admin_view/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/custom_code/details_above.php b/admin/layouts/custom_code/details_above.php index 79bc6b89e..b932a0ae2 100644 --- a/admin/layouts/custom_code/details_above.php +++ b/admin/layouts/custom_code/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php @@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); $fields = array( - 'path' + 'target' ); ?> diff --git a/admin/layouts/custom_code/details_fullwidth.php b/admin/layouts/custom_code/details_fullwidth.php index d1a2d4158..1b9645b8d 100644 --- a/admin/layouts/custom_code/details_fullwidth.php +++ b/admin/layouts/custom_code/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php @@ -30,6 +30,7 @@ defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( + 'path', 'code' ); diff --git a/admin/layouts/custom_code/details_left.php b/admin/layouts/custom_code/details_left.php index c1eb1bd93..6bb29cae3 100644 --- a/admin/layouts/custom_code/details_left.php +++ b/admin/layouts/custom_code/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php @@ -32,7 +32,8 @@ $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( 'component', 'type', - 'hashtarget' + 'hashtarget', + 'note_jcb_placeholder' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); diff --git a/admin/layouts/custom_code/details_right.php b/admin/layouts/custom_code/details_right.php index 80d1faed0..b742755cb 100644 --- a/admin/layouts/custom_code/details_right.php +++ b/admin/layouts/custom_code/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_code/details_under.php b/admin/layouts/custom_code/details_under.php new file mode 100644 index 000000000..d354fe1d3 --- /dev/null +++ b/admin/layouts/custom_code/details_under.php @@ -0,0 +1,41 @@ + + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file + +defined('_JEXEC') or die('Restricted access'); + +$form = $displayData->getForm(); + +$fields = array( + 'not_required' +); + +?> +
+ renderField($field); + } ?> +
diff --git a/admin/layouts/custom_code/publishing.php b/admin/layouts/custom_code/publishing.php index 5e1e74011..207fb46f6 100644 --- a/admin/layouts/custom_code/publishing.php +++ b/admin/layouts/custom_code/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_code/publlshing.php b/admin/layouts/custom_code/publlshing.php index 90e3e69b5..1181b73bc 100644 --- a/admin/layouts/custom_code/publlshing.php +++ b/admin/layouts/custom_code/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/dynamic_get/abacus_fullwidth.php b/admin/layouts/dynamic_get/abacus_fullwidth.php index 497f12f83..5566f953a 100644 --- a/admin/layouts/dynamic_get/abacus_fullwidth.php +++ b/admin/layouts/dynamic_get/abacus_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage abacus_fullwidth.php diff --git a/admin/layouts/dynamic_get/abacus_left.php b/admin/layouts/dynamic_get/abacus_left.php index 15d98c79f..301fb9386 100644 --- a/admin/layouts/dynamic_get/abacus_left.php +++ b/admin/layouts/dynamic_get/abacus_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage abacus_left.php diff --git a/admin/layouts/dynamic_get/custom_script_fullwidth.php b/admin/layouts/dynamic_get/custom_script_fullwidth.php index 729c158d8..ee3150856 100644 --- a/admin/layouts/dynamic_get/custom_script_fullwidth.php +++ b/admin/layouts/dynamic_get/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/dynamic_get/gettable_above.php b/admin/layouts/dynamic_get/gettable_above.php index 2612de187..c951024f9 100644 --- a/admin/layouts/dynamic_get/gettable_above.php +++ b/admin/layouts/dynamic_get/gettable_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_above.php diff --git a/admin/layouts/dynamic_get/gettable_fullwidth.php b/admin/layouts/dynamic_get/gettable_fullwidth.php index cffe1875f..d2dc0a7ef 100644 --- a/admin/layouts/dynamic_get/gettable_fullwidth.php +++ b/admin/layouts/dynamic_get/gettable_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_fullwidth.php diff --git a/admin/layouts/dynamic_get/gettable_left.php b/admin/layouts/dynamic_get/gettable_left.php index c2e1af67b..fd37340d9 100644 --- a/admin/layouts/dynamic_get/gettable_left.php +++ b/admin/layouts/dynamic_get/gettable_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_left.php diff --git a/admin/layouts/dynamic_get/gettable_right.php b/admin/layouts/dynamic_get/gettable_right.php index 84ecb3db6..a6ca60528 100644 --- a/admin/layouts/dynamic_get/gettable_right.php +++ b/admin/layouts/dynamic_get/gettable_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_right.php diff --git a/admin/layouts/dynamic_get/gettable_under.php b/admin/layouts/dynamic_get/gettable_under.php index c64e1f0f5..e7a11cad7 100644 --- a/admin/layouts/dynamic_get/gettable_under.php +++ b/admin/layouts/dynamic_get/gettable_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_under.php diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php index 5e1e74011..207fb46f6 100644 --- a/admin/layouts/dynamic_get/publishing.php +++ b/admin/layouts/dynamic_get/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/dynamic_get/publlshing.php b/admin/layouts/dynamic_get/publlshing.php index 90e3e69b5..1181b73bc 100644 --- a/admin/layouts/dynamic_get/publlshing.php +++ b/admin/layouts/dynamic_get/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/details_fullwidth.php b/admin/layouts/field/details_fullwidth.php index 39ba316e1..2a6290efb 100644 --- a/admin/layouts/field/details_fullwidth.php +++ b/admin/layouts/field/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/field/details_left.php b/admin/layouts/field/details_left.php index 12b00df46..b3b59c9df 100644 --- a/admin/layouts/field/details_left.php +++ b/admin/layouts/field/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/field/details_right.php b/admin/layouts/field/details_right.php index 6b079bfbe..f16390f5c 100644 --- a/admin/layouts/field/details_right.php +++ b/admin/layouts/field/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/field/details_under.php b/admin/layouts/field/details_under.php index 9d22ae0bf..d354fe1d3 100644 --- a/admin/layouts/field/details_under.php +++ b/admin/layouts/field/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/field/linked_admin_views_fullwidth.php b/admin/layouts/field/linked_admin_views_fullwidth.php index 90644b468..74aed55ff 100644 --- a/admin/layouts/field/linked_admin_views_fullwidth.php +++ b/admin/layouts/field/linked_admin_views_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_admin_views_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vzslinked_admin_views; +$items = $displayData->vzvlinked_admin_views; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view.edit"; diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php index 5e1e74011..207fb46f6 100644 --- a/admin/layouts/field/publishing.php +++ b/admin/layouts/field/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/field/publlshing.php b/admin/layouts/field/publlshing.php index 90e3e69b5..1181b73bc 100644 --- a/admin/layouts/field/publlshing.php +++ b/admin/layouts/field/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/scripts_left.php b/admin/layouts/field/scripts_left.php index 986b7e574..80864fcc3 100644 --- a/admin/layouts/field/scripts_left.php +++ b/admin/layouts/field/scripts_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_left.php diff --git a/admin/layouts/field/scripts_right.php b/admin/layouts/field/scripts_right.php index f908b70d2..8e8a2ea9f 100644 --- a/admin/layouts/field/scripts_right.php +++ b/admin/layouts/field/scripts_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_right.php diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php index b6ee09363..554dad25c 100644 --- a/admin/layouts/fieldtype/details_left.php +++ b/admin/layouts/fieldtype/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/fieldtype/details_right.php b/admin/layouts/fieldtype/details_right.php index ff6f2fdb2..1c263b637 100644 --- a/admin/layouts/fieldtype/details_right.php +++ b/admin/layouts/fieldtype/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php index a468cb4a0..6227af6a6 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vztfields; +$items = $displayData->vzwfields; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit"; diff --git a/admin/layouts/fieldtype/publishing.php b/admin/layouts/fieldtype/publishing.php index 5e1e74011..207fb46f6 100644 --- a/admin/layouts/fieldtype/publishing.php +++ b/admin/layouts/fieldtype/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/fieldtype/publlshing.php b/admin/layouts/fieldtype/publlshing.php index 90e3e69b5..1181b73bc 100644 --- a/admin/layouts/fieldtype/publlshing.php +++ b/admin/layouts/fieldtype/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index 657351a23..65b7b0c53 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index 9db80cb05..30ca2fc9e 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index 649ce7e19..cbca9d1e0 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index e655d2c6d..120e4f3af 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index 9d22ae0bf..d354fe1d3 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index 5e1e74011..207fb46f6 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index 1c2331968..f14539747 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/layout/custom_script_fullwidth.php b/admin/layouts/layout/custom_script_fullwidth.php index 845990ed4..25dcee140 100644 --- a/admin/layouts/layout/custom_script_fullwidth.php +++ b/admin/layouts/layout/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/layout/details_fullwidth.php b/admin/layouts/layout/details_fullwidth.php index 7711bb35a..c871ddc49 100644 --- a/admin/layouts/layout/details_fullwidth.php +++ b/admin/layouts/layout/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/layout/details_left.php b/admin/layouts/layout/details_left.php index d8aed3e06..2198920a0 100644 --- a/admin/layouts/layout/details_left.php +++ b/admin/layouts/layout/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/layout/details_right.php b/admin/layouts/layout/details_right.php index a6a4eabb6..fdd19dc91 100644 --- a/admin/layouts/layout/details_right.php +++ b/admin/layouts/layout/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/layout/details_rightside.php b/admin/layouts/layout/details_rightside.php index a33402888..3ac3c59d5 100644 --- a/admin/layouts/layout/details_rightside.php +++ b/admin/layouts/layout/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/layout/details_under.php b/admin/layouts/layout/details_under.php index 9d22ae0bf..d354fe1d3 100644 --- a/admin/layouts/layout/details_under.php +++ b/admin/layouts/layout/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/layout/publishing.php b/admin/layouts/layout/publishing.php index 5e1e74011..207fb46f6 100644 --- a/admin/layouts/layout/publishing.php +++ b/admin/layouts/layout/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/layout/publlshing.php b/admin/layouts/layout/publlshing.php index 90e3e69b5..1181b73bc 100644 --- a/admin/layouts/layout/publlshing.php +++ b/admin/layouts/layout/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/site_view/custom_buttons_fullwidth.php b/admin/layouts/site_view/custom_buttons_fullwidth.php index a0f1f2e30..007c195ea 100644 --- a/admin/layouts/site_view/custom_buttons_fullwidth.php +++ b/admin/layouts/site_view/custom_buttons_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/site_view/details_above.php b/admin/layouts/site_view/details_above.php index 24dbf567f..8fec09077 100644 --- a/admin/layouts/site_view/details_above.php +++ b/admin/layouts/site_view/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/site_view/details_fullwidth.php b/admin/layouts/site_view/details_fullwidth.php index ff1952306..64fa76537 100644 --- a/admin/layouts/site_view/details_fullwidth.php +++ b/admin/layouts/site_view/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/site_view/details_left.php b/admin/layouts/site_view/details_left.php index cee74484b..656b53062 100644 --- a/admin/layouts/site_view/details_left.php +++ b/admin/layouts/site_view/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/site_view/details_right.php b/admin/layouts/site_view/details_right.php index a6a4eabb6..fdd19dc91 100644 --- a/admin/layouts/site_view/details_right.php +++ b/admin/layouts/site_view/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/site_view/details_rightside.php b/admin/layouts/site_view/details_rightside.php index 0551cd22e..1d8ec310f 100644 --- a/admin/layouts/site_view/details_rightside.php +++ b/admin/layouts/site_view/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/site_view/details_under.php b/admin/layouts/site_view/details_under.php index 9d22ae0bf..d354fe1d3 100644 --- a/admin/layouts/site_view/details_under.php +++ b/admin/layouts/site_view/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/site_view/javascript_css_fullwidth.php b/admin/layouts/site_view/javascript_css_fullwidth.php index 0a74c6195..950de7f75 100644 --- a/admin/layouts/site_view/javascript_css_fullwidth.php +++ b/admin/layouts/site_view/javascript_css_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage javascript_css_fullwidth.php diff --git a/admin/layouts/site_view/linked_components_fullwidth.php b/admin/layouts/site_view/linked_components_fullwidth.php index 4ce6260c2..20695567c 100644 --- a/admin/layouts/site_view/linked_components_fullwidth.php +++ b/admin/layouts/site_view/linked_components_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php index 7a5b84016..314eb16a6 100644 --- a/admin/layouts/site_view/php_fullwidth.php +++ b/admin/layouts/site_view/php_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/site_view/publishing.php b/admin/layouts/site_view/publishing.php index 5e1e74011..207fb46f6 100644 --- a/admin/layouts/site_view/publishing.php +++ b/admin/layouts/site_view/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/site_view/publlshing.php b/admin/layouts/site_view/publlshing.php index 90e3e69b5..1181b73bc 100644 --- a/admin/layouts/site_view/publlshing.php +++ b/admin/layouts/site_view/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/snippet/details_above.php b/admin/layouts/snippet/details_above.php index 19285c739..3ab6d9b1d 100644 --- a/admin/layouts/snippet/details_above.php +++ b/admin/layouts/snippet/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/snippet/details_left.php b/admin/layouts/snippet/details_left.php index 722d25ac3..1a81bf692 100644 --- a/admin/layouts/snippet/details_left.php +++ b/admin/layouts/snippet/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/snippet/details_right.php b/admin/layouts/snippet/details_right.php index f22fa2da1..05cb12111 100644 --- a/admin/layouts/snippet/details_right.php +++ b/admin/layouts/snippet/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/snippet/publishing.php b/admin/layouts/snippet/publishing.php index 5e1e74011..207fb46f6 100644 --- a/admin/layouts/snippet/publishing.php +++ b/admin/layouts/snippet/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/snippet/publlshing.php b/admin/layouts/snippet/publlshing.php index 90e3e69b5..1181b73bc 100644 --- a/admin/layouts/snippet/publlshing.php +++ b/admin/layouts/snippet/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/template/custom_script_fullwidth.php b/admin/layouts/template/custom_script_fullwidth.php index 845990ed4..25dcee140 100644 --- a/admin/layouts/template/custom_script_fullwidth.php +++ b/admin/layouts/template/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/template/details_fullwidth.php b/admin/layouts/template/details_fullwidth.php index 41b9ad6d4..f237ff8dc 100644 --- a/admin/layouts/template/details_fullwidth.php +++ b/admin/layouts/template/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/template/details_left.php b/admin/layouts/template/details_left.php index d8aed3e06..2198920a0 100644 --- a/admin/layouts/template/details_left.php +++ b/admin/layouts/template/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/template/details_right.php b/admin/layouts/template/details_right.php index a6a4eabb6..fdd19dc91 100644 --- a/admin/layouts/template/details_right.php +++ b/admin/layouts/template/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/template/details_rightside.php b/admin/layouts/template/details_rightside.php index a33402888..3ac3c59d5 100644 --- a/admin/layouts/template/details_rightside.php +++ b/admin/layouts/template/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/template/details_under.php b/admin/layouts/template/details_under.php index 9d22ae0bf..d354fe1d3 100644 --- a/admin/layouts/template/details_under.php +++ b/admin/layouts/template/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/template/publishing.php b/admin/layouts/template/publishing.php index 5e1e74011..207fb46f6 100644 --- a/admin/layouts/template/publishing.php +++ b/admin/layouts/template/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/template/publlshing.php b/admin/layouts/template/publlshing.php index 90e3e69b5..1181b73bc 100644 --- a/admin/layouts/template/publlshing.php +++ b/admin/layouts/template/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 1bccbf969..a252a60b5 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.php diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index b9f1bd3f7..b035bbbb8 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/models/custom_code.php b/admin/models/custom_code.php index c15fdbc71..014a1ad71 100644 --- a/admin/models/custom_code.php +++ b/admin/models/custom_code.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC - @build 31st January, 2017 + @version @update number 28 of this MVC + @build 9th February, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_code.php @@ -356,6 +356,42 @@ class ComponentbuilderModelCustom_code extends JModelAdmin } return $data; + } + + /** + * Method to validate the form data. + * + * @param JForm $form The form to validate against. + * @param array $data The data to validate. + * @param string $group The name of the field group to validate. + * + * @return mixed Array of filtered data if valid, false otherwise. + * + * @see JFormRule + * @see JFilterInput + * @since 12.2 + */ + public function validate($form, $data, $group = null) + { + // check if the not_required field is set + if (ComponentbuilderHelper::checkString($data['not_required'])) + { + $requiredFields = (array) explode(',',(string) $data['not_required']); + $requiredFields = array_unique($requiredFields); + // now change the required field attributes value + foreach ($requiredFields as $requiredField) + { + // make sure there is a string value + if (ComponentbuilderHelper::checkString($requiredField)) + { + // change to false + $form->setFieldAttribute($requiredField, 'required', 'false'); + // also clear the data set + $data[$requiredField] = ''; + } + } + } + return parent::validate($form, $data, $group); } /** diff --git a/admin/models/custom_codes.php b/admin/models/custom_codes.php index 70ebe350c..54400cf37 100644 --- a/admin/models/custom_codes.php +++ b/admin/models/custom_codes.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC - @build 31st January, 2017 + @version @update number 28 of this MVC + @build 9th February, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_codes.php @@ -46,6 +46,7 @@ class ComponentbuilderModelCustom_codes extends JModelList 'a.modified_by','modified_by', 'a.component','component', 'a.path','path', + 'a.target','target', 'a.type','type' ); } @@ -73,6 +74,9 @@ class ComponentbuilderModelCustom_codes extends JModelList $path = $this->getUserStateFromRequest($this->context . '.filter.path', 'filter_path'); $this->setState('filter.path', $path); + $target = $this->getUserStateFromRequest($this->context . '.filter.target', 'filter_target'); + $this->setState('filter.target', $target); + $type = $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type'); $this->setState('filter.type', $type); @@ -126,6 +130,19 @@ class ComponentbuilderModelCustom_codes extends JModelList } } + } + + if (ComponentbuilderHelper::checkArray($items) && !isset($_export)) + { + foreach ($items as $item) + { + if ($item->target == 2) + { + $item->component_system_name = '[CUSTO'.'MCODE='.$item->id.']'; // so it is not detected + $item->path = '/*'; + $item->type = 2; + } + } } // set selection value to a translatable value @@ -133,6 +150,8 @@ class ComponentbuilderModelCustom_codes extends JModelList { foreach ($items as $nr => &$item) { + // convert target + $item->target = $this->selectionTranslation($item->target, 'target'); // convert type $item->type = $this->selectionTranslation($item->type, 'type'); } @@ -150,6 +169,19 @@ class ComponentbuilderModelCustom_codes extends JModelList */ public function selectionTranslation($value,$name) { + // Array of target language strings + if ($name === 'target') + { + $targetArray = array( + 1 => 'COM_COMPONENTBUILDER_CUSTOM_CODE_HASH_AUTOMATION', + 2 => 'COM_COMPONENTBUILDER_CUSTOM_CODE_JCB_MANUAL' + ); + // Now check if value is found in this array + if (isset($targetArray[$value]) && ComponentbuilderHelper::checkString($targetArray[$value])) + { + return $targetArray[$value]; + } + } // Array of type language strings if ($name === 'type') { @@ -234,6 +266,11 @@ class ComponentbuilderModelCustom_codes extends JModelList { $query->where('a.component = ' . $db->quote($db->escape($component))); } + // Filter by Target. + if ($target = $this->getState('filter.target')) + { + $query->where('a.target = ' . $db->quote($db->escape($target))); + } // Filter by Type. if ($type = $this->getState('filter.type')) { @@ -320,6 +357,19 @@ class ComponentbuilderModelCustom_codes extends JModelList { array_unshift($items,$headers); } + + if (ComponentbuilderHelper::checkArray($items) && !isset($_export)) + { + foreach ($items as $item) + { + if ($item->target == 2) + { + $item->component_system_name = '[CUSTO'.'MCODE='.$item->id.']'; // so it is not detected + $item->path = '/*'; + $item->type = 2; + } + } + } return $items; } } @@ -370,6 +420,7 @@ class ComponentbuilderModelCustom_codes extends JModelList $id .= ':' . $this->getState('filter.modified_by'); $id .= ':' . $this->getState('filter.component'); $id .= ':' . $this->getState('filter.path'); + $id .= ':' . $this->getState('filter.target'); $id .= ':' . $this->getState('filter.type'); return parent::getStoreId($id); diff --git a/admin/models/field.php b/admin/models/field.php index 16de26a44..34ad25213 100644 --- a/admin/models/field.php +++ b/admin/models/field.php @@ -141,7 +141,7 @@ class ComponentbuilderModelField extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVzslinked_admin_views() + public function getVzvlinked_admin_views() { // Get the user object. $user = JFactory::getUser(); @@ -260,42 +260,17 @@ class ComponentbuilderModelField extends JModelAdmin { $id = $jinput->get('id', 0, 'INT'); } - // Determine correct permissions to check. - if ($this->getState('field.id')) - { - $id = $this->getState('field.id'); - - $catid = 0; - if (isset($this->getItem($id)->catid)) - { - // set catagory id - $catid = $this->getItem($id)->catid; - - // Existing record. Can only edit in selected categories. - $form->setFieldAttribute('catid', 'action', 'core.edit'); - - // Existing record. Can only edit own items in selected categories. - $form->setFieldAttribute('catid', 'action', 'core.edit.own'); - } - } - else - { - // New record. Can only create in selected categories. - $form->setFieldAttribute('catid', 'action', 'core.create'); - } $user = JFactory::getUser(); // Check for existing item. // Modify the form based on Edit State access controls. if ($id != 0 && (!$user->authorise('field.edit.state', 'com_componentbuilder.field.' . (int) $id)) - || (isset($catid) && $catid != 0 && !$user->authorise('core.edit.state', 'com_componentbuilder.fields.category.' . (int) $catid)) || ($id == 0 && !$user->authorise('field.edit.state', 'com_componentbuilder'))) { // Disable fields for display. $form->setFieldAttribute('ordering', 'disabled', 'true'); $form->setFieldAttribute('published', 'disabled', 'true'); - // Disable fields while saving. $form->setFieldAttribute('ordering', 'filter', 'unset'); $form->setFieldAttribute('published', 'filter', 'unset'); @@ -370,14 +345,8 @@ class ComponentbuilderModelField extends JModelAdmin } $user = JFactory::getUser(); - $allow = $user->authorise('core.delete', 'com_componentbuilder.fields.category.' . (int) $record->catid); - - if ($allow) - { - // The record has been set. Check the record permissions. - return $user->authorise('field.delete', 'com_componentbuilder.field.' . (int) $record->id); - } - return $allow; + // The record has been set. Check the record permissions. + return $user->authorise('field.delete', 'com_componentbuilder.field.' . (int) $record->id); } return false; } @@ -405,15 +374,6 @@ class ComponentbuilderModelField extends JModelAdmin return false; } } - // Check against the category. - if (!empty($record->catid)) - { - $catpermission = $user->authorise('core.edit.state', 'com_componentbuilder.fields.category.' . (int) $record->catid); - if (!$catpermission && !is_null($catpermission)) - { - return false; - } - } // In the absense of better information, revert to the component permissions. return $user->authorise('field.edit.state', 'com_componentbuilder'); } diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index a4bf4ddf8..81c79dfcf 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviewfolderlist.php diff --git a/admin/models/fields/adminviews.php b/admin/models/fields/adminviews.php index 3adb42068..ec715c0a6 100644 --- a/admin/models/fields/adminviews.php +++ b/admin/models/fields/adminviews.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviews.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index f5b28c6f4..b3fd2f3c7 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage articles.php diff --git a/admin/models/fields/component.php b/admin/models/fields/component.php index b973b3c5a..f0c107d5f 100644 --- a/admin/models/fields/component.php +++ b/admin/models/fields/component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage component.php diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php index 0e846c364..c05378aaa 100644 --- a/admin/models/fields/customadminviews.php +++ b/admin/models/fields/customadminviews.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage customadminviews.php diff --git a/admin/models/fields/customfilelist.php b/admin/models/fields/customfilelist.php index 8fb616c3d..8ebe3be6e 100644 --- a/admin/models/fields/customfilelist.php +++ b/admin/models/fields/customfilelist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage customfilelist.php diff --git a/admin/models/fields/customfolderlist.php b/admin/models/fields/customfolderlist.php index 9c797fccf..dd51e9c77 100644 --- a/admin/models/fields/customfolderlist.php +++ b/admin/models/fields/customfolderlist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage customfolderlist.php diff --git a/admin/models/fields/customgets.php b/admin/models/fields/customgets.php index 9cf7c1a77..e14cedeb2 100644 --- a/admin/models/fields/customgets.php +++ b/admin/models/fields/customgets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage customgets.php diff --git a/admin/models/fields/dbtables.php b/admin/models/fields/dbtables.php index 6cb6a50cc..0df45a86c 100644 --- a/admin/models/fields/dbtables.php +++ b/admin/models/fields/dbtables.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage dbtables.php diff --git a/admin/models/fields/dynamicgets.php b/admin/models/fields/dynamicgets.php index d0e5578fa..5d773fda3 100644 --- a/admin/models/fields/dynamicgets.php +++ b/admin/models/fields/dynamicgets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamicgets.php diff --git a/admin/models/fields/fields.php b/admin/models/fields/fields.php index 63e6b6559..991b17cf0 100644 --- a/admin/models/fields/fields.php +++ b/admin/models/fields/fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/models/fields/fieldsmulti.php b/admin/models/fields/fieldsmulti.php index d23540ca6..c46d6bc36 100644 --- a/admin/models/fields/fieldsmulti.php +++ b/admin/models/fields/fieldsmulti.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldsmulti.php diff --git a/admin/models/fields/fieldtypes.php b/admin/models/fields/fieldtypes.php index 09b6b8fa4..f249f1ae7 100644 --- a/admin/models/fields/fieldtypes.php +++ b/admin/models/fields/fieldtypes.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php index 8c5e75a84..34349f691 100644 --- a/admin/models/fields/maingets.php +++ b/admin/models/fields/maingets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage maingets.php diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php index 5b49e4014..e81266ac9 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage siteviewfolderlist.php diff --git a/admin/models/fields/siteviews.php b/admin/models/fields/siteviews.php index 425222651..ccfa8466c 100644 --- a/admin/models/fields/siteviews.php +++ b/admin/models/fields/siteviews.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage siteviews.php diff --git a/admin/models/fields/snippets.php b/admin/models/fields/snippets.php index 3822a2f3a..9bb957757 100644 --- a/admin/models/fields/snippets.php +++ b/admin/models/fields/snippets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php index 17be0f6d9..53ea80cd8 100644 --- a/admin/models/fieldtype.php +++ b/admin/models/fieldtype.php @@ -111,7 +111,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVztfields() + public function getVzwfields() { // Get the user object. $user = JFactory::getUser(); @@ -195,13 +195,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin foreach ($items as $nr => &$item) { // convert datatype - $item->datatype = $this->selectionTranslationVztfields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationVzwfields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationVztfields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationVzwfields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationVztfields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationVzwfields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationVztfields($item->store, 'store'); + $item->store = $this->selectionTranslationVzwfields($item->store, 'store'); } } @@ -215,7 +215,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return translatable string */ - public function selectionTranslationVztfields($value,$name) + public function selectionTranslationVzwfields($value,$name) { // Array of datatype language strings if ($name === 'datatype') @@ -320,42 +320,17 @@ class ComponentbuilderModelFieldtype extends JModelAdmin { $id = $jinput->get('id', 0, 'INT'); } - // Determine correct permissions to check. - if ($this->getState('fieldtype.id')) - { - $id = $this->getState('fieldtype.id'); - - $catid = 0; - if (isset($this->getItem($id)->catid)) - { - // set catagory id - $catid = $this->getItem($id)->catid; - - // Existing record. Can only edit in selected categories. - $form->setFieldAttribute('catid', 'action', 'core.edit'); - - // Existing record. Can only edit own items in selected categories. - $form->setFieldAttribute('catid', 'action', 'core.edit.own'); - } - } - else - { - // New record. Can only create in selected categories. - $form->setFieldAttribute('catid', 'action', 'core.create'); - } $user = JFactory::getUser(); // Check for existing item. // Modify the form based on Edit State access controls. if ($id != 0 && (!$user->authorise('fieldtype.edit.state', 'com_componentbuilder.fieldtype.' . (int) $id)) - || (isset($catid) && $catid != 0 && !$user->authorise('core.edit.state', 'com_componentbuilder.fieldtypes.category.' . (int) $catid)) || ($id == 0 && !$user->authorise('fieldtype.edit.state', 'com_componentbuilder'))) { // Disable fields for display. $form->setFieldAttribute('ordering', 'disabled', 'true'); $form->setFieldAttribute('published', 'disabled', 'true'); - // Disable fields while saving. $form->setFieldAttribute('ordering', 'filter', 'unset'); $form->setFieldAttribute('published', 'filter', 'unset'); @@ -430,14 +405,8 @@ class ComponentbuilderModelFieldtype extends JModelAdmin } $user = JFactory::getUser(); - $allow = $user->authorise('core.delete', 'com_componentbuilder.fieldtypes.category.' . (int) $record->catid); - - if ($allow) - { - // The record has been set. Check the record permissions. - return $user->authorise('fieldtype.delete', 'com_componentbuilder.fieldtype.' . (int) $record->id); - } - return $allow; + // The record has been set. Check the record permissions. + return $user->authorise('fieldtype.delete', 'com_componentbuilder.fieldtype.' . (int) $record->id); } return false; } @@ -465,15 +434,6 @@ class ComponentbuilderModelFieldtype extends JModelAdmin return false; } } - // Check against the category. - if (!empty($record->catid)) - { - $catpermission = $user->authorise('core.edit.state', 'com_componentbuilder.fieldtypes.category.' . (int) $record->catid); - if (!$catpermission && !is_null($catpermission)) - { - return false; - } - } // In the absense of better information, revert to the component permissions. return $user->authorise('fieldtype.edit.state', 'com_componentbuilder'); } diff --git a/admin/models/forms/custom_code.js b/admin/models/forms/custom_code.js index 405343e50..2802f8301 100644 --- a/admin/models/forms/custom_code.js +++ b/admin/models/forms/custom_code.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC - @build 31st January, 2017 + @version @update number 28 of this MVC + @build 9th February, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_code.js @@ -22,27 +22,177 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ +// Some Global Values +jform_vvvvvzpvzk_required = false; +jform_vvvvvzpvzl_required = false; +jform_vvvvvzpvzm_required = false; + // Initial Script jQuery(document).ready(function() { - var type_vvvvvzo = jQuery("#jform_type input[type='radio']:checked").val(); - vvvvvzo(type_vvvvvzo); + var target_vvvvvzo = jQuery("#jform_target input[type='radio']:checked").val(); + vvvvvzo(target_vvvvvzo); + + var target_vvvvvzp = jQuery("#jform_target input[type='radio']:checked").val(); + vvvvvzp(target_vvvvvzp); + + var target_vvvvvzq = jQuery("#jform_target input[type='radio']:checked").val(); + var type_vvvvvzq = jQuery("#jform_type input[type='radio']:checked").val(); + vvvvvzq(target_vvvvvzq,type_vvvvvzq); + + var type_vvvvvzr = jQuery("#jform_type input[type='radio']:checked").val(); + var target_vvvvvzr = jQuery("#jform_target input[type='radio']:checked").val(); + vvvvvzr(type_vvvvvzr,target_vvvvvzr); }); // the vvvvvzo function -function vvvvvzo(type_vvvvvzo) +function vvvvvzo(target_vvvvvzo) { // set the function logic - if (type_vvvvvzo == 1) + if (target_vvvvvzo == 2) + { + jQuery('.note_jcb_placeholder').closest('.control-group').show(); + } + else + { + jQuery('.note_jcb_placeholder').closest('.control-group').hide(); + } +} + +// the vvvvvzp function +function vvvvvzp(target_vvvvvzp) +{ + // set the function logic + if (target_vvvvvzp == 1) + { + jQuery('#jform_component').closest('.control-group').show(); + if (jform_vvvvvzpvzk_required) + { + updateFieldRequired('component',0); + jQuery('#jform_component').prop('required','required'); + jQuery('#jform_component').attr('aria-required',true); + jQuery('#jform_component').addClass('required'); + jform_vvvvvzpvzk_required = false; + } + + jQuery('#jform_path').closest('.control-group').show(); + if (jform_vvvvvzpvzl_required) + { + updateFieldRequired('path',0); + jQuery('#jform_path').prop('required','required'); + jQuery('#jform_path').attr('aria-required',true); + jQuery('#jform_path').addClass('required'); + jform_vvvvvzpvzl_required = false; + } + + jQuery('#jform_from_line').closest('.control-group').show(); + jQuery('#jform_hashtarget').closest('.control-group').show(); + jQuery('#jform_to_line').closest('.control-group').show(); + jQuery('#jform_type').closest('.control-group').show(); + if (jform_vvvvvzpvzm_required) + { + updateFieldRequired('type',0); + jQuery('#jform_type').prop('required','required'); + jQuery('#jform_type').attr('aria-required',true); + jQuery('#jform_type').addClass('required'); + jform_vvvvvzpvzm_required = false; + } + + } + else + { + jQuery('#jform_component').closest('.control-group').hide(); + if (!jform_vvvvvzpvzk_required) + { + updateFieldRequired('component',1); + jQuery('#jform_component').removeAttr('required'); + jQuery('#jform_component').removeAttr('aria-required'); + jQuery('#jform_component').removeClass('required'); + jform_vvvvvzpvzk_required = true; + } + jQuery('#jform_path').closest('.control-group').hide(); + if (!jform_vvvvvzpvzl_required) + { + updateFieldRequired('path',1); + jQuery('#jform_path').removeAttr('required'); + jQuery('#jform_path').removeAttr('aria-required'); + jQuery('#jform_path').removeClass('required'); + jform_vvvvvzpvzl_required = true; + } + jQuery('#jform_from_line').closest('.control-group').hide(); + jQuery('#jform_hashtarget').closest('.control-group').hide(); + jQuery('#jform_to_line').closest('.control-group').hide(); + jQuery('#jform_type').closest('.control-group').hide(); + if (!jform_vvvvvzpvzm_required) + { + updateFieldRequired('type',1); + jQuery('#jform_type').removeAttr('required'); + jQuery('#jform_type').removeAttr('aria-required'); + jQuery('#jform_type').removeClass('required'); + jform_vvvvvzpvzm_required = true; + } + } +} + +// the vvvvvzq function +function vvvvvzq(target_vvvvvzq,type_vvvvvzq) +{ + // set the function logic + if (target_vvvvvzq == 1 && type_vvvvvzq == 1) { jQuery('#jform_hashendtarget').closest('.control-group').show(); + jQuery('#jform_to_line').closest('.control-group').show(); } else { jQuery('#jform_hashendtarget').closest('.control-group').hide(); + jQuery('#jform_to_line').closest('.control-group').hide(); } } +// the vvvvvzr function +function vvvvvzr(type_vvvvvzr,target_vvvvvzr) +{ + // set the function logic + if (type_vvvvvzr == 1 && target_vvvvvzr == 1) + { + jQuery('#jform_hashendtarget').closest('.control-group').show(); + jQuery('#jform_to_line').closest('.control-group').show(); + } + else + { + jQuery('#jform_hashendtarget').closest('.control-group').hide(); + jQuery('#jform_to_line').closest('.control-group').hide(); + } +} + +// update required fields +function updateFieldRequired(name,status) +{ + var not_required = jQuery('#jform_not_required').val(); + + if(status == 1) + { + if (isSet(not_required) && not_required != 0) + { + not_required = not_required+','+name; + } + else + { + not_required = ','+name; + } + } + else + { + if (isSet(not_required) && not_required != 0) + { + not_required = not_required.replace(','+name,''); + } + } + + jQuery('#jform_not_required').val(not_required); +} + // the isSet function function isSet(val) { diff --git a/admin/models/forms/custom_code.xml b/admin/models/forms/custom_code.xml index b9cefea4f..ae959f481 100644 --- a/admin/models/forms/custom_code.xml +++ b/admin/models/forms/custom_code.xml @@ -116,6 +116,20 @@ message="Error! Please add target path." hint="COM_COMPONENTBUILDER_CUSTOM_CODE_PATH_HINT" /> + + + + + + COM_COMPONENTBUILDER_CUSTOM_CODE_INSERTION - + - - @@ -172,20 +172,6 @@ message="Error! Please add some text here." hint="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_HINT" /> - - + + + + + + + + diff --git a/admin/models/forms/field.js b/admin/models/forms/field.js index 9cbc73d6b..55fcdf637 100644 --- a/admin/models/forms/field.js +++ b/admin/models/forms/field.js @@ -23,171 +23,171 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvzpvzk_required = false; -jform_vvvvvzqvzl_required = false; -jform_vvvvvzrvzm_required = false; jform_vvvvvzsvzn_required = false; -jform_vvvvvzvvzo_required = false; -jform_vvvvvzwvzp_required = false; -jform_vvvvvzxvzq_required = false; +jform_vvvvvztvzo_required = false; +jform_vvvvvzuvzp_required = false; +jform_vvvvvzvvzq_required = false; jform_vvvvvzyvzr_required = false; +jform_vvvvvzzvzs_required = false; +jform_vvvvwaavzt_required = false; +jform_vvvvwabvzu_required = false; // Initial Script jQuery(document).ready(function() { - var datalenght_vvvvvzp = jQuery("#jform_datalenght").val(); - vvvvvzp(datalenght_vvvvvzp); + var datalenght_vvvvvzs = jQuery("#jform_datalenght").val(); + vvvvvzs(datalenght_vvvvvzs); - var datadefault_vvvvvzq = jQuery("#jform_datadefault").val(); - vvvvvzq(datadefault_vvvvvzq); + var datadefault_vvvvvzt = jQuery("#jform_datadefault").val(); + vvvvvzt(datadefault_vvvvvzt); - var datatype_vvvvvzr = jQuery("#jform_datatype").val(); - vvvvvzr(datatype_vvvvvzr); + var datatype_vvvvvzu = jQuery("#jform_datatype").val(); + vvvvvzu(datatype_vvvvvzu); - var datatype_vvvvvzs = jQuery("#jform_datatype").val(); - vvvvvzs(datatype_vvvvvzs); + var datatype_vvvvvzv = jQuery("#jform_datatype").val(); + vvvvvzv(datatype_vvvvvzv); - var store_vvvvvzt = jQuery("#jform_store").val(); - var datatype_vvvvvzt = jQuery("#jform_datatype").val(); - vvvvvzt(store_vvvvvzt,datatype_vvvvvzt); + var store_vvvvvzw = jQuery("#jform_store").val(); + var datatype_vvvvvzw = jQuery("#jform_datatype").val(); + vvvvvzw(store_vvvvvzw,datatype_vvvvvzw); - var add_css_view_vvvvvzv = jQuery("#jform_add_css_view input[type='radio']:checked").val(); - vvvvvzv(add_css_view_vvvvvzv); + var add_css_view_vvvvvzy = jQuery("#jform_add_css_view input[type='radio']:checked").val(); + vvvvvzy(add_css_view_vvvvvzy); - var add_css_views_vvvvvzw = jQuery("#jform_add_css_views input[type='radio']:checked").val(); - vvvvvzw(add_css_views_vvvvvzw); + var add_css_views_vvvvvzz = jQuery("#jform_add_css_views input[type='radio']:checked").val(); + vvvvvzz(add_css_views_vvvvvzz); - var add_javascript_view_footer_vvvvvzx = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val(); - vvvvvzx(add_javascript_view_footer_vvvvvzx); + var add_javascript_view_footer_vvvvwaa = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val(); + vvvvwaa(add_javascript_view_footer_vvvvwaa); - var add_javascript_views_footer_vvvvvzy = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val(); - vvvvvzy(add_javascript_views_footer_vvvvvzy); + var add_javascript_views_footer_vvvvwab = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val(); + vvvvwab(add_javascript_views_footer_vvvvwab); }); -// the vvvvvzp function -function vvvvvzp(datalenght_vvvvvzp) +// the vvvvvzs function +function vvvvvzs(datalenght_vvvvvzs) { - if (isSet(datalenght_vvvvvzp) && datalenght_vvvvvzp.constructor !== Array) + if (isSet(datalenght_vvvvvzs) && datalenght_vvvvvzs.constructor !== Array) { - var temp_vvvvvzp = datalenght_vvvvvzp; - var datalenght_vvvvvzp = []; - datalenght_vvvvvzp.push(temp_vvvvvzp); + var temp_vvvvvzs = datalenght_vvvvvzs; + var datalenght_vvvvvzs = []; + datalenght_vvvvvzs.push(temp_vvvvvzs); } - else if (!isSet(datalenght_vvvvvzp)) + else if (!isSet(datalenght_vvvvvzs)) { - var datalenght_vvvvvzp = []; + var datalenght_vvvvvzs = []; } - var datalenght = datalenght_vvvvvzp.some(datalenght_vvvvvzp_SomeFunc); + var datalenght = datalenght_vvvvvzs.some(datalenght_vvvvvzs_SomeFunc); // set this function logic if (datalenght) { jQuery('#jform_datalenght_other').closest('.control-group').show(); - if (jform_vvvvvzpvzk_required) + if (jform_vvvvvzsvzn_required) { updateFieldRequired('datalenght_other',0); jQuery('#jform_datalenght_other').prop('required','required'); jQuery('#jform_datalenght_other').attr('aria-required',true); jQuery('#jform_datalenght_other').addClass('required'); - jform_vvvvvzpvzk_required = false; + jform_vvvvvzsvzn_required = false; } } else { jQuery('#jform_datalenght_other').closest('.control-group').hide(); - if (!jform_vvvvvzpvzk_required) + if (!jform_vvvvvzsvzn_required) { updateFieldRequired('datalenght_other',1); jQuery('#jform_datalenght_other').removeAttr('required'); jQuery('#jform_datalenght_other').removeAttr('aria-required'); jQuery('#jform_datalenght_other').removeClass('required'); - jform_vvvvvzpvzk_required = true; + jform_vvvvvzsvzn_required = true; } } } -// the vvvvvzp Some function -function datalenght_vvvvvzp_SomeFunc(datalenght_vvvvvzp) +// the vvvvvzs Some function +function datalenght_vvvvvzs_SomeFunc(datalenght_vvvvvzs) { // set the function logic - if (datalenght_vvvvvzp == 'Other') + if (datalenght_vvvvvzs == 'Other') { return true; } return false; } -// the vvvvvzq function -function vvvvvzq(datadefault_vvvvvzq) +// the vvvvvzt function +function vvvvvzt(datadefault_vvvvvzt) { - if (isSet(datadefault_vvvvvzq) && datadefault_vvvvvzq.constructor !== Array) + if (isSet(datadefault_vvvvvzt) && datadefault_vvvvvzt.constructor !== Array) { - var temp_vvvvvzq = datadefault_vvvvvzq; - var datadefault_vvvvvzq = []; - datadefault_vvvvvzq.push(temp_vvvvvzq); + var temp_vvvvvzt = datadefault_vvvvvzt; + var datadefault_vvvvvzt = []; + datadefault_vvvvvzt.push(temp_vvvvvzt); } - else if (!isSet(datadefault_vvvvvzq)) + else if (!isSet(datadefault_vvvvvzt)) { - var datadefault_vvvvvzq = []; + var datadefault_vvvvvzt = []; } - var datadefault = datadefault_vvvvvzq.some(datadefault_vvvvvzq_SomeFunc); + var datadefault = datadefault_vvvvvzt.some(datadefault_vvvvvzt_SomeFunc); // set this function logic if (datadefault) { jQuery('#jform_datadefault_other').closest('.control-group').show(); - if (jform_vvvvvzqvzl_required) + if (jform_vvvvvztvzo_required) { updateFieldRequired('datadefault_other',0); jQuery('#jform_datadefault_other').prop('required','required'); jQuery('#jform_datadefault_other').attr('aria-required',true); jQuery('#jform_datadefault_other').addClass('required'); - jform_vvvvvzqvzl_required = false; + jform_vvvvvztvzo_required = false; } } else { jQuery('#jform_datadefault_other').closest('.control-group').hide(); - if (!jform_vvvvvzqvzl_required) + if (!jform_vvvvvztvzo_required) { updateFieldRequired('datadefault_other',1); jQuery('#jform_datadefault_other').removeAttr('required'); jQuery('#jform_datadefault_other').removeAttr('aria-required'); jQuery('#jform_datadefault_other').removeClass('required'); - jform_vvvvvzqvzl_required = true; + jform_vvvvvztvzo_required = true; } } } -// the vvvvvzq Some function -function datadefault_vvvvvzq_SomeFunc(datadefault_vvvvvzq) +// the vvvvvzt Some function +function datadefault_vvvvvzt_SomeFunc(datadefault_vvvvvzt) { // set the function logic - if (datadefault_vvvvvzq == 'Other') + if (datadefault_vvvvvzt == 'Other') { return true; } return false; } -// the vvvvvzr function -function vvvvvzr(datatype_vvvvvzr) +// the vvvvvzu function +function vvvvvzu(datatype_vvvvvzu) { - if (isSet(datatype_vvvvvzr) && datatype_vvvvvzr.constructor !== Array) + if (isSet(datatype_vvvvvzu) && datatype_vvvvvzu.constructor !== Array) { - var temp_vvvvvzr = datatype_vvvvvzr; - var datatype_vvvvvzr = []; - datatype_vvvvvzr.push(temp_vvvvvzr); + var temp_vvvvvzu = datatype_vvvvvzu; + var datatype_vvvvvzu = []; + datatype_vvvvvzu.push(temp_vvvvvzu); } - else if (!isSet(datatype_vvvvvzr)) + else if (!isSet(datatype_vvvvvzu)) { - var datatype_vvvvvzr = []; + var datatype_vvvvvzu = []; } - var datatype = datatype_vvvvvzr.some(datatype_vvvvvzr_SomeFunc); + var datatype = datatype_vvvvvzu.some(datatype_vvvvvzu_SomeFunc); // set this function logic @@ -196,13 +196,13 @@ function vvvvvzr(datatype_vvvvvzr) jQuery('#jform_datadefault').closest('.control-group').show(); jQuery('#jform_datalenght').closest('.control-group').show(); jQuery('#jform_indexes').closest('.control-group').show(); - if (jform_vvvvvzrvzm_required) + if (jform_vvvvvzuvzp_required) { updateFieldRequired('indexes',0); jQuery('#jform_indexes').prop('required','required'); jQuery('#jform_indexes').attr('aria-required',true); jQuery('#jform_indexes').addClass('required'); - jform_vvvvvzrvzm_required = false; + jform_vvvvvzuvzp_required = false; } } @@ -211,109 +211,109 @@ function vvvvvzr(datatype_vvvvvzr) jQuery('#jform_datadefault').closest('.control-group').hide(); jQuery('#jform_datalenght').closest('.control-group').hide(); jQuery('#jform_indexes').closest('.control-group').hide(); - if (!jform_vvvvvzrvzm_required) + if (!jform_vvvvvzuvzp_required) { updateFieldRequired('indexes',1); jQuery('#jform_indexes').removeAttr('required'); jQuery('#jform_indexes').removeAttr('aria-required'); jQuery('#jform_indexes').removeClass('required'); - jform_vvvvvzrvzm_required = true; + jform_vvvvvzuvzp_required = true; } } } -// the vvvvvzr Some function -function datatype_vvvvvzr_SomeFunc(datatype_vvvvvzr) +// the vvvvvzu Some function +function datatype_vvvvvzu_SomeFunc(datatype_vvvvvzu) { // set the function logic - if (datatype_vvvvvzr == 'CHAR' || datatype_vvvvvzr == 'VARCHAR' || datatype_vvvvvzr == 'DATETIME' || datatype_vvvvvzr == 'DATE' || datatype_vvvvvzr == 'TIME' || datatype_vvvvvzr == 'INT' || datatype_vvvvvzr == 'TINYINT' || datatype_vvvvvzr == 'BIGINT' || datatype_vvvvvzr == 'FLOAT' || datatype_vvvvvzr == 'DECIMAL' || datatype_vvvvvzr == 'DOUBLE') + if (datatype_vvvvvzu == 'CHAR' || datatype_vvvvvzu == 'VARCHAR' || datatype_vvvvvzu == 'DATETIME' || datatype_vvvvvzu == 'DATE' || datatype_vvvvvzu == 'TIME' || datatype_vvvvvzu == 'INT' || datatype_vvvvvzu == 'TINYINT' || datatype_vvvvvzu == 'BIGINT' || datatype_vvvvvzu == 'FLOAT' || datatype_vvvvvzu == 'DECIMAL' || datatype_vvvvvzu == 'DOUBLE') { return true; } return false; } -// the vvvvvzs function -function vvvvvzs(datatype_vvvvvzs) +// the vvvvvzv function +function vvvvvzv(datatype_vvvvvzv) { - if (isSet(datatype_vvvvvzs) && datatype_vvvvvzs.constructor !== Array) + if (isSet(datatype_vvvvvzv) && datatype_vvvvvzv.constructor !== Array) { - var temp_vvvvvzs = datatype_vvvvvzs; - var datatype_vvvvvzs = []; - datatype_vvvvvzs.push(temp_vvvvvzs); + var temp_vvvvvzv = datatype_vvvvvzv; + var datatype_vvvvvzv = []; + datatype_vvvvvzv.push(temp_vvvvvzv); } - else if (!isSet(datatype_vvvvvzs)) + else if (!isSet(datatype_vvvvvzv)) { - var datatype_vvvvvzs = []; + var datatype_vvvvvzv = []; } - var datatype = datatype_vvvvvzs.some(datatype_vvvvvzs_SomeFunc); + var datatype = datatype_vvvvvzv.some(datatype_vvvvvzv_SomeFunc); // set this function logic if (datatype) { jQuery('#jform_store').closest('.control-group').show(); - if (jform_vvvvvzsvzn_required) + if (jform_vvvvvzvvzq_required) { updateFieldRequired('store',0); jQuery('#jform_store').prop('required','required'); jQuery('#jform_store').attr('aria-required',true); jQuery('#jform_store').addClass('required'); - jform_vvvvvzsvzn_required = false; + jform_vvvvvzvvzq_required = false; } } else { jQuery('#jform_store').closest('.control-group').hide(); - if (!jform_vvvvvzsvzn_required) + if (!jform_vvvvvzvvzq_required) { updateFieldRequired('store',1); jQuery('#jform_store').removeAttr('required'); jQuery('#jform_store').removeAttr('aria-required'); jQuery('#jform_store').removeClass('required'); - jform_vvvvvzsvzn_required = true; + jform_vvvvvzvvzq_required = true; } } } -// the vvvvvzs Some function -function datatype_vvvvvzs_SomeFunc(datatype_vvvvvzs) +// the vvvvvzv Some function +function datatype_vvvvvzv_SomeFunc(datatype_vvvvvzv) { // set the function logic - if (datatype_vvvvvzs == 'CHAR' || datatype_vvvvvzs == 'VARCHAR' || datatype_vvvvvzs == 'TEXT' || datatype_vvvvvzs == 'MEDIUMTEXT' || datatype_vvvvvzs == 'LONGTEXT') + if (datatype_vvvvvzv == 'CHAR' || datatype_vvvvvzv == 'VARCHAR' || datatype_vvvvvzv == 'TEXT' || datatype_vvvvvzv == 'MEDIUMTEXT' || datatype_vvvvvzv == 'LONGTEXT') { return true; } return false; } -// the vvvvvzt function -function vvvvvzt(store_vvvvvzt,datatype_vvvvvzt) +// the vvvvvzw function +function vvvvvzw(store_vvvvvzw,datatype_vvvvvzw) { - if (isSet(store_vvvvvzt) && store_vvvvvzt.constructor !== Array) + if (isSet(store_vvvvvzw) && store_vvvvvzw.constructor !== Array) { - var temp_vvvvvzt = store_vvvvvzt; - var store_vvvvvzt = []; - store_vvvvvzt.push(temp_vvvvvzt); + var temp_vvvvvzw = store_vvvvvzw; + var store_vvvvvzw = []; + store_vvvvvzw.push(temp_vvvvvzw); } - else if (!isSet(store_vvvvvzt)) + else if (!isSet(store_vvvvvzw)) { - var store_vvvvvzt = []; + var store_vvvvvzw = []; } - var store = store_vvvvvzt.some(store_vvvvvzt_SomeFunc); + var store = store_vvvvvzw.some(store_vvvvvzw_SomeFunc); - if (isSet(datatype_vvvvvzt) && datatype_vvvvvzt.constructor !== Array) + if (isSet(datatype_vvvvvzw) && datatype_vvvvvzw.constructor !== Array) { - var temp_vvvvvzt = datatype_vvvvvzt; - var datatype_vvvvvzt = []; - datatype_vvvvvzt.push(temp_vvvvvzt); + var temp_vvvvvzw = datatype_vvvvvzw; + var datatype_vvvvvzw = []; + datatype_vvvvvzw.push(temp_vvvvvzw); } - else if (!isSet(datatype_vvvvvzt)) + else if (!isSet(datatype_vvvvvzw)) { - var datatype_vvvvvzt = []; + var datatype_vvvvvzw = []; } - var datatype = datatype_vvvvvzt.some(datatype_vvvvvzt_SomeFunc); + var datatype = datatype_vvvvvzw.some(datatype_vvvvvzw_SomeFunc); // set this function logic @@ -327,148 +327,148 @@ function vvvvvzt(store_vvvvvzt,datatype_vvvvvzt) } } -// the vvvvvzt Some function -function store_vvvvvzt_SomeFunc(store_vvvvvzt) +// the vvvvvzw Some function +function store_vvvvvzw_SomeFunc(store_vvvvvzw) { // set the function logic - if (store_vvvvvzt == 4) + if (store_vvvvvzw == 4) { return true; } return false; } -// the vvvvvzt Some function -function datatype_vvvvvzt_SomeFunc(datatype_vvvvvzt) +// the vvvvvzw Some function +function datatype_vvvvvzw_SomeFunc(datatype_vvvvvzw) { // set the function logic - if (datatype_vvvvvzt == 'CHAR' || datatype_vvvvvzt == 'VARCHAR' || datatype_vvvvvzt == 'TEXT' || datatype_vvvvvzt == 'MEDIUMTEXT' || datatype_vvvvvzt == 'LONGTEXT') + if (datatype_vvvvvzw == 'CHAR' || datatype_vvvvvzw == 'VARCHAR' || datatype_vvvvvzw == 'TEXT' || datatype_vvvvvzw == 'MEDIUMTEXT' || datatype_vvvvvzw == 'LONGTEXT') { return true; } return false; } -// the vvvvvzv function -function vvvvvzv(add_css_view_vvvvvzv) +// the vvvvvzy function +function vvvvvzy(add_css_view_vvvvvzy) { // set the function logic - if (add_css_view_vvvvvzv == 1) + if (add_css_view_vvvvvzy == 1) { jQuery('#jform_css_view').closest('.control-group').show(); - if (jform_vvvvvzvvzo_required) + if (jform_vvvvvzyvzr_required) { updateFieldRequired('css_view',0); jQuery('#jform_css_view').prop('required','required'); jQuery('#jform_css_view').attr('aria-required',true); jQuery('#jform_css_view').addClass('required'); - jform_vvvvvzvvzo_required = false; - } - - } - else - { - jQuery('#jform_css_view').closest('.control-group').hide(); - if (!jform_vvvvvzvvzo_required) - { - updateFieldRequired('css_view',1); - jQuery('#jform_css_view').removeAttr('required'); - jQuery('#jform_css_view').removeAttr('aria-required'); - jQuery('#jform_css_view').removeClass('required'); - jform_vvvvvzvvzo_required = true; - } - } -} - -// the vvvvvzw function -function vvvvvzw(add_css_views_vvvvvzw) -{ - // set the function logic - if (add_css_views_vvvvvzw == 1) - { - jQuery('#jform_css_views').closest('.control-group').show(); - if (jform_vvvvvzwvzp_required) - { - updateFieldRequired('css_views',0); - jQuery('#jform_css_views').prop('required','required'); - jQuery('#jform_css_views').attr('aria-required',true); - jQuery('#jform_css_views').addClass('required'); - jform_vvvvvzwvzp_required = false; - } - - } - else - { - jQuery('#jform_css_views').closest('.control-group').hide(); - if (!jform_vvvvvzwvzp_required) - { - updateFieldRequired('css_views',1); - jQuery('#jform_css_views').removeAttr('required'); - jQuery('#jform_css_views').removeAttr('aria-required'); - jQuery('#jform_css_views').removeClass('required'); - jform_vvvvvzwvzp_required = true; - } - } -} - -// the vvvvvzx function -function vvvvvzx(add_javascript_view_footer_vvvvvzx) -{ - // set the function logic - if (add_javascript_view_footer_vvvvvzx == 1) - { - jQuery('#jform_javascript_view_footer').closest('.control-group').show(); - if (jform_vvvvvzxvzq_required) - { - updateFieldRequired('javascript_view_footer',0); - jQuery('#jform_javascript_view_footer').prop('required','required'); - jQuery('#jform_javascript_view_footer').attr('aria-required',true); - jQuery('#jform_javascript_view_footer').addClass('required'); - jform_vvvvvzxvzq_required = false; - } - - } - else - { - jQuery('#jform_javascript_view_footer').closest('.control-group').hide(); - if (!jform_vvvvvzxvzq_required) - { - updateFieldRequired('javascript_view_footer',1); - jQuery('#jform_javascript_view_footer').removeAttr('required'); - jQuery('#jform_javascript_view_footer').removeAttr('aria-required'); - jQuery('#jform_javascript_view_footer').removeClass('required'); - jform_vvvvvzxvzq_required = true; - } - } -} - -// the vvvvvzy function -function vvvvvzy(add_javascript_views_footer_vvvvvzy) -{ - // set the function logic - if (add_javascript_views_footer_vvvvvzy == 1) - { - jQuery('#jform_javascript_views_footer').closest('.control-group').show(); - if (jform_vvvvvzyvzr_required) - { - updateFieldRequired('javascript_views_footer',0); - jQuery('#jform_javascript_views_footer').prop('required','required'); - jQuery('#jform_javascript_views_footer').attr('aria-required',true); - jQuery('#jform_javascript_views_footer').addClass('required'); jform_vvvvvzyvzr_required = false; } } else { - jQuery('#jform_javascript_views_footer').closest('.control-group').hide(); + jQuery('#jform_css_view').closest('.control-group').hide(); if (!jform_vvvvvzyvzr_required) + { + updateFieldRequired('css_view',1); + jQuery('#jform_css_view').removeAttr('required'); + jQuery('#jform_css_view').removeAttr('aria-required'); + jQuery('#jform_css_view').removeClass('required'); + jform_vvvvvzyvzr_required = true; + } + } +} + +// the vvvvvzz function +function vvvvvzz(add_css_views_vvvvvzz) +{ + // set the function logic + if (add_css_views_vvvvvzz == 1) + { + jQuery('#jform_css_views').closest('.control-group').show(); + if (jform_vvvvvzzvzs_required) + { + updateFieldRequired('css_views',0); + jQuery('#jform_css_views').prop('required','required'); + jQuery('#jform_css_views').attr('aria-required',true); + jQuery('#jform_css_views').addClass('required'); + jform_vvvvvzzvzs_required = false; + } + + } + else + { + jQuery('#jform_css_views').closest('.control-group').hide(); + if (!jform_vvvvvzzvzs_required) + { + updateFieldRequired('css_views',1); + jQuery('#jform_css_views').removeAttr('required'); + jQuery('#jform_css_views').removeAttr('aria-required'); + jQuery('#jform_css_views').removeClass('required'); + jform_vvvvvzzvzs_required = true; + } + } +} + +// the vvvvwaa function +function vvvvwaa(add_javascript_view_footer_vvvvwaa) +{ + // set the function logic + if (add_javascript_view_footer_vvvvwaa == 1) + { + jQuery('#jform_javascript_view_footer').closest('.control-group').show(); + if (jform_vvvvwaavzt_required) + { + updateFieldRequired('javascript_view_footer',0); + jQuery('#jform_javascript_view_footer').prop('required','required'); + jQuery('#jform_javascript_view_footer').attr('aria-required',true); + jQuery('#jform_javascript_view_footer').addClass('required'); + jform_vvvvwaavzt_required = false; + } + + } + else + { + jQuery('#jform_javascript_view_footer').closest('.control-group').hide(); + if (!jform_vvvvwaavzt_required) + { + updateFieldRequired('javascript_view_footer',1); + jQuery('#jform_javascript_view_footer').removeAttr('required'); + jQuery('#jform_javascript_view_footer').removeAttr('aria-required'); + jQuery('#jform_javascript_view_footer').removeClass('required'); + jform_vvvvwaavzt_required = true; + } + } +} + +// the vvvvwab function +function vvvvwab(add_javascript_views_footer_vvvvwab) +{ + // set the function logic + if (add_javascript_views_footer_vvvvwab == 1) + { + jQuery('#jform_javascript_views_footer').closest('.control-group').show(); + if (jform_vvvvwabvzu_required) + { + updateFieldRequired('javascript_views_footer',0); + jQuery('#jform_javascript_views_footer').prop('required','required'); + jQuery('#jform_javascript_views_footer').attr('aria-required',true); + jQuery('#jform_javascript_views_footer').addClass('required'); + jform_vvvvwabvzu_required = false; + } + + } + else + { + jQuery('#jform_javascript_views_footer').closest('.control-group').hide(); + if (!jform_vvvvwabvzu_required) { updateFieldRequired('javascript_views_footer',1); jQuery('#jform_javascript_views_footer').removeAttr('required'); jQuery('#jform_javascript_views_footer').removeAttr('aria-required'); jQuery('#jform_javascript_views_footer').removeClass('required'); - jform_vvvvvzyvzr_required = true; + jform_vvvvwabvzu_required = true; } } } diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js index 192fb5574..d0df6db32 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -23,289 +23,289 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvzzvzu_required = false; -jform_vvvvwaavzv_required = false; -jform_vvvvwabvzw_required = false; jform_vvvvwacvzx_required = false; jform_vvvvwadvzy_required = false; jform_vvvvwaevzz_required = false; +jform_vvvvwafwaa_required = false; +jform_vvvvwagwab_required = false; +jform_vvvvwahwac_required = false; // Initial Script jQuery(document).ready(function() { - var location_vvvvvzz = jQuery("#jform_location input[type='radio']:checked").val(); - vvvvvzz(location_vvvvvzz); + var location_vvvvwac = jQuery("#jform_location input[type='radio']:checked").val(); + vvvvwac(location_vvvvwac); - var location_vvvvwaa = jQuery("#jform_location input[type='radio']:checked").val(); - vvvvwaa(location_vvvvwaa); + var location_vvvvwad = jQuery("#jform_location input[type='radio']:checked").val(); + vvvvwad(location_vvvvwad); - var type_vvvvwab = jQuery("#jform_type").val(); - vvvvwab(type_vvvvwab); + var type_vvvvwae = jQuery("#jform_type").val(); + vvvvwae(type_vvvvwae); - var type_vvvvwac = jQuery("#jform_type").val(); - vvvvwac(type_vvvvwac); + var type_vvvvwaf = jQuery("#jform_type").val(); + vvvvwaf(type_vvvvwaf); - var type_vvvvwad = jQuery("#jform_type").val(); - vvvvwad(type_vvvvwad); + var type_vvvvwag = jQuery("#jform_type").val(); + vvvvwag(type_vvvvwag); - var target_vvvvwae = jQuery("#jform_target input[type='radio']:checked").val(); - vvvvwae(target_vvvvwae); + var target_vvvvwah = jQuery("#jform_target input[type='radio']:checked").val(); + vvvvwah(target_vvvvwah); }); -// the vvvvvzz function -function vvvvvzz(location_vvvvvzz) +// the vvvvwac function +function vvvvwac(location_vvvvwac) { // set the function logic - if (location_vvvvvzz == 1) + if (location_vvvvwac == 1) { jQuery('#jform_admin_view').closest('.control-group').show(); - if (jform_vvvvvzzvzu_required) + if (jform_vvvvwacvzx_required) { updateFieldRequired('admin_view',0); jQuery('#jform_admin_view').prop('required','required'); jQuery('#jform_admin_view').attr('aria-required',true); jQuery('#jform_admin_view').addClass('required'); - jform_vvvvvzzvzu_required = false; - } - - } - else - { - jQuery('#jform_admin_view').closest('.control-group').hide(); - if (!jform_vvvvvzzvzu_required) - { - updateFieldRequired('admin_view',1); - jQuery('#jform_admin_view').removeAttr('required'); - jQuery('#jform_admin_view').removeAttr('aria-required'); - jQuery('#jform_admin_view').removeClass('required'); - jform_vvvvvzzvzu_required = true; - } - } -} - -// the vvvvwaa function -function vvvvwaa(location_vvvvwaa) -{ - // set the function logic - if (location_vvvvwaa == 2) - { - jQuery('#jform_site_view').closest('.control-group').show(); - if (jform_vvvvwaavzv_required) - { - updateFieldRequired('site_view',0); - jQuery('#jform_site_view').prop('required','required'); - jQuery('#jform_site_view').attr('aria-required',true); - jQuery('#jform_site_view').addClass('required'); - jform_vvvvwaavzv_required = false; - } - - } - else - { - jQuery('#jform_site_view').closest('.control-group').hide(); - if (!jform_vvvvwaavzv_required) - { - updateFieldRequired('site_view',1); - jQuery('#jform_site_view').removeAttr('required'); - jQuery('#jform_site_view').removeAttr('aria-required'); - jQuery('#jform_site_view').removeClass('required'); - jform_vvvvwaavzv_required = true; - } - } -} - -// the vvvvwab function -function vvvvwab(type_vvvvwab) -{ - if (isSet(type_vvvvwab) && type_vvvvwab.constructor !== Array) - { - var temp_vvvvwab = type_vvvvwab; - var type_vvvvwab = []; - type_vvvvwab.push(temp_vvvvwab); - } - else if (!isSet(type_vvvvwab)) - { - var type_vvvvwab = []; - } - var type = type_vvvvwab.some(type_vvvvwab_SomeFunc); - - - // set this function logic - if (type) - { - jQuery('#jform_url').closest('.control-group').show(); - if (jform_vvvvwabvzw_required) - { - updateFieldRequired('url',0); - jQuery('#jform_url').prop('required','required'); - jQuery('#jform_url').attr('aria-required',true); - jQuery('#jform_url').addClass('required'); - jform_vvvvwabvzw_required = false; - } - - } - else - { - jQuery('#jform_url').closest('.control-group').hide(); - if (!jform_vvvvwabvzw_required) - { - updateFieldRequired('url',1); - jQuery('#jform_url').removeAttr('required'); - jQuery('#jform_url').removeAttr('aria-required'); - jQuery('#jform_url').removeClass('required'); - jform_vvvvwabvzw_required = true; - } - } -} - -// the vvvvwab Some function -function type_vvvvwab_SomeFunc(type_vvvvwab) -{ - // set the function logic - if (type_vvvvwab == 3) - { - return true; - } - return false; -} - -// the vvvvwac function -function vvvvwac(type_vvvvwac) -{ - if (isSet(type_vvvvwac) && type_vvvvwac.constructor !== Array) - { - var temp_vvvvwac = type_vvvvwac; - var type_vvvvwac = []; - type_vvvvwac.push(temp_vvvvwac); - } - else if (!isSet(type_vvvvwac)) - { - var type_vvvvwac = []; - } - var type = type_vvvvwac.some(type_vvvvwac_SomeFunc); - - - // set this function logic - if (type) - { - jQuery('#jform_article').closest('.control-group').show(); - if (jform_vvvvwacvzx_required) - { - updateFieldRequired('article',0); - jQuery('#jform_article').prop('required','required'); - jQuery('#jform_article').attr('aria-required',true); - jQuery('#jform_article').addClass('required'); jform_vvvvwacvzx_required = false; } } else { - jQuery('#jform_article').closest('.control-group').hide(); + jQuery('#jform_admin_view').closest('.control-group').hide(); if (!jform_vvvvwacvzx_required) { - updateFieldRequired('article',1); - jQuery('#jform_article').removeAttr('required'); - jQuery('#jform_article').removeAttr('aria-required'); - jQuery('#jform_article').removeClass('required'); + updateFieldRequired('admin_view',1); + jQuery('#jform_admin_view').removeAttr('required'); + jQuery('#jform_admin_view').removeAttr('aria-required'); + jQuery('#jform_admin_view').removeClass('required'); jform_vvvvwacvzx_required = true; } } } -// the vvvvwac Some function -function type_vvvvwac_SomeFunc(type_vvvvwac) +// the vvvvwad function +function vvvvwad(location_vvvvwad) { // set the function logic - if (type_vvvvwac == 1) + if (location_vvvvwad == 2) { - return true; - } - return false; -} - -// the vvvvwad function -function vvvvwad(type_vvvvwad) -{ - if (isSet(type_vvvvwad) && type_vvvvwad.constructor !== Array) - { - var temp_vvvvwad = type_vvvvwad; - var type_vvvvwad = []; - type_vvvvwad.push(temp_vvvvwad); - } - else if (!isSet(type_vvvvwad)) - { - var type_vvvvwad = []; - } - var type = type_vvvvwad.some(type_vvvvwad_SomeFunc); - - - // set this function logic - if (type) - { - jQuery('#jform_content-lbl').closest('.control-group').show(); + jQuery('#jform_site_view').closest('.control-group').show(); if (jform_vvvvwadvzy_required) { - updateFieldRequired('content',0); - jQuery('#jform_content').prop('required','required'); - jQuery('#jform_content').attr('aria-required',true); - jQuery('#jform_content').addClass('required'); + updateFieldRequired('site_view',0); + jQuery('#jform_site_view').prop('required','required'); + jQuery('#jform_site_view').attr('aria-required',true); + jQuery('#jform_site_view').addClass('required'); jform_vvvvwadvzy_required = false; } } else { - jQuery('#jform_content-lbl').closest('.control-group').hide(); + jQuery('#jform_site_view').closest('.control-group').hide(); if (!jform_vvvvwadvzy_required) { - updateFieldRequired('content',1); - jQuery('#jform_content').removeAttr('required'); - jQuery('#jform_content').removeAttr('aria-required'); - jQuery('#jform_content').removeClass('required'); + updateFieldRequired('site_view',1); + jQuery('#jform_site_view').removeAttr('required'); + jQuery('#jform_site_view').removeAttr('aria-required'); + jQuery('#jform_site_view').removeClass('required'); jform_vvvvwadvzy_required = true; } } } -// the vvvvwad Some function -function type_vvvvwad_SomeFunc(type_vvvvwad) -{ - // set the function logic - if (type_vvvvwad == 2) - { - return true; - } - return false; -} - // the vvvvwae function -function vvvvwae(target_vvvvwae) +function vvvvwae(type_vvvvwae) { - // set the function logic - if (target_vvvvwae == 1) + if (isSet(type_vvvvwae) && type_vvvvwae.constructor !== Array) { - jQuery('#jform_groups').closest('.control-group').show(); + var temp_vvvvwae = type_vvvvwae; + var type_vvvvwae = []; + type_vvvvwae.push(temp_vvvvwae); + } + else if (!isSet(type_vvvvwae)) + { + var type_vvvvwae = []; + } + var type = type_vvvvwae.some(type_vvvvwae_SomeFunc); + + + // set this function logic + if (type) + { + jQuery('#jform_url').closest('.control-group').show(); if (jform_vvvvwaevzz_required) { - updateFieldRequired('groups',0); - jQuery('#jform_groups').prop('required','required'); - jQuery('#jform_groups').attr('aria-required',true); - jQuery('#jform_groups').addClass('required'); + updateFieldRequired('url',0); + jQuery('#jform_url').prop('required','required'); + jQuery('#jform_url').attr('aria-required',true); + jQuery('#jform_url').addClass('required'); jform_vvvvwaevzz_required = false; } } else { - jQuery('#jform_groups').closest('.control-group').hide(); + jQuery('#jform_url').closest('.control-group').hide(); if (!jform_vvvvwaevzz_required) + { + updateFieldRequired('url',1); + jQuery('#jform_url').removeAttr('required'); + jQuery('#jform_url').removeAttr('aria-required'); + jQuery('#jform_url').removeClass('required'); + jform_vvvvwaevzz_required = true; + } + } +} + +// the vvvvwae Some function +function type_vvvvwae_SomeFunc(type_vvvvwae) +{ + // set the function logic + if (type_vvvvwae == 3) + { + return true; + } + return false; +} + +// the vvvvwaf function +function vvvvwaf(type_vvvvwaf) +{ + if (isSet(type_vvvvwaf) && type_vvvvwaf.constructor !== Array) + { + var temp_vvvvwaf = type_vvvvwaf; + var type_vvvvwaf = []; + type_vvvvwaf.push(temp_vvvvwaf); + } + else if (!isSet(type_vvvvwaf)) + { + var type_vvvvwaf = []; + } + var type = type_vvvvwaf.some(type_vvvvwaf_SomeFunc); + + + // set this function logic + if (type) + { + jQuery('#jform_article').closest('.control-group').show(); + if (jform_vvvvwafwaa_required) + { + updateFieldRequired('article',0); + jQuery('#jform_article').prop('required','required'); + jQuery('#jform_article').attr('aria-required',true); + jQuery('#jform_article').addClass('required'); + jform_vvvvwafwaa_required = false; + } + + } + else + { + jQuery('#jform_article').closest('.control-group').hide(); + if (!jform_vvvvwafwaa_required) + { + updateFieldRequired('article',1); + jQuery('#jform_article').removeAttr('required'); + jQuery('#jform_article').removeAttr('aria-required'); + jQuery('#jform_article').removeClass('required'); + jform_vvvvwafwaa_required = true; + } + } +} + +// the vvvvwaf Some function +function type_vvvvwaf_SomeFunc(type_vvvvwaf) +{ + // set the function logic + if (type_vvvvwaf == 1) + { + return true; + } + return false; +} + +// the vvvvwag function +function vvvvwag(type_vvvvwag) +{ + if (isSet(type_vvvvwag) && type_vvvvwag.constructor !== Array) + { + var temp_vvvvwag = type_vvvvwag; + var type_vvvvwag = []; + type_vvvvwag.push(temp_vvvvwag); + } + else if (!isSet(type_vvvvwag)) + { + var type_vvvvwag = []; + } + var type = type_vvvvwag.some(type_vvvvwag_SomeFunc); + + + // set this function logic + if (type) + { + jQuery('#jform_content-lbl').closest('.control-group').show(); + if (jform_vvvvwagwab_required) + { + updateFieldRequired('content',0); + jQuery('#jform_content').prop('required','required'); + jQuery('#jform_content').attr('aria-required',true); + jQuery('#jform_content').addClass('required'); + jform_vvvvwagwab_required = false; + } + + } + else + { + jQuery('#jform_content-lbl').closest('.control-group').hide(); + if (!jform_vvvvwagwab_required) + { + updateFieldRequired('content',1); + jQuery('#jform_content').removeAttr('required'); + jQuery('#jform_content').removeAttr('aria-required'); + jQuery('#jform_content').removeClass('required'); + jform_vvvvwagwab_required = true; + } + } +} + +// the vvvvwag Some function +function type_vvvvwag_SomeFunc(type_vvvvwag) +{ + // set the function logic + if (type_vvvvwag == 2) + { + return true; + } + return false; +} + +// the vvvvwah function +function vvvvwah(target_vvvvwah) +{ + // set the function logic + if (target_vvvvwah == 1) + { + jQuery('#jform_groups').closest('.control-group').show(); + if (jform_vvvvwahwac_required) + { + updateFieldRequired('groups',0); + jQuery('#jform_groups').prop('required','required'); + jQuery('#jform_groups').attr('aria-required',true); + jQuery('#jform_groups').addClass('required'); + jform_vvvvwahwac_required = false; + } + + } + else + { + jQuery('#jform_groups').closest('.control-group').hide(); + if (!jform_vvvvwahwac_required) { updateFieldRequired('groups',1); jQuery('#jform_groups').removeAttr('required'); jQuery('#jform_groups').removeAttr('aria-required'); jQuery('#jform_groups').removeClass('required'); - jform_vvvvwaevzz_required = true; + jform_vvvvwahwac_required = true; } } } diff --git a/admin/models/import.php b/admin/models/import.php index f67b4ce3c..a106ee06f 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index 2c9fbf8bf..c380d3bd2 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -525,7 +525,9 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_code` ( `from_line` VARCHAR(100) NOT NULL DEFAULT '', `hashendtarget` VARCHAR(64) NOT NULL DEFAULT '', `hashtarget` VARCHAR(64) NOT NULL DEFAULT '', + `not_required` INT(1) NOT NULL DEFAULT '0', `path` TEXT NOT NULL, + `target` TINYINT(1) NOT NULL DEFAULT '0', `to_line` VARCHAR(100) NOT NULL DEFAULT '', `type` TINYINT(1) NOT NULL DEFAULT '0', `params` TEXT NOT NULL, @@ -547,9 +549,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_code` ( KEY `idx_modifiedby` (`modified_by`), KEY `idx_state` (`published`), KEY `idx_component` (`component`), + KEY `idx_target` (`target`), KEY `idx_type` (`type`), - KEY `idx_from_line` (`from_line`), - KEY `idx_to_line` (`to_line`) + KEY `idx_to_line` (`to_line`), + KEY `idx_from_line` (`from_line`) ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__componentbuilder_snippet` ( diff --git a/admin/sql/updates/mysql/2.3.0.sql b/admin/sql/updates/mysql/2.3.0.sql new file mode 100644 index 000000000..553de240d --- /dev/null +++ b/admin/sql/updates/mysql/2.3.0.sql @@ -0,0 +1 @@ +ALTER TABLE `#__componentbuilder_custom_code` ADD `target` TINYINT(1) NOT NULL DEFAULT '0' AFTER `path`; diff --git a/admin/tables/custom_code.php b/admin/tables/custom_code.php index 6621a85a8..8327cceed 100644 --- a/admin/tables/custom_code.php +++ b/admin/tables/custom_code.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC - @build 31st January, 2017 + @version @update number 28 of this MVC + @build 9th February, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_code.php diff --git a/admin/views/compiler/view.html.php b/admin/views/compiler/view.html.php index 63c3a3b31..410541307 100644 --- a/admin/views/compiler/view.html.php +++ b/admin/views/compiler/view.html.php @@ -51,7 +51,7 @@ class ComponentbuilderViewCompiler extends JViewLegacy // Check for errors. if (count($errors = $this->get('Errors'))) { - JError::raiseError(500, implode("\n", $errors)); + JError::raiseError(500, implode(PHP_EOL, $errors)); return false; } if ($this->getLayout() !== 'modal') diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php index 01d572cb3..7d4f5fd91 100644 --- a/admin/views/componentbuilder/tmpl/default.php +++ b/admin/views/componentbuilder/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php index aeba6af6a..8571748de 100644 --- a/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_closed_issues_the_closed_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_main.php b/admin/views/componentbuilder/tmpl/default_main.php index 36ef22e1d..e140309b8 100644 --- a/admin/views/componentbuilder/tmpl/default_main.php +++ b/admin/views/componentbuilder/tmpl/default_main.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_main.php diff --git a/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php index d35f023c6..2904b0d1f 100644 --- a/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_open_issues_the_open_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_readme_information.php b/admin/views/componentbuilder/tmpl/default_readme_information.php index a3571fc90..89b4f57a5 100644 --- a/admin/views/componentbuilder/tmpl/default_readme_information.php +++ b/admin/views/componentbuilder/tmpl/default_readme_information.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_readme_information.php diff --git a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php index b0d2e6af9..e52234999 100644 --- a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php +++ b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_vast_development_method_notice_board.php diff --git a/admin/views/componentbuilder/tmpl/default_vdm.php b/admin/views/componentbuilder/tmpl/default_vdm.php index 9a281c4e4..476de5e37 100644 --- a/admin/views/componentbuilder/tmpl/default_vdm.php +++ b/admin/views/componentbuilder/tmpl/default_vdm.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_vdm.php diff --git a/admin/views/componentbuilder/view.html.php b/admin/views/componentbuilder/view.html.php index 0b59a9a9b..94690ce94 100644 --- a/admin/views/componentbuilder/view.html.php +++ b/admin/views/componentbuilder/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.3.0 - @build 4th February, 2017 + @version 2.3.1 + @build 9th February, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/custom_code/submitbutton.js b/admin/views/custom_code/submitbutton.js index 86ccafa2f..ab1896773 100644 --- a/admin/views/custom_code/submitbutton.js +++ b/admin/views/custom_code/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC - @build 31st January, 2017 + @version @update number 28 of this MVC + @build 9th February, 2017 @created 11th October, 2016 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/custom_code/tmpl/edit.php b/admin/views/custom_code/tmpl/edit.php index ed51e90af..cba9f9b69 100644 --- a/admin/views/custom_code/tmpl/edit.php +++ b/admin/views/custom_code/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC - @build 31st January, 2017 + @version @update number 28 of this MVC + @build 9th February, 2017 @created 11th October, 2016 @package Component Builder @subpackage edit.php @@ -116,25 +116,117 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
-
+
+ +
+ diff --git a/admin/views/custom_code/view.html.php b/admin/views/custom_code/view.html.php index 2b68f2fee..ce88ecfa4 100644 --- a/admin/views/custom_code/view.html.php +++ b/admin/views/custom_code/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC - @build 31st January, 2017 + @version @update number 28 of this MVC + @build 9th February, 2017 @created 11th October, 2016 @package Component Builder @subpackage view.html.php diff --git a/admin/views/custom_codes/tmpl/default.php b/admin/views/custom_codes/tmpl/default.php index b65c3caff..3ede81028 100644 --- a/admin/views/custom_codes/tmpl/default.php +++ b/admin/views/custom_codes/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC - @build 31st January, 2017 + @version @update number 28 of this MVC + @build 9th February, 2017 @created 11th October, 2016 @package Component Builder @subpackage default.php diff --git a/admin/views/custom_codes/tmpl/default_batch_body.php b/admin/views/custom_codes/tmpl/default_batch_body.php index 1b2a727a1..799e6c1e1 100644 --- a/admin/views/custom_codes/tmpl/default_batch_body.php +++ b/admin/views/custom_codes/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC - @build 31st January, 2017 + @version @update number 28 of this MVC + @build 9th February, 2017 @created 11th October, 2016 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/custom_codes/tmpl/default_batch_footer.php b/admin/views/custom_codes/tmpl/default_batch_footer.php index b786fb700..ed00bca46 100644 --- a/admin/views/custom_codes/tmpl/default_batch_footer.php +++ b/admin/views/custom_codes/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC - @build 31st January, 2017 + @version @update number 28 of this MVC + @build 9th February, 2017 @created 11th October, 2016 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/custom_codes/tmpl/default_body.php b/admin/views/custom_codes/tmpl/default_body.php index 600a5f88a..2cf9ccb52 100644 --- a/admin/views/custom_codes/tmpl/default_body.php +++ b/admin/views/custom_codes/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC - @build 31st January, 2017 + @version @update number 28 of this MVC + @build 9th February, 2017 @created 11th October, 2016 @package Component Builder @subpackage default_body.php @@ -89,6 +89,9 @@ $edit = "index.php?option=com_componentbuilder&view=custom_codes&task=custom_cod + diff --git a/admin/views/custom_codes/tmpl/default_foot.php b/admin/views/custom_codes/tmpl/default_foot.php index 47ff032e6..cf4c83281 100644 --- a/admin/views/custom_codes/tmpl/default_foot.php +++ b/admin/views/custom_codes/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC - @build 31st January, 2017 + @version @update number 28 of this MVC + @build 9th February, 2017 @created 11th October, 2016 @package Component Builder @subpackage default_foot.php @@ -28,5 +28,5 @@ defined('_JEXEC') or die('Restricted access'); ?> - + \ No newline at end of file diff --git a/admin/views/custom_codes/tmpl/default_head.php b/admin/views/custom_codes/tmpl/default_head.php index 86db6cd86..546d3e6c5 100644 --- a/admin/views/custom_codes/tmpl/default_head.php +++ b/admin/views/custom_codes/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC - @build 31st January, 2017 + @version @update number 28 of this MVC + @build 9th February, 2017 @created 11th October, 2016 @package Component Builder @subpackage default_head.php @@ -49,6 +49,9 @@ defined('_JEXEC') or die('Restricted access'); + diff --git a/admin/views/custom_codes/tmpl/default_toolbar.php b/admin/views/custom_codes/tmpl/default_toolbar.php index ec9e99d75..d329efa62 100644 --- a/admin/views/custom_codes/tmpl/default_toolbar.php +++ b/admin/views/custom_codes/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC - @build 31st January, 2017 + @version @update number 28 of this MVC + @build 9th February, 2017 @created 11th October, 2016 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/custom_codes/view.html.php b/admin/views/custom_codes/view.html.php index 4d5086985..e15070c31 100644 --- a/admin/views/custom_codes/view.html.php +++ b/admin/views/custom_codes/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC - @build 31st January, 2017 + @version @update number 28 of this MVC + @build 9th February, 2017 @created 11th October, 2016 @package Component Builder @subpackage view.html.php @@ -224,6 +224,28 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy } } + // Set Target Selection + $this->targetOptions = $this->getTheTargetSelections(); + if ($this->targetOptions) + { + // Target Filter + JHtmlSidebar::addFilter( + '- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_LABEL').' -', + 'filter_target', + JHtml::_('select.options', $this->targetOptions, 'value', 'text', $this->state->get('filter.target')) + ); + + if ($this->canBatch && $this->canCreate && $this->canEdit) + { + // Target Batch Selection + JHtmlBatch_::addListSelection( + '- Keep Original '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_LABEL').' -', + 'batch[target]', + JHtml::_('select.options', $this->targetOptions, 'value', 'text') + ); + } + } + // Set Type Selection $this->typeOptions = $this->getTheTypeSelections(); if ($this->typeOptions) @@ -289,11 +311,48 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy 'a.published' => JText::_('JSTATUS'), 'g.system_name' => JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_COMPONENT_LABEL'), 'a.path' => JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_PATH_LABEL'), + 'a.target' => JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_LABEL'), 'a.type' => JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE_LABEL'), 'a.id' => JText::_('JGRID_HEADING_ID') ); } + protected function getTheTargetSelections() + { + // Get a db connection. + $db = JFactory::getDbo(); + + // Create a new query object. + $query = $db->getQuery(true); + + // Select the text. + $query->select($db->quoteName('target')); + $query->from($db->quoteName('#__componentbuilder_custom_code')); + $query->order($db->quoteName('target') . ' ASC'); + + // Reset the query using our newly populated query object. + $db->setQuery($query); + + $results = $db->loadColumn(); + + if ($results) + { + // get model + $model = $this->getModel(); + $results = array_unique($results); + $filter = array(); + foreach ($results as $target) + { + // Translate the target selection + $text = $model->selectionTranslation($target,'target'); + // Now add the target and its text to the options array + $filter[] = JHtml::_('select.option', $target, JText::_($text)); + } + return $filter; + } + return false; + } + protected function getTheTypeSelections() { // Get a db connection. diff --git a/admin/views/field/tmpl/edit.php b/admin/views/field/tmpl/edit.php index 21b8d5f7d..3d0cb15b1 100644 --- a/admin/views/field/tmpl/edit.php +++ b/admin/views/field/tmpl/edit.php @@ -125,157 +125,157 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
'; - $head .= "\n\t\t\t"; - $head .= "\n\t\t'; - $head .= "\n\t\t\t"; - $head .= "\n\t\t
'; + $head .= PHP_EOL."\t\t\t"; + $head .= PHP_EOL."\t\t'; + $head .= PHP_EOL."\t\t\t"; + $head .= PHP_EOL."\t\t
escape($item->path); ?> + target); ?> + type); ?>
pagination->getListFooter(); ?>pagination->getListFooter(); ?>
listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?>