From 3f1f3aa056d2b52ca659bf303e44a81928a7d675 Mon Sep 17 00:00:00 2001 From: Mats Mikkel Rummelhoff Date: Sat, 19 Nov 2016 16:08:35 +0100 Subject: [PATCH] Fixes issue with AND conditionals not working as expected --- README.md | 10 +++++++--- reasons/ReasonsPlugin.php | 4 ++-- ...dd7e.js => reasons-a08bbfa4180502815a4e.js} | 2 +- reasons/resources/rev-manifest.json | 4 ++-- ...s-38f07b2161.css => reasons-8f9624f667.css} | 0 releases.json | 8 ++++++++ source/javascripts/modules/render.js | 18 +++++++++++------- source/javascripts/reasons.js | 14 +++++++------- 8 files changed, 38 insertions(+), 22 deletions(-) rename reasons/resources/javascripts/{reasons-77b7190892588775dd7e.js => reasons-a08bbfa4180502815a4e.js} (60%) rename reasons/resources/stylesheets/{reasons-38f07b2161.css => reasons-8f9624f667.css} (100%) diff --git a/README.md b/README.md index 994b7b9..ce31ae1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Reasons v. 1.0.7 for Craft CMS ![Craft 2.5](https://img.shields.io/badge/craft-2.5-red.svg?style=flat-square) +# Reasons v. 1.0.8 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._ @@ -10,7 +10,7 @@ _Big props to [Benjamin Fleming](https://github.com/benjamminf) for some good id ## Recent updates * Support for [Button Box](http://plugins.supercooldesign.co.uk/plugin/button-box) custom FieldTypes as toggle fields -* Support for all native relational fields (Entries, Assets, Categories, Tags and Users) as toggle fields +* Support for all native relational fields (Entries, Assets, Categories, Tags and Users) as toggle fields * Support for [Solspace Calendar](https://solspace.com/craft/calendar) ## Requirements @@ -58,7 +58,7 @@ The following custom FieldTypes are also supported: ### Where does it work? -Reasons currently works for +Reasons currently works for * Entries * Categories @@ -110,6 +110,10 @@ Please report any bugs, feature requests or other issues [here](https://github.c ### Changelog +#### 1.0.8 (19.11.2016) + +* [Fixed] Fixes issue with AND conditionals not working as expected + #### 1.0.7 (10.01.2016) * [Fixed] Fixes minor JavaScript bug (thanks @benf!) diff --git a/reasons/ReasonsPlugin.php b/reasons/ReasonsPlugin.php index a3868e8..1daec76 100644 --- a/reasons/ReasonsPlugin.php +++ b/reasons/ReasonsPlugin.php @@ -18,7 +18,7 @@ class ReasonsPlugin extends BasePlugin { - protected $_version = '1.0.7'; + protected $_version = '1.0.8'; protected $_schemaVersion = '1.1'; protected $_developer = 'Mats Mikkel Rummelhoff'; protected $_developerUrl = 'http://mmikkel.no'; @@ -359,7 +359,7 @@ protected function getConditionals() // $productTypes = craft()->commerce_productTypes->getAllProductTypes(); // if ($productTypes) { // foreach ($productTypes as $productType) { - // $sources['commerceProductType:'.$productType->id] = + // $sources['commerceProductType:'.$productType->id] = // } // } // } diff --git a/reasons/resources/javascripts/reasons-77b7190892588775dd7e.js b/reasons/resources/javascripts/reasons-a08bbfa4180502815a4e.js similarity index 60% rename from reasons/resources/javascripts/reasons-77b7190892588775dd7e.js rename to reasons/resources/javascripts/reasons-a08bbfa4180502815a4e.js index 4585e55..f6947df 100644 --- a/reasons/resources/javascripts/reasons-77b7190892588775dd7e.js +++ b/reasons/resources/javascripts/reasons-a08bbfa4180502815a4e.js @@ -5,4 +5,4 @@ * Licensed under MIT license. * */ -!function(e){e.fn.hasAttr=function(e){for(var t=0,i=this.length;t'},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).insertBefore(d.find("ul:first li:last")).find("a:first").data("_reasonsField",t).attr("data-action","toggle-conditionals").text(Craft.t("Edit 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},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)},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":case"ButtonBox_Buttons":case"ButtonBox_Colours":case"ButtonBox_TextSize":case"ButtonBox_Width":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;c0&&(l="1"===r.val()?"true":"false");break;case"Checkboxes":case"RadioButtons":case"ButtonBox_Buttons":case"ButtonBox_Stars":case"ButtonBox_Width":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}}}h<=0&&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 +!function(e){e.fn.hasAttr=function(e){for(var t=0,i=this.length;t'},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).insertBefore(d.find("ul:first li:last")).find("a:first").data("_reasonsField",t).attr("data-action","toggle-conditionals").text(Craft.t("Edit 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 e(i){$("body").off("mouseup",e),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},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)},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":case"ButtonBox_Buttons":case"ButtonBox_Colours":case"ButtonBox_TextSize":case"ButtonBox_Width":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 e(t){var e="";return t=$.extend({initialRows:4,placeholder:"",multiline:!1},t),e+="1"===t.multiline?'':'','
'+e+"
"},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||(o=r.slice(-2,-1)[0]||!1,o&&(l=Craft.ReasonsPlugin.getFieldIdByHandle(o),l&&a.attr("data-id",l),d.conditionals[l]&&a.attr("data-target",1),i.indexOf(parseInt(l))>-1&&a.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;c0&&(l="1"===r.val()?"true":"false");break;case"Checkboxes":case"RadioButtons":case"ButtonBox_Buttons":case"ButtonBox_Stars":case"ButtonBox_Width":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}}}h<=0&&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 10a5b36..2493c74 100644 --- a/reasons/resources/rev-manifest.json +++ b/reasons/resources/rev-manifest.json @@ -1,4 +1,4 @@ { - "javascripts/reasons.js": "javascripts/reasons-77b7190892588775dd7e.js", - "stylesheets/reasons.css": "stylesheets/reasons-38f07b2161.css" + "javascripts/reasons.js": "javascripts/reasons-a08bbfa4180502815a4e.js", + "stylesheets/reasons.css": "stylesheets/reasons-8f9624f667.css" } \ No newline at end of file diff --git a/reasons/resources/stylesheets/reasons-38f07b2161.css b/reasons/resources/stylesheets/reasons-8f9624f667.css similarity index 100% rename from reasons/resources/stylesheets/reasons-38f07b2161.css rename to reasons/resources/stylesheets/reasons-8f9624f667.css diff --git a/releases.json b/releases.json index 6a5ac00..282ba31 100644 --- a/releases.json +++ b/releases.json @@ -1,4 +1,12 @@ [ + { + "version": "1.0.8", + "downloadUrl": "https://github.com/mmikkel/Reasons-Craft/archive/master.zip", + "date": "2016-11-19T10:00:00-08:00", + "notes": [ + "[Fixed] Fixes issue with AND conditionals not working as expected" + ] + }, { "version": "1.0.7", "downloadUrl": "https://github.com/mmikkel/Reasons-Craft/archive/master.zip", diff --git a/source/javascripts/modules/render.js b/source/javascripts/modules/render.js index d5e1aa7..8a21a26 100644 --- a/source/javascripts/modules/render.js +++ b/source/javascripts/modules/render.js @@ -41,7 +41,7 @@ module.exports = class { .on('click', this.settings.fieldsSelector + '[data-toggle="1"]', this.onInputWrapperClick.bind(this)) .on('change keyup', this.settings.fieldsSelector + '[data-toggle="1"] *:input, '+this.settings.fieldsSelector + '[data-toggle="1"] '+this.settings.lightswitchContainerSelector, this.onFieldInputChange.bind(this)) .on('click', 'a[data-buttonbox-value]', this.onFieldInputChange.bind(this)); - + // Init element selects var self = this, elementSelectClassnames = ['elementselect', 'categoriesfield'], @@ -72,12 +72,12 @@ module.exports = class { removeEventListeners() { - + Garnish.$doc .off('click', this.settings.fieldsSelector + '[data-toggle="1"]', this.onInputWrapperClick.bind(this)) .off('change keyup', this.settings.fieldsSelector + '[data-toggle="1"] *:input, '+this.settings.fieldsSelector + '[data-toggle="1"] '+this.settings.lightswitchContainerSelector, this.onFieldInputChange.bind(this)) .off('click', 'a[data-buttonbox-value]', this.onFieldInputChange.bind(this)); - + var self = this, elementSelect; @@ -169,10 +169,14 @@ module.exports = class { } // Get toggle field IDs + var fieldIds = Object.keys(this.conditionals); var toggleFieldIds = []; - for (fieldId in this.conditionals) { - for (var i = 0; i < this.conditionals[fieldId].length; ++i){ - toggleFieldIds.push(this.conditionals[fieldId][i][0].fieldId); + var statements; + + for (var i = 0; i < fieldIds.length; ++i) { + statements = this.conditionals[fieldIds[i]][0]; + for (var j = 0; j < statements.length; ++j) { + toggleFieldIds.push(statements[j].fieldId); } } @@ -368,4 +372,4 @@ module.exports = class { 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 dfcbc0f..5fc27e4 100644 --- a/source/javascripts/reasons.js +++ b/source/javascripts/reasons.js @@ -41,7 +41,7 @@ LAYOUT_DESIGNER_CONTEXT : 'fld', FIELD_DESIGNER_CONTEXT : 'field', - + /* * Initialize Reasons * @@ -81,7 +81,7 @@ { var conditionals = this.getConditionals(conditionalsKey); - + if (!conditionals) { return false; } @@ -238,7 +238,7 @@ idInputSelector = $entryType.length ? 'select#entryType, input[type="hidden"][name="entryTypeId"], input[type="hidden"][name="typeId"], #' + namespace + 'entryType' : 'input[type="hidden"][name="sectionId"], #' + namespace + 'section'; break; - case this.ENTRY_TYPE_ACTION : + case this.ENTRY_TYPE_ACTION : type = this.ENTRY_TYPE_HANDLE; idInputSelector = 'input[type="hidden"][name="entryTypeId"]'; break; @@ -280,7 +280,7 @@ type : type, id : idInputSelector ? ($form.find(idInputSelector).val() | 0) : false }; - + }, getFormContext : function ($form) @@ -306,7 +306,7 @@ case this.ASSET_SOURCE_ACTION : case this.CATEGORY_GROUP_ACTION : case this.GLOBAL_SET_ACTION : - case this.ENTRY_TYPE_ACTION : + case this.ENTRY_TYPE_ACTION : case this.TAG_GROUP_ACTION : case this.USERS_FIELDS_ACTION : case this.SOLSPACE_CALENDAR_SETTINGS_ACTION : @@ -315,7 +315,7 @@ case this.FIELDS_ACTION : return this.FIELD_DESIGNER_CONTEXT; - + } return false; @@ -344,4 +344,4 @@ if (window.jQuery) { return false; }; })( jQuery ); -} \ No newline at end of file +}