From c0f68bc00d0756fe74cd8c90cdc6c2bb659301ea Mon Sep 17 00:00:00 2001 From: Phill Price Date: Sat, 15 Nov 2014 19:53:14 +0000 Subject: [PATCH] Allow blocking bootstrap_forms from the _config --- _config/config.yml | 1 + code/BootstrapForm.php | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/_config/config.yml b/_config/config.yml index d0a7efc..49ddec8 100644 --- a/_config/config.yml +++ b/_config/config.yml @@ -3,6 +3,7 @@ name: BootstrapForm BootstrapForm: bootstrap_included: false jquery_included: false + bootstrap_form_included: false inline_fields: - CheckboxField - FormAction diff --git a/code/BootstrapForm.php b/code/BootstrapForm.php index 11f6589..9a9185e 100755 --- a/code/BootstrapForm.php +++ b/code/BootstrapForm.php @@ -11,7 +11,7 @@ * @package boostrap_forms */ class BootstrapForm extends Form { - + @@ -55,6 +55,17 @@ public static function set_jquery_included($bool = true) { } + /** + * Sets form to disable/enable inclusion of bootstrap forms js + * + * @deprecated In 3.1 + * @param bool $bool + */ + public static function set_bootstrap_form_included($bool = true) { + Config::inst()->update("BootstrapForm", "bootstrap_form_included", $bool); + } + + /** * Changes the templates of all the {@link FormField} * objects in a given {@link FieldList} object to those @@ -140,7 +151,9 @@ public function forTemplate() { if(!$this->stat('jquery_included')) { Requirements::javascript(THIRDPARTY_DIR."/jquery/jquery.js"); } - Requirements::javascript(BOOTSTRAP_FORMS_DIR."/javascript/bootstrap_forms.js"); + if(!$this->stat('bootstrap_form_included')) { + Requirements::javascript(BOOTSTRAP_FORMS_DIR."/javascript/bootstrap_forms.js"); + } $this->addExtraClass("form-{$this->formLayout}"); $this->applyBootstrap(); return parent::forTemplate();