From b3cd28ee14ab87e232e341be0f64ef225c2e06a8 Mon Sep 17 00:00:00 2001 From: Mats Mikkel Rummelhoff Date: Wed, 6 Jul 2016 14:36:53 +0200 Subject: [PATCH] Adds support for Solspace Calendar, and relational fieldtypes as toggle fields. Bump to 1.0.5 --- README.md | 47 +++++++++--- reasons/ReasonsPlugin.php | 64 +++++++++++----- .../reasons-6124c2e40a6cb71616a5.js | 1 - .../reasons-6738d5f6a670e6e80807.js | 8 ++ reasons/resources/rev-manifest.json | 4 +- ...-a008e38a64.css => reasons-2b40a218fb.css} | 0 releases.json | 12 +++ source/javascripts/modules/builder.js | 27 +++++-- source/javascripts/modules/render.js | 76 ++++++++++++++++--- source/javascripts/reasons.js | 43 +++++++++-- 10 files changed, 224 insertions(+), 58 deletions(-) delete mode 100644 reasons/resources/javascripts/reasons-6124c2e40a6cb71616a5.js create mode 100644 reasons/resources/javascripts/reasons-6738d5f6a670e6e80807.js rename reasons/resources/stylesheets/{reasons-a008e38a64.css => reasons-2b40a218fb.css} (100%) diff --git a/README.md b/README.md index 70308c6..ac2e3dc 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Reasons v. 1.0.4 for Craft CMS ![Craft 2.5](https://img.shields.io/badge/craft-2.5-red.svg?style=flat-square) +# Reasons v. 1.0.5 for Craft CMS ![Craft 2.5](https://img.shields.io/badge/craft-2.5-red.svg?style=flat-square) _Supercharge your field layouts with conditionals._ @@ -9,10 +9,8 @@ Inspired by Advanced Custom Fields for WordPress, Reasons adds simple conditiona _Big props to [Benjamin Fleming](https://github.com/benjamminf) for some good ideas that I stole, and helpful chatting on Slack. Thanks!_ ## Recent updates -* Support for all native element types (Entries, Assets, Categories, Tags, Users and Global Sets) -* Support for [Tag Manager](https://github.com/boboldehampsink/tagmanager) -* Support for all native element editor modals -* Support for Live Preview +* Support for all native relational fields (Entries, Assets, Categories, Tags and Users) as toggle fields +* Support for Solspace Calendar ## Requirements @@ -24,8 +22,6 @@ _Big props to [Benjamin Fleming](https://github.com/benjamminf) for some good id * Move the `/reasons` folder to your `/craft/plugins` folder * Install from the Control Panel (`/admin/settings/plugins`) -**Important: Reasons requires Craft 2.5+.** Need Craft 2.4 or 2.3 support? Check out the [legacy branch](https://github.com/mmikkel/Reasons-Craft/tree/legacy). - ## Usage and common questions ![Setting up conditionals using the built-in field layout designer](http://g.recordit.co/R7Ti1xpL9Q.gif) @@ -36,9 +32,9 @@ Note that for element sources that support tabbed field layouts, Reasons is desi ### What's a toggle field? -A _toggle field_ in Reasons is a field that can be used to "toggle" another field (the _target field_) on or off (show or hide, as it were). This works by comparing the value of the toggle field declared inside the Field Layout Designer, to the current value of that same field when the content is edited. +A _toggle field_ in Reasons is a field that can be used to "toggle" another field (the _target field_) on or off (show or hide, as it were). -The following FieldTypes can be used as toggle fields: +The following stock FieldTypes can be used as toggle fields: * Lightswitch * Dropdown @@ -48,12 +44,31 @@ The following FieldTypes can be used as toggle fields: * Number * Position Select * Plain Text +* Entries +* Categories +* Tags +* Assets +* Users + +The following custom FieldTypes are also supported: + +* Solspace Events + +### Where does it work? -All FieldTypes (even custom ones) can be target fields. +Reasons currently works for -### Does Reasons work inside Matrix fields? +* Entries +* Categories +* Tags +* Assets +* Users +* Tag Manager +* Solspace Calendar Events -Nope, not yet. Work is underway for Matrix block type support, but it's pretty difficult and there's no ETA, unfortunately. +Reasons also works in Live Preview and Element Editor modals. + +Unfortunately, Reasons does _not_ work inside Matrix blocks. Matrix support is hopefully coming in the future. ### A note on required fields @@ -94,6 +109,14 @@ Please report any bugs, feature requests or other issues [here](https://github.c ### Changelog +#### 1.0.5 (07.06.2016) + +* [Added] Support for Entries, Assets, Tags, Users and Categories fieldtypes as toggle fields +* [Added] Support for Solspace Calendar Events fieldtype as toggle fields +* [Added] Full support for Solspace Calendar +* [Improved] Reasons will no longer cache conditionals if devMode is enabled +* [Improved] Hidden fields are no longer tabbable/focusable + #### 1.0.4 (05.25.2016) * [Fixed] Fixes a rare issue where Reasons would hide fields inside Matrix blocks diff --git a/reasons/ReasonsPlugin.php b/reasons/ReasonsPlugin.php index 82109b6..e8361bf 100644 --- a/reasons/ReasonsPlugin.php +++ b/reasons/ReasonsPlugin.php @@ -18,16 +18,16 @@ class ReasonsPlugin extends BasePlugin { - protected $_version = '1.0.4', - $_schemaVersion = '1.1', - $_developer = 'Mats Mikkel Rummelhoff', - $_developerUrl = 'http://mmikkel.no', - $_pluginName = 'Reasons', - $_pluginUrl = 'https://github.com/mmikkel/Reasons-Craft', - $_releaseFeedUrl = 'https://raw.githubusercontent.com/mmikkel/Reasons-Craft/master/releases.json', - $_documentationUrl = 'https://github.com/mmikkel/Reasons-Craft/blob/master/README.md', - $_description = 'Adds conditionals to field layouts.', - $_minVersion = '2.5'; + protected $_version = '1.0.5'; + protected $_schemaVersion = '1.1'; + protected $_developer = 'Mats Mikkel Rummelhoff'; + protected $_developerUrl = 'http://mmikkel.no'; + protected $_pluginName = 'Reasons'; + protected $_pluginUrl = 'https://github.com/mmikkel/Reasons-Craft'; + protected $_releaseFeedUrl = 'https://raw.githubusercontent.com/mmikkel/Reasons-Craft/master/releases.json'; + protected $_documentationUrl = 'https://github.com/mmikkel/Reasons-Craft/blob/master/README.md'; + protected $_description = 'Adds conditionals to field layouts.'; + protected $_minVersion = '2.5'; /** * @return string @@ -162,7 +162,7 @@ public function init() $this->includeResources(); craft()->templates->includeJs('if (window.Craft && window.Craft.ReasonsPlugin) { - Craft.ReasonsPlugin.init(' . $this->getData() . '); + Craft.ReasonsPlugin.init('.$this->getData().'); }'); craft()->on('fields.saveFieldLayout', array($this, 'onSaveFieldLayout')); @@ -268,14 +268,19 @@ protected function includeResources() */ protected function getData() { - if (!$data = craft()->fileCache->get($this->getCacheKey())) { + $doCacheData = !craft()->config->get('devMode'); + $cacheKey = $this->getCacheKey(); + $data = $doCacheData ? craft()->fileCache->get($cacheKey) : null; + if (!$data) { $data = array( 'conditionals' => $this->getConditionals(), 'toggleFieldTypes' => $this->getToggleFieldTypes(), 'toggleFields' => $this->getToggleFields(), 'fieldIds' => $this->getFieldIds(), ); - craft()->fileCache->set($this->getCacheKey(), $data, 1800); // Cache for 30 minutes + if ($doCacheData) { + craft()->fileCache->set($this->getCacheKey(), $data, 1800); // Cache for 30 minutes + } } return json_encode($data); } @@ -323,14 +328,14 @@ protected function getConditionals() $sources['globalSet:' . $globalSet->id] = $globalSet->fieldLayoutId; } - // Matrix blocks - $matrixBlockTypeRecords = MatrixBlockTypeRecord::model()->findAll(); - if ($matrixBlockTypeRecords) { - foreach ($matrixBlockTypeRecords as $matrixBlockTypeRecord) { - $matrixBlockType = MatrixBlockTypeModel::populateModel($matrixBlockTypeRecord); - $sources['matrixBlockType:' . $matrixBlockType->id] = $matrixBlockType->fieldLayoutId; - } - } + // Matrix blocks – TODO + // $matrixBlockTypeRecords = MatrixBlockTypeRecord::model()->findAll(); + // if ($matrixBlockTypeRecords) { + // foreach ($matrixBlockTypeRecords as $matrixBlockTypeRecord) { + // $matrixBlockType = MatrixBlockTypeModel::populateModel($matrixBlockTypeRecord); + // $sources['matrixBlockType:' . $matrixBlockType->id] = $matrixBlockType->fieldLayoutId; + // } + // } // Users $usersFieldLayout = craft()->fields->getLayoutByType(ElementType::User); @@ -338,6 +343,15 @@ protected function getConditionals() $sources['users'] = $usersFieldLayout->id; } + // Solspace Calendar + $solspaceCalendarPlugin = craft()->plugins->getPlugin('calendar'); + if ($solspaceCalendarPlugin && $solspaceCalendarPlugin->getDeveloper() === 'Solspace') { + $solspaceCalendarFieldLayout = craft()->fields->getLayoutByType('Calendar_Event'); + if ($solspaceCalendarFieldLayout) { + $sources['solspaceCalendar'] = $solspaceCalendarFieldLayout->id; + } + } + // Get all conditionals $conditionals = array(); $conditionalsRecords = Reasons_ConditionalsRecord::model()->findAll(); @@ -367,6 +381,7 @@ protected function getConditionals() protected function getToggleFieldTypes() { return array( + // Stock FieldTypes 'Lightswitch', 'Dropdown', 'Checkboxes', @@ -375,6 +390,13 @@ protected function getToggleFieldTypes() 'Number', 'PositionSelect', 'PlainText', + 'Entries', + 'Categories', + 'Tags', + 'Assets', + 'Users', + // Custom FieldTypes + 'Calendar_Event', ); } diff --git a/reasons/resources/javascripts/reasons-6124c2e40a6cb71616a5.js b/reasons/resources/javascripts/reasons-6124c2e40a6cb71616a5.js deleted file mode 100644 index a6ba65e..0000000 --- a/reasons/resources/javascripts/reasons-6124c2e40a6cb71616a5.js +++ /dev/null @@ -1 +0,0 @@ -!function(e){function t(s){if(i[s])return i[s].exports;var n=i[s]={exports:{},id:s,loaded:!1};return e[s].call(n.exports,n,n.exports,t),n.loaded=!0,n.exports}var i={};return t.m=e,t.c=i,t.p="javascripts/",t(0)}([function(e,t,i){e.exports=i(1)},function(e,t,i){"use strict";!function(e){return e.Craft?void(Craft.ReasonsPlugin={FieldLayoutDesigner:i(2),ConditionalsRenderer:i(4),ASSET_SOURCE_HANDLE:"assetSource",CATEGORY_GROUP_HANDLE:"categoryGroup",TAG_GROUP_HANDLE:"tagGroup",GLOBAL_SET_HANDLE:"globalSet",ENTRY_TYPE_HANDLE:"entryType",SECTION_HANDLE:"section",USERS_HANDLE:"users",FIELDS_HANDLE:"field",ASSET_SOURCE_ACTION:"assetSources/saveSource",CATEGORY_ACTION:"categories/saveCategory",CATEGORY_GROUP_ACTION:"categories/saveGroup",TAG_ACTION:"tagManager/saveTag",TAG_GROUP_ACTION:"tags/saveTagGroup",GLOBAL_SET_CONTENT_ACTION:"globals/saveContent",GLOBAL_SET_ACTION:"globals/saveSet",ENTRY_ACTION:"entries/saveEntry",ENTRY_TYPE_ACTION:"sections/saveEntryType",USERS_ACTION:"users/saveUser",USERS_FIELDS_ACTION:"users/saveFieldLayout",FIELDS_ACTION:"fields/saveField",RENDER_CONTEXT:"render",LAYOUT_DESIGNER_CONTEXT:"fld",FIELD_DESIGNER_CONTEXT:"field",init:function(e){this.data=e,this.initPrimaryForm()},initPrimaryForm:function(){this.destroyPrimaryForm(),Craft.cp.$primaryForm&&(this.primaryForm=this.initForm(Craft.cp.$primaryForm))},destroyPrimaryForm:function(){this.primaryForm&&(this.primaryForm.destroy(),delete this.primaryForm)},initElementEditor:function(e){var t=this.getConditionals(e);if(!t)return!1;var i=(new Date).getTime(),s=$.proxy(function(){var e=(new Date).getTime(),n=$(".elementeditor:last"),a=n.length>0?n.closest(".hud"):!1,r=a&&a.length>0?a.data("elementEditor"):!1,o=r?r.$form:!1;o?(r._reasonsForm=new this.ConditionalsRenderer(o,t),r.hud.on("hide",$.proxy(this.destroyElementEditorForm,this,r))):2e3>e-i&&Garnish.requestAnimationFrame(s)},this);s()},destroyElementEditorForm:function(e){var t=e._reasonsForm||null;t&&(t.destroy(),delete e._reasonsForm)},initForm:function(e){var t=this.getElementSourceFromForm(e),i=t?this.getFormContext(e):!1;if(!t||!i)return!1;var s=t.type+(t.id?":"+t.id:""),n=this.getConditionals(s);switch(i){case this.LAYOUT_DESIGNER_CONTEXT:return new this.FieldLayoutDesigner(e,n);case this.FIELD_DESIGNER_CONTEXT:return null;case this.RENDER_CONTEXT:return n?new this.ConditionalsRenderer(e,n):null}return null},getConditionals:function(e){return e?this.data.conditionals&&this.data.conditionals.hasOwnProperty(e)?this.data.conditionals[e]:null:this.data.conditionals||{}},getToggleFields:function(){return this.data.toggleFields?this.data.toggleFields:[]},getToggleFieldById:function(e){e=parseInt(e);for(var t=this.getToggleFields(),i=t.length,s=0;i>s;++s)if(parseInt(t[s].id)===e)return t[s];return!1},getFieldIds:function(){return this.data.fieldIds?this.data.fieldIds:{}},getFieldIdByHandle:function(e){var t=this.getFieldIds();return t&&t.hasOwnProperty(e)?t[e]:!1},getToggleFieldTypes:function(){return this.data.toggleFieldTypes?this.data.toggleFieldTypes:[]},getElementSourceFromForm:function(e){if(e.data("elementEditor"))return!1;var t=e.find('input[type="hidden"][name="namespace"]').val();t&&(t+="-");var i,s,n=e.find('input[type="hidden"][name="action"]').val();switch(n){case this.ASSET_SOURCE_ACTION:i=this.ASSET_SOURCE_HANDLE,s='input[type="hidden"][name="sourceId"]';break;case this.CATEGORY_ACTION:case this.CATEGORY_GROUP_ACTION:i=this.CATEGORY_GROUP_HANDLE,s='input[type="hidden"][name="groupId"]';break;case this.GLOBAL_SET_CONTENT_ACTION:case this.GLOBAL_SET_ACTION:i=this.GLOBAL_SET_HANDLE,s='input[type="hidden"][name="setId"]';break;case this.ENTRY_ACTION:var a=e.find('select#entryType, input[type="hidden"][name="entryTypeId"], input[type="hidden"][name="typeId"], #'+t+"entryType");i=a.length?this.ENTRY_TYPE_HANDLE:this.SECTION_HANDLE,s=a.length?'select#entryType, input[type="hidden"][name="entryTypeId"], input[type="hidden"][name="typeId"], #'+t+"entryType":'input[type="hidden"][name="sectionId"], #'+t+"section";break;case this.ENTRY_TYPE_ACTION:i=this.ENTRY_TYPE_HANDLE,s='input[type="hidden"][name="entryTypeId"]';break;case this.TAG_ACTION:case this.TAG_GROUP_ACTION:i=this.TAG_GROUP_HANDLE,s='input[type="hidden"][name="tagGroupId"], input[type="hidden"][name="groupId"]';break;case this.USERS_ACTION:case this.USERS_FIELDS_ACTION:i=this.USERS_HANDLE;break;case this.FIELDS_ACTION:i=this.FIELDS_HANDLE,s='input[type="hidden"][name="fieldId"]'}return i?{type:i,id:s?0|e.find(s).val():!1}:!1},getFormContext:function(e){if(e.data("elementEditor"))return!1;var t=e.find('input[type="hidden"][name="action"]').val();switch(t){case this.GLOBAL_SET_CONTENT_ACTION:case this.ENTRY_ACTION:case this.TAG_ACTION:case this.CATEGORY_ACTION:case this.USERS_ACTION:return this.RENDER_CONTEXT;case this.ASSET_SOURCE_ACTION:case this.CATEGORY_GROUP_ACTION:case this.GLOBAL_SET_ACTION:case this.ENTRY_TYPE_ACTION:case this.TAG_GROUP_ACTION:case this.USERS_FIELDS_ACTION:return this.LAYOUT_DESIGNER_CONTEXT;case this.FIELDS_ACTION:return this.FIELD_DESIGNER_CONTEXT}return!1}}):!1}(window)},function(e,t,i){"use strict";function s(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var n=function(){function e(e,t){for(var i=0;i'},modal:function(){return'
Done
'}},this.init()}return n(e,[{key:"init",value:function(){if(this.$form=this.$el.closest(this.settings.formSelector),!this.$form||0===this.$form.length)return!1;var e=Craft.ReasonsPlugin.getToggleFields();this.toggleFieldIds=$.map(e,function(e){return parseInt(e.id)}),this.$conditionalsInput=$(this.templates.input({name:"_reasons",type:"hidden"})),this.$conditionalsIdInput=$(this.templates.input({name:"_reasonsId",value:this.id||"",type:"hidden"})),this.$form.append(this.$conditionalsInput).append(this.$conditionalsIdInput).on("submit",$.proxy(this.onFormSubmit,this)),Garnish.requestAnimationFrame($.proxy(function(){this.refresh()},this)),this.$el.on("mousedown",this.settings.fieldSelector,$.proxy(this.onFieldMouseDown,this)),Garnish.$doc.on("click",".menu a",$.proxy(this.onFieldSettingsMenuItemClick,this))}},{key:"destroy",value:function(){this.$el.off("mousedown",this.settings.fieldSelector,$.proxy(this.onFieldMouseDown,this)),Garnish.$doc.on("click",".menu a",$.proxy(this.onFieldSettingsMenuItemClick,this))}},{key:"refresh",value:function(){var e,t,i,s,n=this,r={};this.$el.find(this.settings.tabSelector).each(function(){e=$(this).find(n.settings.fieldSelector),s=[],e.each(function(){if(t=$(this),i=parseInt(t.data("id")),n.toggleFieldIds.indexOf(i)>-1){var e=Craft.ReasonsPlugin.getToggleFieldById(i);e&&s.push(e)}}),e.each(function(){t=$(this),i=parseInt(t.data("id")),t.data("_reasonsBuilder")?t.data("_reasonsBuilder").update({toggleFields:s}):t.data("_reasonsBuilder",new a({fieldId:i,toggleFields:s,rules:n.conditionals&&n.conditionals.hasOwnProperty(i)?n.conditionals[i]:null}));var e=t.data("_reasonsBuilder").getConditionals();if(e?(r[i]=e,t.addClass("reasonsHasConditionals")):t.removeClass("reasonsHasConditionals"),!t.data("_reasonsSettingsMenuItemInitialized")){var o=t.find(n.settings.fieldSettingsSelector),l=o.data("menubtn")||!1;if(!l)return;var d=l.menu.$container;d.find("ul").children(":first").clone(!0).appendTo(d.find("ul:first")).find("a:first").data("_reasonsField",t).attr("data-action","toggle-conditionals").text(Craft.t("Manage conditionals")),t.data("_reasonsSettingsMenuItemInitialized",!0)}})}),0===Object.keys(r).length?this.$conditionalsInput.attr("value",""):this.$conditionalsInput.attr("value",JSON.stringify(r))}},{key:"onFieldMouseDown",value:function(e){var t=this,i=function s(e){$("body").off("mouseup",s),Garnish.requestAnimationFrame(function(){t.refresh()})};$("body").on("mouseup",i)}},{key:"onFieldSettingsMenuItemClick",value:function(e){var t=$(e.target),i=t.data("_reasonsField");if("toggle-conditionals"===t.data("action")){if(e.preventDefault(),e.stopPropagation(),!t.data("_reasonsModal")){var s=this,n=i.data("_reasonsBuilder"),a=$(this.templates.modal()),r=new Garnish.Modal(a,{resizable:!0,autoShow:!1,onShow:function(){Garnish.requestAnimationFrame(function(){s.refresh()})},onHide:function(){Garnish.requestAnimationFrame(function(){s.refresh()})}});n.get().appendTo(a.find(".body")),a.on("click",".close",function(e){r.hide()}),t.data("_reasonsModal",r)}t.data("_reasonsModal").show()}Garnish.requestAnimationFrame($.proxy(function(){this.refresh()},this))}},{key:"onFormSubmit",value:function(){this.refresh()}}]),e}()},function(e,t){"use strict";var i=Garnish.Base.extend({$container:null,init:function(e){if(this.setSettings(e,i.defaults),this.templates=this.settings.templates,this.fieldId=this.settings.fieldId,this.$container=$(this.templates.builderUi()),this.$builder=this.$container.find(".reasonsBuilder:first"),this.$rule=this.$container.find(".reasonsRule:first").clone(!0),this.$statement=this.$container.find(".reasonsStatement:first").clone(!0),this.$statement.find(".reasonsRule").remove(),this.$message=this.$container.find(".reasonsMessage:first"),this.$container.on("click",".reasonsAddRule",$.proxy(this.onReasonsAddRuleClick,this)).on("click",".reasonsRemoveRule",$.proxy(this.onReasonsRemoveRuleClick,this)).on("click",".reasonsAddStatement",$.proxy(this.onReasonsAddStatementClick,this)).on("change",".reasonsRuleToggleField select",$.proxy(this.onReasonsRuleToggleFieldChange,this)).on("change",".reasonsRuleCompare select",$.proxy(this.onReasonsRuleCompareChange,this)).on("change",".reasonsRuleValue *:input",$.proxy(this.onReasonsRuleValueChange,this)),this.$builder.html(""),this.setToggleFields(this.settings.toggleFields),this.settings.rules&&this.settings.rules.length>0)for(var t=0;t0?this.settings.rules:!1},addStatement:function(e){e=$.extend({rules:!1},e);var t=this.$statement.clone(!0),i=e.rules;if(this.$builder.append(t),i)for(var s=0;s0?(i.find(".reasonsRules:first").append(t),t.find(".reasonsRuleToggleField select").trigger("change"),n&&t.find(".reasonsRuleCompare select").val(n),a&&t.find(".reasonsRuleValue *:input:first").val(a),t):!1},onReasonsAddRuleClick:function(e){e.preventDefault();var t=$(e.currentTarget).parents(".reasonsStatement");this.addRule({target:t})},onReasonsRemoveRuleClick:function(e){e.preventDefault();var t=$(e.currentTarget),i=t.parents(".reasonsRule");i.remove(),this.refresh()},onReasonsAddStatementClick:function(e){e.preventDefault(),this.addStatement()},onReasonsRuleToggleFieldChange:function(e){e.preventDefault();var t=$(e.currentTarget),i=t.parents(".reasonsRule"),s=i.find(".reasonsRuleValue"),n=t.val(),a=Craft.ReasonsPlugin.getToggleFieldById(n),r=a.type,o=a.settings,l="";switch(r){case"Lightswitch":l=this.templates.select([{"true":Craft.t("on")},{"false":Craft.t("off")}]);break;case"Dropdown":case"MultiSelect":case"Checkboxes":case"RadioButtons":for(var d,u=o.options,h=[],c=0;c'+n+"");return'
"+a.join("")+"
"},toggleSelectOption:function(e,t){return'"},number:function(e){return'
'},input:function s(e){var s="";return e=$.extend({initialRows:4,placeholder:"",multiline:!1},e),s+="1"===e.multiline?'':'','
'+s+"
"},builderUi:function(){return'
'+Craft.t("Show this field if")+'
'+Craft.t("or")+'
'+Craft.t("and")+'
'+Craft.t("Add rules")+'
'}}},instances:[]});e.exports=i},function(e,t){"use strict";function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var s=function(){function e(e,t){for(var i=0;i4||(n=s.slice(-2,-1)[0]||!1,n&&(a=Craft.ReasonsPlugin.getFieldIdByHandle(n),a&&i.attr("data-id",a),r.conditionals[a]&&i.attr("data-target",1),e.indexOf(parseInt(a))>-1&&i.attr("data-toggle",1))))}),!0}},{key:"evaluateConditionals",value:function(){var e,t,i,s,n,a,r,o,l,d=this,u=$(this.getFieldsSelector()+'[data-target="1"]');u.removeClass("reasonsHide").each(function(){if(e=$(this),t=d.conditionals[e.data("id")]||!1){for(var u=t.length,h=u,c=0;u>c;++c){i=!0,s=t[c];for(var f=0;f0&&(l="1"===r.val()?"true":"false");break;case"Checkboxes":case"RadioButtons":l=a.find("input:checkbox:checked,input:radio:checked").map(function(){return $(this).val()}).get();break;default:r=a.find("*:input:first"),l=r.val()}switch($.isArray(l)&&(l=l.join("")),$.isArray(n.value)&&(n.value=n.value.join("")),n.compare){case"!=":l==n.value&&(i=!1);break;case"==":default:l!=n.value&&(i=!1)}if(!i){h--;break}}}0>=h&&e.addClass("reasonsHide")}})}},{key:"onLivePreviewEnter",value:function(){this.isLivePreview=!0,this.render()}},{key:"onLivePreviewExit",value:function(){this.isLivePreview=!1,this.render()}},{key:"onInputWrapperClick",value:function(e){$(e.currentTarget).find("input:first").trigger("change")}},{key:"onFieldInputChange",value:function(e){this.evaluateConditionals()}}]),e}()}]); \ No newline at end of file diff --git a/reasons/resources/javascripts/reasons-6738d5f6a670e6e80807.js b/reasons/resources/javascripts/reasons-6738d5f6a670e6e80807.js new file mode 100644 index 0000000..8a4a9b4 --- /dev/null +++ b/reasons/resources/javascripts/reasons-6738d5f6a670e6e80807.js @@ -0,0 +1,8 @@ +!function(e){function t(s){if(i[s])return i[s].exports;var n=i[s]={exports:{},id:s,loaded:!1};return e[s].call(n.exports,n,n.exports,t),n.loaded=!0,n.exports}var i={};return t.m=e,t.c=i,t.p="javascripts/",t(0)}([function(e,t,i){e.exports=i(1)},function(e,t,i){"use strict";!function(e){return e.Craft?void(Craft.ReasonsPlugin={FieldLayoutDesigner:i(2),ConditionalsRenderer:i(4),ASSET_SOURCE_HANDLE:"assetSource",CATEGORY_GROUP_HANDLE:"categoryGroup",TAG_GROUP_HANDLE:"tagGroup",GLOBAL_SET_HANDLE:"globalSet",ENTRY_TYPE_HANDLE:"entryType",SECTION_HANDLE:"section",USERS_HANDLE:"users",FIELDS_HANDLE:"field",SOLSPACE_CALENDAR_HANDLE:"solspaceCalendar",ASSET_SOURCE_ACTION:"assetSources/saveSource",CATEGORY_ACTION:"categories/saveCategory",CATEGORY_GROUP_ACTION:"categories/saveGroup",TAG_ACTION:"tagManager/saveTag",TAG_GROUP_ACTION:"tags/saveTagGroup",GLOBAL_SET_CONTENT_ACTION:"globals/saveContent",GLOBAL_SET_ACTION:"globals/saveSet",ENTRY_ACTION:"entries/saveEntry",ENTRY_TYPE_ACTION:"sections/saveEntryType",USERS_ACTION:"users/saveUser",USERS_FIELDS_ACTION:"users/saveFieldLayout",FIELDS_ACTION:"fields/saveField",SOLSPACE_CALENDAR_EVENTS_ACTION:"calendar/events/saveEvent",SOLSPACE_CALENDAR_SETTINGS_ACTION:"calendar/settings/saveSettings",RENDER_CONTEXT:"render",LAYOUT_DESIGNER_CONTEXT:"fld",FIELD_DESIGNER_CONTEXT:"field",init:function(e){this.data=e,this.initPrimaryForm()},initPrimaryForm:function(){this.destroyPrimaryForm();var e=Craft.cp.$primaryForm&&Craft.cp.$primaryForm.length?Craft.cp.$primaryForm:$("#content form:first");e&&e.length&&(this.primaryForm=this.initForm(e))},destroyPrimaryForm:function(){this.primaryForm&&(this.primaryForm.destroy(),delete this.primaryForm)},initElementEditor:function(e){var t=this.getConditionals(e);if(!t)return!1;var i=(new Date).getTime(),s=function(){var e=(new Date).getTime(),n=$(".elementeditor:last"),a=n.length>0?n.closest(".hud"):!1,r=a&&a.length>0?a.data("elementEditor"):!1,o=r?r.$form:!1;o?(r._reasonsForm=new this.ConditionalsRenderer(o,t),r.hud.on("hide",$.proxy(this.destroyElementEditorForm,this,r))):2e3>e-i&&Garnish.requestAnimationFrame(s)}.bind(this);s()},destroyElementEditorForm:function(e){var t=e._reasonsForm||null;t&&(t.destroy(),delete e._reasonsForm)},initForm:function(e){var t=this.getElementSourceFromForm(e),i=t?this.getFormContext(e):!1;if(!t||!i)return!1;var s=t.type+(t.id?":"+t.id:""),n=this.getConditionals(s);switch(i){case this.LAYOUT_DESIGNER_CONTEXT:return new this.FieldLayoutDesigner(e,n);case this.FIELD_DESIGNER_CONTEXT:return null;case this.RENDER_CONTEXT:return n?new this.ConditionalsRenderer(e,n):null}return null},getConditionals:function(e){return e?this.data.conditionals&&this.data.conditionals.hasOwnProperty(e)?this.data.conditionals[e]:null:this.data.conditionals||{}},getToggleFields:function(){return this.data.toggleFields?this.data.toggleFields:[]},getToggleFieldById:function(e){e=parseInt(e);for(var t=this.getToggleFields(),i=t.length,s=0;i>s;++s)if(parseInt(t[s].id)===e)return t[s];return!1},getFieldIds:function(){return this.data.fieldIds?this.data.fieldIds:{}},getFieldIdByHandle:function(e){var t=this.getFieldIds();return t&&t.hasOwnProperty(e)?t[e]:!1},getToggleFieldTypes:function(){return this.data.toggleFieldTypes?this.data.toggleFieldTypes:[]},getElementSourceFromForm:function(e){if(e.data("elementEditor"))return!1;var t=e.find('input[type="hidden"][name="namespace"]').val();t&&(t+="-");var i,s,n=e.find('input[type="hidden"][name="action"]').val();switch(n){case this.ASSET_SOURCE_ACTION:i=this.ASSET_SOURCE_HANDLE,s='input[type="hidden"][name="sourceId"]';break;case this.CATEGORY_ACTION:case this.CATEGORY_GROUP_ACTION:i=this.CATEGORY_GROUP_HANDLE,s='input[type="hidden"][name="groupId"]';break;case this.GLOBAL_SET_CONTENT_ACTION:case this.GLOBAL_SET_ACTION:i=this.GLOBAL_SET_HANDLE,s='input[type="hidden"][name="setId"]';break;case this.ENTRY_ACTION:var a=e.find('select#entryType, input[type="hidden"][name="entryTypeId"], input[type="hidden"][name="typeId"], #'+t+"entryType");i=a.length?this.ENTRY_TYPE_HANDLE:this.SECTION_HANDLE,s=a.length?'select#entryType, input[type="hidden"][name="entryTypeId"], input[type="hidden"][name="typeId"], #'+t+"entryType":'input[type="hidden"][name="sectionId"], #'+t+"section";break;case this.ENTRY_TYPE_ACTION:i=this.ENTRY_TYPE_HANDLE,s='input[type="hidden"][name="entryTypeId"]';break;case this.TAG_ACTION:case this.TAG_GROUP_ACTION:i=this.TAG_GROUP_HANDLE,s='input[type="hidden"][name="tagGroupId"], input[type="hidden"][name="groupId"]';break;case this.USERS_ACTION:case this.USERS_FIELDS_ACTION:i=this.USERS_HANDLE;break;case this.FIELDS_ACTION:i=this.FIELDS_HANDLE,s='input[type="hidden"][name="fieldId"]';break;case this.SOLSPACE_CALENDAR_SETTINGS_ACTION:case this.SOLSPACE_CALENDAR_EVENTS_ACTION:i=this.SOLSPACE_CALENDAR_HANDLE}return i?{type:i,id:s?0|e.find(s).val():!1}:!1},getFormContext:function(e){if(e.data("elementEditor"))return!1;var t=e.find('input[type="hidden"][name="action"]').val();switch(t){case this.GLOBAL_SET_CONTENT_ACTION:case this.ENTRY_ACTION:case this.TAG_ACTION:case this.CATEGORY_ACTION:case this.USERS_ACTION:case this.SOLSPACE_CALENDAR_EVENTS_ACTION:return this.RENDER_CONTEXT;case this.ASSET_SOURCE_ACTION:case this.CATEGORY_GROUP_ACTION:case this.GLOBAL_SET_ACTION:case this.ENTRY_TYPE_ACTION:case this.TAG_GROUP_ACTION:case this.USERS_FIELDS_ACTION:case this.SOLSPACE_CALENDAR_SETTINGS_ACTION:return this.LAYOUT_DESIGNER_CONTEXT;case this.FIELDS_ACTION:return this.FIELD_DESIGNER_CONTEXT}return!1}}):!1}(window),window.jQuery&&/*! + * jQuery.fn.hasAttr() + * + * Copyright 2011, Rick Waldron + * Licensed under MIT license. + * + */ +!function(e){e.fn.hasAttr=function(e){for(var t=0,i=this.length;i>t;t++)if(void 0!==this.attr(e))return!0;return!1}}(jQuery)},function(e,t,i){"use strict";function s(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var n=function(){function e(e,t){for(var i=0;i'},modal:function(){return'
Done
'}},this.init()}return n(e,[{key:"init",value:function(){if(this.$form=this.$el.closest(this.settings.formSelector),!this.$form||0===this.$form.length)return!1;var e=Craft.ReasonsPlugin.getToggleFields();this.toggleFieldIds=$.map(e,function(e){return parseInt(e.id)}),this.$conditionalsInput=$(this.templates.input({name:"_reasons",type:"hidden"})),this.$conditionalsIdInput=$(this.templates.input({name:"_reasonsId",value:this.id||"",type:"hidden"})),this.$form.append(this.$conditionalsInput).append(this.$conditionalsIdInput).on("submit",$.proxy(this.onFormSubmit,this)),Garnish.requestAnimationFrame($.proxy(function(){this.refresh()},this)),this.$el.on("mousedown",this.settings.fieldSelector,$.proxy(this.onFieldMouseDown,this)),Garnish.$doc.on("click",".menu a",$.proxy(this.onFieldSettingsMenuItemClick,this))}},{key:"destroy",value:function(){this.$el.off("mousedown",this.settings.fieldSelector,$.proxy(this.onFieldMouseDown,this)),Garnish.$doc.on("click",".menu a",$.proxy(this.onFieldSettingsMenuItemClick,this))}},{key:"refresh",value:function(){var e,t,i,s,n=this,r={};this.$el.find(this.settings.tabSelector).each(function(){e=$(this).find(n.settings.fieldSelector),s=[],e.each(function(){if(t=$(this),i=parseInt(t.data("id")),n.toggleFieldIds.indexOf(i)>-1){var e=Craft.ReasonsPlugin.getToggleFieldById(i);e&&s.push(e)}}),e.each(function(){t=$(this),i=parseInt(t.data("id")),t.data("_reasonsBuilder")?t.data("_reasonsBuilder").update({toggleFields:s}):t.data("_reasonsBuilder",new a({fieldId:i,toggleFields:s,rules:n.conditionals&&n.conditionals.hasOwnProperty(i)?n.conditionals[i]:null}));var e=t.data("_reasonsBuilder").getConditionals();if(e?(r[i]=e,t.addClass("reasonsHasConditionals")):t.removeClass("reasonsHasConditionals"),!t.data("_reasonsSettingsMenuItemInitialized")){var o=t.find(n.settings.fieldSettingsSelector),l=o.data("menubtn")||!1;if(!l)return;var d=l.menu.$container;d.find("ul").children(":first").clone(!0).appendTo(d.find("ul:first")).find("a:first").data("_reasonsField",t).attr("data-action","toggle-conditionals").text(Craft.t("Manage conditionals")),t.data("_reasonsSettingsMenuItemInitialized",!0)}})}),0===Object.keys(r).length?this.$conditionalsInput.attr("value",""):this.$conditionalsInput.attr("value",JSON.stringify(r))}},{key:"onFieldMouseDown",value:function(e){var t=this,i=function s(e){$("body").off("mouseup",s),Garnish.requestAnimationFrame(function(){t.refresh()})};$("body").on("mouseup",i)}},{key:"onFieldSettingsMenuItemClick",value:function(e){var t=$(e.target),i=t.data("_reasonsField");if("toggle-conditionals"===t.data("action")){if(e.preventDefault(),e.stopPropagation(),!t.data("_reasonsModal")){var s=this,n=i.data("_reasonsBuilder"),a=$(this.templates.modal()),r=new Garnish.Modal(a,{resizable:!0,autoShow:!1,onShow:function(){Garnish.requestAnimationFrame(function(){s.refresh()})},onHide:function(){Garnish.requestAnimationFrame(function(){s.refresh()})}});n.get().appendTo(a.find(".body")),a.on("click",".close",function(e){r.hide()}),t.data("_reasonsModal",r)}t.data("_reasonsModal").show()}Garnish.requestAnimationFrame($.proxy(function(){this.refresh()},this))}},{key:"onFormSubmit",value:function(){this.refresh()}}]),e}()},function(e,t){"use strict";var i=Garnish.Base.extend({$container:null,init:function(e){if(this.setSettings(e,i.defaults),this.templates=this.settings.templates,this.fieldId=this.settings.fieldId,this.$container=$(this.templates.builderUi()),this.$builder=this.$container.find(".reasonsBuilder:first"),this.$rule=this.$container.find(".reasonsRule:first").clone(!0),this.$statement=this.$container.find(".reasonsStatement:first").clone(!0),this.$statement.find(".reasonsRule").remove(),this.$message=this.$container.find(".reasonsMessage:first"),this.$container.on("click",".reasonsAddRule",$.proxy(this.onReasonsAddRuleClick,this)).on("click",".reasonsRemoveRule",$.proxy(this.onReasonsRemoveRuleClick,this)).on("click",".reasonsAddStatement",$.proxy(this.onReasonsAddStatementClick,this)).on("change",".reasonsRuleToggleField select",$.proxy(this.onReasonsRuleToggleFieldChange,this)).on("change",".reasonsRuleCompare select",$.proxy(this.onReasonsRuleCompareChange,this)).on("change",".reasonsRuleValue *:input",$.proxy(this.onReasonsRuleValueChange,this)),this.$builder.html(""),this.setToggleFields(this.settings.toggleFields),this.settings.rules&&this.settings.rules.length>0)for(var t=0;t0?this.settings.rules:!1},addStatement:function(e){e=$.extend({rules:!1},e);var t=this.$statement.clone(!0),i=e.rules;if(this.$builder.append(t),i)for(var s=0;s0?(i.find(".reasonsRules:first").append(t),t.find(".reasonsRuleToggleField select").trigger("change"),n&&t.find(".reasonsRuleCompare select").val(n),a&&t.find(".reasonsRuleValue *:input:first").val(a),t):!1},onReasonsAddRuleClick:function(e){e.preventDefault();var t=$(e.currentTarget).parents(".reasonsStatement");this.addRule({target:t})},onReasonsRemoveRuleClick:function(e){e.preventDefault();var t=$(e.currentTarget),i=t.parents(".reasonsRule");i.remove(),this.refresh()},onReasonsAddStatementClick:function(e){e.preventDefault(),this.addStatement()},onReasonsRuleToggleFieldChange:function(e){e.preventDefault();var t=$(e.currentTarget),i=t.parents(".reasonsRule"),s=i.find(".reasonsRuleValue"),n=t.val(),a=Craft.ReasonsPlugin.getToggleFieldById(n),r=a.type,o=a.settings,l="";switch(r){case"Lightswitch":l=this.templates.select([{"true":Craft.t("on")},{"false":Craft.t("off")}]);break;case"Dropdown":case"MultiSelect":case"Checkboxes":case"RadioButtons":for(var d,u=o.options,h=[],c=0;c'+n+"");return'
"+a.join("")+"
"},toggleSelectOption:function(e,t){return'"},number:function(e){return'
'},input:function s(e){var s="";return e=$.extend({initialRows:4,placeholder:"",multiline:!1},e),s+="1"===e.multiline?'':'','
'+s+"
"},builderUi:function(){return'
'+Craft.t("Show this field if")+'
'+Craft.t("or")+'
'+Craft.t("and")+'
'+Craft.t("Add rules")+'
'}}},instances:[]});e.exports=i},function(e,t){"use strict";function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var s=function(){function e(e,t){for(var i=0;i4||(n=s.slice(-2,-1)[0]||!1,n&&(a=Craft.ReasonsPlugin.getFieldIdByHandle(n),a&&i.attr("data-id",a),r.conditionals[a]&&i.attr("data-target",1),e.indexOf(parseInt(a))>-1&&i.attr("data-toggle",1))))}),!0}},{key:"evaluateConditionals",value:function(){var e,t,i,s,n,a,r,o,l,d=this,u=$(this.getFieldsSelector()+'[data-target="1"]');u.removeClass("reasonsHide").removeAttr("aria-hidden").removeAttr("tabindex").each(function(){if(e=$(this),t=d.conditionals[e.data("id")]||!1){for(var u=t.length,h=u,c=0;u>c;++c){i=!0,s=t[c];for(var f=0;f0&&(l="1"===r.val()?"true":"false");break;case"Checkboxes":case"RadioButtons":l=a.find("input:checkbox:checked,input:radio:checked").map(function(){return $(this).val()}).get();break;case"Entries":case"Categories":case"Tags":case"Assets":case"Users":case"Calendar_Event":var g=a.find("[data-reasonselementselect]").data("elementSelect")||null;l=g&&g.totalSelected?"notnull":"null";break;default:r=a.find("*:input:first"),l=r.val()}switch($.isArray(l)&&(l=l.join("")),$.isArray(n.value)&&(n.value=n.value.join("")),n.compare){case"!=":l==n.value&&(i=!1);break;case"==":default:l!=n.value&&(i=!1)}if(!i){h--;break}}}0>=h&&e.addClass("reasonsHide").attr("aria-hidden","true").attr("tabindex","-1")}})}},{key:"onLivePreviewEnter",value:function(){this.isLivePreview=!0,this.render()}},{key:"onLivePreviewExit",value:function(){this.isLivePreview=!1,this.render()}},{key:"onInputWrapperClick",value:function(e){$(e.currentTarget).find("input:first").trigger("change")}},{key:"onFieldInputChange",value:function(e){this.evaluateConditionals()}},{key:"onElementSelectChange",value:function(e){Garnish.requestAnimationFrame(this.evaluateConditionals.bind(this))}}]),e}()}]); \ No newline at end of file diff --git a/reasons/resources/rev-manifest.json b/reasons/resources/rev-manifest.json index f0fc7f0..de5cd49 100644 --- a/reasons/resources/rev-manifest.json +++ b/reasons/resources/rev-manifest.json @@ -1,4 +1,4 @@ { - "javascripts/reasons.js": "javascripts/reasons-6124c2e40a6cb71616a5.js", - "stylesheets/reasons.css": "stylesheets/reasons-a008e38a64.css" + "javascripts/reasons.js": "javascripts/reasons-6738d5f6a670e6e80807.js", + "stylesheets/reasons.css": "stylesheets/reasons-2b40a218fb.css" } \ No newline at end of file diff --git a/reasons/resources/stylesheets/reasons-a008e38a64.css b/reasons/resources/stylesheets/reasons-2b40a218fb.css similarity index 100% rename from reasons/resources/stylesheets/reasons-a008e38a64.css rename to reasons/resources/stylesheets/reasons-2b40a218fb.css diff --git a/releases.json b/releases.json index f1f64b2..a02763c 100644 --- a/releases.json +++ b/releases.json @@ -1,4 +1,16 @@ [ + { + "version": "1.0.5", + "downloadUrl": "https://github.com/mmikkel/Reasons-Craft/archive/master.zip", + "date": "2016-07-06T10:00:00-08:00", + "notes": [ + "[Added] Support for Entries, Assets, Tags, Users and Categories fieldtypes as toggle fields", + "[Added] Support for Solspace Calendar Events fieldtype as toggle fields", + "[Added] Full support for Solspace Calendar", + "[Improved] Reasons will no longer cache conditionals if devMode is enabled", + "[Improved] Hidden fields are no longer tabbable/focusable" + ] + }, { "version": "1.0.4", "downloadUrl": "https://github.com/mmikkel/Reasons-Craft/archive/master.zip", diff --git a/source/javascripts/modules/builder.js b/source/javascripts/modules/builder.js index 1ac93f8..c2be647 100644 --- a/source/javascripts/modules/builder.js +++ b/source/javascripts/modules/builder.js @@ -303,7 +303,7 @@ var ConditionalsBuilder = Garnish.Base.extend({ switch (toggleFieldType) { // Lightswitch - true/false - case 'Lightswitch' : + case 'Lightswitch': ruleValueContent = this.templates.select([ { true : Craft.t('on') }, { false : Craft.t('off') } @@ -311,7 +311,7 @@ var ConditionalsBuilder = Garnish.Base.extend({ break; // Option based inputs - case 'Dropdown' : case 'MultiSelect' : case 'Checkboxes' : case 'RadioButtons' : + case 'Dropdown': case 'MultiSelect': case 'Checkboxes': case 'RadioButtons': var values = toggleFieldSettings.options, options = [], option; @@ -324,12 +324,12 @@ var ConditionalsBuilder = Garnish.Base.extend({ break; // Number input - case 'Number' : + case 'Number': ruleValueContent = this.templates.number(toggleFieldSettings); break; // // Color input - // case 'Color' : + // case 'Color': // toggleFieldSettings = { // placeholder : '#' // }; @@ -337,7 +337,7 @@ var ConditionalsBuilder = Garnish.Base.extend({ // break; // Position Select - case 'PositionSelect' : + case 'PositionSelect': var values = toggleFieldSettings.options, options = [], option; @@ -349,6 +349,19 @@ var ConditionalsBuilder = Garnish.Base.extend({ ruleValueContent = this.templates.select(options); break; + // Relational fields + case 'Entries': case 'Categories': case 'Tags': case 'Assets': case 'Users': case 'Calendar_Event': + var options = [ + { + 'null': Craft.t('Empty').toLowerCase() + }, + { + 'notnull': Craft.t('Not empty').toLowerCase() + } + ]; + ruleValueContent = this.templates.select(options); + break; + // Just render a plain text input for anything else default : ruleValueContent = this.templates.input(toggleFieldSettings); @@ -387,11 +400,11 @@ var ConditionalsBuilder = Garnish.Base.extend({ label = option[value]; selectOptions.push(''); } - return '
' + selectOptions.join('') + '
'; + return '
' + selectOptions.join('') + '
'; }, toggleSelectOption : function(toggleField, selected) { - return ''; + return ''; }, number : function(settings) { diff --git a/source/javascripts/modules/render.js b/source/javascripts/modules/render.js index 0471d8d..62eaf7e 100644 --- a/source/javascripts/modules/render.js +++ b/source/javascripts/modules/render.js @@ -21,27 +21,71 @@ module.exports = class { this.conditionals = conditionals; - this.addEventListeners(); - this.addLivePreviewListeners(); - - this.render(); + $(this.init.bind(this)); return this; } + init () + { + this.addEventListeners(); + this.addLivePreviewListeners(); + this.render(); + } + addEventListeners() { + Garnish.$doc - .on('click', this.settings.fieldsSelector + '[data-toggle="1"]', $.proxy(this.onInputWrapperClick,this)) - .on('change keyup', this.settings.fieldsSelector + '[data-toggle="1"] *:input', $.proxy(this.onFieldInputChange,this)); + .on('click', this.settings.fieldsSelector + '[data-toggle="1"]', this.onInputWrapperClick.bind(this)) + .on('change keyup', this.settings.fieldsSelector + '[data-toggle="1"] *:input', this.onFieldInputChange.bind(this)); + + // Init element selects + var self = this, + elementSelectClassnames = ['elementselect', 'categoriesfield'], + elementSelect; + + for (var i = 0; i < elementSelectClassnames.length; ++i) { + $(this.settings.fieldsSelector + ' .' + elementSelectClassnames[i]).each(function () { + if ($(this).hasAttr('data-reasonselementselect')) { + return; + } + var now = new Date().getTime(), + getElementSelect = (function () { + elementSelect = $(this).data('elementSelect'); + if (elementSelect) { + elementSelect.on('selectElements', self.onElementSelectChange.bind(self)); + elementSelect.on('removeElements', self.onElementSelectChange.bind(self)); + $(this).attr('data-reasonselementselect', ''); + self.onElementSelectChange(); + } else if (new Date().getTime() - now < 2000) { + Garnish.requestAnimationFrame(getElementSelect); + } + }).bind(this); + getElementSelect(); + }); + } + } removeEventListeners() { + Garnish.$doc - .off('click', this.settings.fieldsSelector + '[data-toggle="1"]', $.proxy(this.onInputWrapperClick,this)) - .off('change keyup', this.settings.fieldsSelector + '[data-toggle="1"] *:input', $.proxy(this.onFieldInputChange,this)); + .off('click', this.settings.fieldsSelector + '[data-toggle="1"]', this.onInputWrapperClick.bind(this)) + .off('change keyup', this.settings.fieldsSelector + '[data-toggle="1"] *:input', this.onFieldInputChange.bind(this)); + + var self = this, + elementSelect; + + $('[data-reasonselementselect]').each(function () { + elementSelect = $(this).elementSelect; + elementSelect.off('selectElements', self.onElementSelectChange.bind(self)); + elementSelect.off('removeElements', self.onElementSelectChange.bind(self)); + $(this).removeAttr('[data-reasonselementselect]'); + }); + } addLivePreviewListeners() @@ -187,6 +231,8 @@ module.exports = class { $targetFields .removeClass('reasonsHide') + .removeAttr('aria-hidden') + .removeAttr('tabindex') .each(function(){ $targetField = $(this); @@ -230,6 +276,10 @@ module.exports = class { return $(this).val(); }).get(); break; + case 'Entries' : case 'Categories': case 'Tags': case 'Assets': case 'Users': case 'Calendar_Event': + var elementSelect = $toggleField.find('[data-reasonselementselect]').data('elementSelect') || null; + toggleFieldValue = elementSelect && elementSelect.totalSelected ? 'notnull' : 'null'; + break; default : $toggleFieldInput = $toggleField.find('*:input:first'); toggleFieldValue = $toggleFieldInput.val(); @@ -270,7 +320,10 @@ module.exports = class { } if (numValidStatements <= 0){ - $targetField.addClass('reasonsHide'); + $targetField + .addClass('reasonsHide') + .attr('aria-hidden', 'true') + .attr('tabindex', '-1'); } }); @@ -306,4 +359,9 @@ module.exports = class { this.evaluateConditionals(); } + onElementSelectChange (e) + { + Garnish.requestAnimationFrame(this.evaluateConditionals.bind(this)); + } + } \ No newline at end of file diff --git a/source/javascripts/reasons.js b/source/javascripts/reasons.js index ff99ff9..3881aaf 100644 --- a/source/javascripts/reasons.js +++ b/source/javascripts/reasons.js @@ -17,6 +17,7 @@ SECTION_HANDLE : 'section', USERS_HANDLE : 'users', FIELDS_HANDLE : 'field', + SOLSPACE_CALENDAR_HANDLE : 'solspaceCalendar', ASSET_SOURCE_ACTION : 'assetSources/saveSource', CATEGORY_ACTION : 'categories/saveCategory', @@ -30,6 +31,8 @@ USERS_ACTION : 'users/saveUser', USERS_FIELDS_ACTION : 'users/saveFieldLayout', FIELDS_ACTION : 'fields/saveField', + SOLSPACE_CALENDAR_EVENTS_ACTION : 'calendar/events/saveEvent', + SOLSPACE_CALENDAR_SETTINGS_ACTION: 'calendar/settings/saveSettings', RENDER_CONTEXT : 'render', LAYOUT_DESIGNER_CONTEXT : 'fld', @@ -53,8 +56,9 @@ initPrimaryForm : function () { this.destroyPrimaryForm(); - if (Craft.cp.$primaryForm) { - this.primaryForm = this.initForm(Craft.cp.$primaryForm); + var $form = (Craft.cp.$primaryForm && Craft.cp.$primaryForm.length) ? Craft.cp.$primaryForm : $('#content form:first'); + if ($form && $form.length) { + this.primaryForm = this.initForm($form); } }, @@ -80,7 +84,7 @@ } var now = new Date().getTime(), - doInitElementEditor = $.proxy(function () { + doInitElementEditor = (function () { var timestamp = new Date().getTime(), $elementEditor = $('.elementeditor:last'), @@ -91,11 +95,11 @@ if ($form) { elementEditor['_reasonsForm'] = new this.ConditionalsRenderer($form, conditionals); elementEditor.hud.on('hide', $.proxy(this.destroyElementEditorForm, this, elementEditor)); - } else if (timestamp - now < 2000) { + } else if (timestamp - now < 2000) { // Poll for 2 secs Garnish.requestAnimationFrame(doInitElementEditor); } - }, this); + }).bind(this); doInitElementEditor(); @@ -252,6 +256,11 @@ idInputSelector = 'input[type="hidden"][name="fieldId"]'; break; + case this.SOLSPACE_CALENDAR_SETTINGS_ACTION : + case this.SOLSPACE_CALENDAR_EVENTS_ACTION : + type = this.SOLSPACE_CALENDAR_HANDLE; + break; + } if (!type) { @@ -281,6 +290,7 @@ case this.TAG_ACTION : case this.CATEGORY_ACTION : case this.USERS_ACTION : + case this.SOLSPACE_CALENDAR_EVENTS_ACTION : return this.RENDER_CONTEXT; case this.ASSET_SOURCE_ACTION : @@ -289,6 +299,7 @@ case this.ENTRY_TYPE_ACTION : case this.TAG_GROUP_ACTION : case this.USERS_FIELDS_ACTION : + case this.SOLSPACE_CALENDAR_SETTINGS_ACTION : return this.LAYOUT_DESIGNER_CONTEXT; case this.FIELDS_ACTION : @@ -302,4 +313,24 @@ }; -}(window)); \ No newline at end of file +}(window)); + +if (window.jQuery) { + /*! + * jQuery.fn.hasAttr() + * + * Copyright 2011, Rick Waldron + * Licensed under MIT license. + * + */ + (function( jQuery ) { + jQuery.fn.hasAttr = function( name ) { + for ( var i = 0, l = this.length; i < l; i++ ) { + if ( !!( this.attr( name ) !== undefined ) ) { + return true; + } + } + return false; + }; + })( jQuery ); +} \ No newline at end of file