Skip to content

Commit

Permalink
Updating copyright year. Added get/setPlugin() method to element JS, to
Browse files Browse the repository at this point in the history 
sort out issues with extended element classes.  Fixed join suboption
types so jLayouts are per-element (otherwise second or subsequent
instance of element overwrites jLayout).
  • Loading branch information
@cheesegrits
cheesegrits committed Jan 3, 2016
1 parent 6ea4b40 commit 1f4ceb1
Show file tree
Hide file tree
Showing 214 changed files with 524 additions and 501 deletions.
4 changes: 2 additions & 2 deletions administrator/components/com_fabrik/fabrik.xml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<extension client="site" method="upgrade" type="component" version="3">
<name>com_fabrik</name>
<creationDate>December 2015</creationDate>
<creationDate>January 2016</creationDate>
<author>Rob Clayburn</author>
<copyright>Copyright (C) 2005-2015 fabrikar.com - All rights reserved.</copyright>
<copyright>Copyright (C) 2005-2016 fabrikar.com - All rights reserved.</copyright>
<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.pollen-8.co.uk</authorUrl>
Expand Down
5 changes: 3 additions & 2 deletions administrator/components/com_fabrik/pkg_fabrik.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<packagename>fabrik</packagename>
<version>3.4</version>
<url>http://www.fabrikar.com</url>
<creationDate>December 2015</creationDate>
<copyright>Copyright (C) 2005-2015 fabrikar.com - All rights reserved.</copyright>
<creationDate>January 2016</creationDate>
<copyright>Copyright (C) 2005-2016 fabrikar.com - All rights reserved.</copyright>
<author>Fabrik</author>
<packager>Rob Clayburn</packager>
<packagerurl>http://www.fabrikar.com</packagerurl>
Expand All @@ -21,6 +21,7 @@
<file client="site" id="mod_fabrik_list" type="module">mod_fabrik_list_{version}.zip</file>

<file group="system" id="fabrik" type="plugin">plg_fabrik_system_{version}.zip</file>
<file group="system" id="fabrikcron" type="plugin">plg_fabrik_schedule_{version}.zip</file>

<file group="content" id="fabrik" type="plugin">plg_fabrik_content_{version}.zip</file>

Expand Down
186 changes: 93 additions & 93 deletions administrator/components/com_fabrik/pkg_fabrik_sink.xml
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions administrator/modules/mod_fabrik_form/mod_fabrik_form.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension client="administrator" method="upgrade" type="module" version="3">
<name>mod_fabrik_form</name>
<author>Rob Clayburn</author>
<creationDate>December 2015</creationDate>
<copyright>Copyright (C) 2005-2015 fabrikar.com - All rights reserved.</copyright>
<creationDate>January 2016</creationDate>
<copyright>Copyright (C) 2005-2016 fabrikar.com - All rights reserved.</copyright>
<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.fabrikar.com</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions administrator/modules/mod_fabrik_list/mod_fabrik_list.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension client="administrator" method="upgrade" type="module" version="3">
<name>mod_fabrik_list</name>
<author>Rob Clayburn</author>
<creationDate>December 2015</creationDate>
<copyright>Copyright (C) 2005-2015 fabrikar.com - All rights reserved.</copyright>
<creationDate>January 2016</creationDate>
<copyright>Copyright (C) 2005-2016 fabrikar.com - All rights reserved.</copyright>
<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.fabrikar.com</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions administrator/modules/mod_fabrik_quickicon/mod_fabrik_quickicon.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension type="module" version="3" client="administrator">
<name>mod_fabrik_quickicon</name>
<author>Fabrik</author>
<creationDate>December 2015</creationDate>
<copyright>Copyright (C) 2005-2015 fabrikar.com - All rights reserved.</copyright>
<creationDate>January 2016</creationDate>
<copyright>Copyright (C) 2005-2016 fabrikar.com - All rights reserved.</copyright>
<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.fabrikar.com</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions administrator/modules/mod_fabrik_visualization/mod_fabrik_visualization.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension client="administrator" method="upgrade" type="module" version="3">
<name>Fabrik Visualization</name>
<author>Rob Clayburn</author>
<creationDate>December 2015</creationDate>
<copyright>Copyright (C) 2005-2015 fabrikar.com - All rights reserved.</copyright>
<creationDate>January 2016</creationDate>
<copyright>Copyright (C) 2005-2016 fabrikar.com - All rights reserved.</copyright>
<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.fabrikar.com</authorUrl>
Expand Down
2 changes: 1 addition & 1 deletion components/com_fabrik/helpers/html.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1034,7 +1034,7 @@ public static function iniRequireJs($shim = array())
}
}

if (array_key_exists($k, $newShim))
if (is_array($newShim) && array_key_exists($k, $newShim))
{
$s->deps = array_merge($s->deps, $newShim[$k]->deps);
}
Expand Down
1 change: 1 addition & 0 deletions fabrik_build/build-config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ module.exports = {
'mod_fabrik_form_{version}.zip',
'mod_fabrik_list_{version}.zip',
'plg_fabrik_system_{version}.zip',
'plg_fabrik_schedule_{version}.zip',
'plg_fabrik_content_{version}.zip',
'plg_fabrik_cron_email_{version}.zip',
'plg_fabrik_cron_php_{version}.zip',
Expand Down
2 changes: 1 addition & 1 deletion media/com_fabrik/js/element-min.js
View file

Large diffs are not rendered by default.

12 changes: 11 additions & 1 deletion media/com_fabrik/js/element.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ var FbElement = new Class({
*/

initialize: function (element, options) {
this.plugin = '';
this.setPlugin('');
options.element = element;
this.strElement = element;
this.loadEvents = []; // need to store these for use if the form is reset
Expand All @@ -53,6 +53,16 @@ var FbElement = new Class({

},

setPlugin: function(plugin) {
if (typeOf(this.plugin) === 'null' || this.plugin === '') {
this.plugin = plugin;
}
},

getPlugin: function() {
return this.plugin;
},

setElement: function () {
if (document.id(this.options.element)) {
this.element = document.id(this.options.element);
Expand Down
4 changes: 2 additions & 2 deletions modules/mod_fabrik_form/mod_fabrik_form.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension client="site" method="upgrade" type="module" version="3">
<name>mod_fabrik_form</name>
<author>Rob Clayburn</author>
<creationDate>December 2015</creationDate>
<copyright>Copyright (C) 2005-2015 fabrikar.com - All rights reserved.</copyright>
<creationDate>January 2016</creationDate>
<copyright>Copyright (C) 2005-2016 fabrikar.com - All rights reserved.</copyright>
<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.fabrikar.com</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions modules/mod_fabrik_list/mod_fabrik_list.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension client="site" method="upgrade" type="module" version="3">
<name>mod_fabrik_list</name>
<author>Rob Clayburn</author>
<creationDate>December 2015</creationDate>
<copyright>Copyright (C) 2005-2015 fabrikar.com - All rights reserved.</copyright>
<creationDate>January 2016</creationDate>
<copyright>Copyright (C) 2005-2016 fabrikar.com - All rights reserved.</copyright>
<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.fabrikar.com</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions plugins/community/fabrik/fabrik.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension version="3" type="plugin" group="community" method="upgrade">
<name>Fabrik for JomSocial</name>
<author>Hugh Messenger</author>
<creationDate>December 2015</creationDate>
<copyright>Copyright (C) 2005-2015 fabrikar.com - All rights reserved.</copyright>
<creationDate>January 2016</creationDate>
<copyright>Copyright (C) 2005-2016 fabrikar.com - All rights reserved.</copyright>
<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>fabrikar.com</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions plugins/content/fabrik/fabrik.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension group="content" method="upgrade" type="plugin" version="3">
<name>plg_fabrik</name>
<author>Pollen 8 Design Ltd</author>
<creationDate>December 2015</creationDate>
<copyright>Copyright (C) 2005-2015 fabrikar.com - All rights reserved.</copyright>
<creationDate>January 2016</creationDate>
<copyright>Copyright (C) 2005-2016 fabrikar.com - All rights reserved.</copyright>
<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.fabrikar.com</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions plugins/fabrik_cron/email/email.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension group="fabrik_cron" method="upgrade" type="plugin" version="3">
<name>plg_fabrik_cron_email</name>
<author>Rob Clayburn</author>
<creationDate>December 2015</creationDate>
<copyright>Copyright (C) 2005-2015 fabrikar.com - All rights reserved.</copyright>
<creationDate>January 2016</creationDate>
<copyright>Copyright (C) 2005-2016 fabrikar.com - All rights reserved.</copyright>
<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.fabrikar.com</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions plugins/fabrik_cron/gcalsync/gcalsync.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension group="fabrik_cron" method="upgrade" type="plugin" version="3">
<name>plg_fabrik_cron_gcalsync</name>
<author>Hugh Messenger</author>
<creationDate>December 2015</creationDate>
<copyright>Copyright (C) 2005-2015 fabrikar.com - All rights reserved.</copyright>
<creationDate>January 2016</creationDate>
<copyright>Copyright (C) 2005-2016 fabrikar.com - All rights reserved.</copyright>
<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.fabrikar.com</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions plugins/fabrik_cron/geocode/geocode.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension group="fabrik_cron" method="upgrade" type="plugin" version="3">
<name>plg_fabrik_cron_geocode</name>
<author>Hugh Messenger</author>
<creationDate>December 2015</creationDate>
<copyright>Copyright (C) 2005-2015 fabrikar.com - All rights reserved.</copyright>
<creationDate>January 2016</creationDate>
<copyright>Copyright (C) 2005-2016 fabrikar.com - All rights reserved.</copyright>
<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.fabrikar.com</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions plugins/fabrik_cron/gmail/gmail.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension group="fabrik_cron" method="upgrade" type="plugin" version="3">
<name>plg_fabrik_cron_gmail</name>
<author>Rob Clayburn</author>
<creationDate>December 2015</creationDate>
<copyright>Copyright (C) 2005-2015 fabrikar.com - All rights reserved.</copyright>
<creationDate>January 2016</creationDate>
<copyright>Copyright (C) 2005-2016 fabrikar.com - All rights reserved.</copyright>
<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.fabrikar.com</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions plugins/fabrik_cron/importcsv/importcsv.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension group="fabrik_cron" method="upgrade" type="plugin" version="3">
<name>plg_cron_importcsv</name>
<author>Mike Griggs</author>
<creationDate>December 2015</creationDate>
<copyright>Copyright (C) 2005-2015 fabrikar.com - All rights reserved.</copyright>
<creationDate>January 2016</creationDate>
<copyright>Copyright (C) 2005-2016 fabrikar.com - All rights reserved.</copyright>
<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.fabrikar.com</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions plugins/fabrik_cron/notification/notification.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension group="fabrik_cron" method="upgrade" type="plugin" version="3">
<name>plg_fabrik_cron_notifications</name>
<author>Rob Clayburn</author>
<creationDate>December 2015</creationDate>
<copyright>Copyright (C) 2005-2015 fabrikar.com - All rights reserved.</copyright>
<creationDate>January 2016</creationDate>
<copyright>Copyright (C) 2005-2016 fabrikar.com - All rights reserved.</copyright>
<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.fabrikar.com</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions plugins/fabrik_cron/php/php.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension group="fabrik_cron" method="upgrade" type="plugin" version="3">
<name>plg_fabrik_cron_php</name>
<author>Rob Clayburn</author>
<creationDate>December 2015</creationDate>
<copyright>Copyright (C) 2005-2015 fabrikar.com - All rights reserved.</copyright>
<creationDate>January 2016</creationDate>
<copyright>Copyright (C) 2005-2016 fabrikar.com - All rights reserved.</copyright>
<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.fabrikar.com</authorUrl>
Expand Down
2 changes: 1 addition & 1 deletion plugins/fabrik_element/access/access-min.js
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/*! Fabrik */
var FbAccess=new Class({Extends:FbElement,initialize:function(a,b){this.plugin="fabrikaccess",this.parent(a,b)}});
var FbAccess=new Class({Extends:FbElement,initialize:function(a,b){this.setPlugin("fabrikaccess"),this.parent(a,b)}});
2 changes: 1 addition & 1 deletion plugins/fabrik_element/access/access.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ var FbAccess = new Class({
Extends: FbElement,

initialize: function (element, options) {
this.plugin = 'fabrikaccess';
this.setPlugin('fabrikaccess');
this.parent(element, options);
}
});
4 changes: 2 additions & 2 deletions plugins/fabrik_element/access/access.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension group="fabrik_element" method="upgrade" type="plugin" version="3">
<name>plg_fabrik_element_access</name>
<author>Rob Clayburn</author>
<creationDate>December 2015</creationDate>
<copyright>Copyright (C) 2005-2015 fabrikar.com - All rights reserved.</copyright>
<creationDate>January 2016</creationDate>
<copyright>Copyright (C) 2005-2016 fabrikar.com - All rights reserved.</copyright>
<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.fabrikar.com</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions plugins/fabrik_element/attending/attending.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension group="fabrik_element" method="upgrade" type="plugin" version="3">
<name>plg_fabrik_element_attending</name>
<author>Rob Clayburn</author>
<creationDate>December 2015</creationDate>
<copyright>Copyright (C) 2005-2015 fabrikar.com - All rights reserved.</copyright>
<creationDate>January 2016</creationDate>
<copyright>Copyright (C) 2005-2016 fabrikar.com - All rights reserved.</copyright>
<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.fabrikar.com</authorUrl>
Expand Down
2 changes: 1 addition & 1 deletion plugins/fabrik_element/birthday/birthday-min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion plugins/fabrik_element/birthday/birthday.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
var FbBirthday = new Class({
Extends: FbElement,
initialize: function (element, options) {
this.plugin = 'birthday';
this.setPlugin('birthday');
this.default_sepchar = '-';
this.parent(element, options);
},
Expand Down
4 changes: 2 additions & 2 deletions plugins/fabrik_element/birthday/birthday.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension group="fabrik_element" method="upgrade" type="plugin" version="3">
<name>plg_fabrik_element_birthday</name>
<author>Rob Clayburn</author>
<creationDate>December 2015</creationDate>
<copyright>Copyright (C) 2005-2015 fabrikar.com - All rights reserved.</copyright>
<creationDate>January 2016</creationDate>
<copyright>Copyright (C) 2005-2016 fabrikar.com - All rights reserved.</copyright>
<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.fabrikar.com</authorUrl>
Expand Down
2 changes: 1 addition & 1 deletion plugins/fabrik_element/button/button-min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion plugins/fabrik_element/button/button.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
var FbButton = new Class({
Extends: FbElement,
initialize: function (element, options) {
this.plugin = 'fabrikButton';
this.setPlugin('fabrikButton');
this.parent(element, options);
},

Expand Down
4 changes: 2 additions & 2 deletions plugins/fabrik_element/button/button.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension group="fabrik_element" method="upgrade" type="plugin" version="3">
<name>plg_fabrik_element_button</name>
<author>Rob Clayburn</author>
<creationDate>December 2015</creationDate>
<copyright>Copyright (C) 2005-2015 fabrikar.com - All rights reserved.</copyright>
<creationDate>January 2016</creationDate>
<copyright>Copyright (C) 2005-2016 fabrikar.com - All rights reserved.</copyright>
<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.fabrikar.com</authorUrl>
Expand Down
Loading

0 comments on commit 1f4ceb1

Please sign in to comment.