From 91692e49edab526e532c3e1406424d3cf179ce5c Mon Sep 17 00:00:00 2001
From: Woeler <woeler@woeler.eu>
Date: Fri, 27 Sep 2019 13:45:29 +0200
Subject: [PATCH 1/3] [TASK] Set version to 2.15.3-beta

---
 app/AppKernel.php | 6 +++---
 app/version.txt   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/AppKernel.php b/app/AppKernel.php
index 1a0147f2ebb..4e1e24ad48c 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -34,14 +34,14 @@ class AppKernel extends Kernel
      *
      * @const integer
      */
-    const MINOR_VERSION = 16;
+    const MINOR_VERSION = 15;
 
     /**
      * Patch version number.
      *
      * @const integer
      */
-    const PATCH_VERSION = 0;
+    const PATCH_VERSION = 3;
 
     /**
      * Extra version identifier.
@@ -51,7 +51,7 @@ class AppKernel extends Kernel
      *
      * @const string
      */
-    const EXTRA_VERSION = '-dev';
+    const EXTRA_VERSION = '-beta';
 
     /**
      * @var array
diff --git a/app/version.txt b/app/version.txt
index f9b87778ca2..4cea1055bce 100644
--- a/app/version.txt
+++ b/app/version.txt
@@ -1 +1 @@
-2.16.0-dev
+2.15.3-beta

From f341816b1ee50ee3d67f3938b379aa8ed023798b Mon Sep 17 00:00:00 2001
From: Woeler <woeler@woeler.eu>
Date: Fri, 27 Sep 2019 13:46:31 +0200
Subject: [PATCH 2/3] [TASK] Regenerate production assets

---
 media/js/app.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/media/js/app.js b/media/js/app.js
index e76d3837499..a7874e873da 100644
--- a/media/js/app.js
+++ b/media/js/app.js
@@ -164,8 +164,7 @@ if(customHtml.length){mQuery('[data-theme]').click(function(e){e.preventDefault(
 themeField.val(theme);if(isCodeMode){mQuery('.builder').addClass('code-mode');mQuery('.builder .code-editor').removeClass('hide');mQuery('.builder .code-mode-toolbar').removeClass('hide');mQuery('.builder .builder-toolbar').addClass('hide');}else{mQuery('.builder').removeClass('code-mode');mQuery('.builder .code-editor').addClass('hide');mQuery('.builder .code-mode-toolbar').addClass('hide');mQuery('.builder .builder-toolbar').removeClass('hide');Mautic.setThemeHtml(theme);}
 mQuery('.theme-list .panel').removeClass('theme-selected');currentLink.closest('.panel').addClass('theme-selected');mQuery('.theme-list .select-theme-selected').addClass('hide');mQuery('.theme-list .select-theme-link').removeClass('hide');currentLink.closest('.panel').find('.select-theme-selected').removeClass('hide');currentLink.addClass('hide');});}};Mautic.updateIframeContent=function(iframeId,content,slot){content=content.replace(/^\s*[\r\n]/gm,'');if(iframeId){var iframe=document.getElementById(iframeId);var doc=iframe.contentDocument||iframe.contentWindow.document;doc.open();doc.write(content);doc.close();if('HTML'===doc.all[0].tagName){mQuery(doc.all[0]).removeClass();}}else if(slot){slot.html(content);}};Mautic.setThemeHtml=function(theme){mQuery.get(mQuery('#builder_url').val()+'?template='+theme,function(themeHtml){var textarea=mQuery('textarea.builder-html');textarea.val(themeHtml);});};Mautic.closeBuilder=function(model){var panelHeight=(mQuery('.builder-content').css('right')=='0px')?mQuery('.builder-panel').height():0,panelWidth=(mQuery('.builder-content').css('right')=='0px')?0:mQuery('.builder-panel').width(),spinnerLeft=(mQuery(window).width()-panelWidth-60)/2,spinnerTop=(mQuery(window).height()-panelHeight-60)/2,closeBtn=mQuery('.btn-close-builder'),overlay=mQuery('#builder-overlay'),builder=mQuery('.builder');mQuery('.builder-spinner').css({left:spinnerLeft,top:spinnerTop});overlay.removeClass('hide');closeBtn.prop('disabled',true);mQuery('#builder-errors').hide('fast').text('');try{Mautic.sendBuilderContentToTextarea(function(){if(Mautic.codeMode){Mautic.killLivePreview();Mautic.destroyCodeMirror();delete Mautic.codeMode;}else{if(typeof document.getElementById('builder-template-content').contentWindow.Mautic!=='undefined'){document.getElementById('builder-template-content').contentWindow.Mautic.destroySlots();}
 mQuery('#slot-form-container, #section-form-container').html('');}
-overlay.remove();builder.removeClass('builder-active').addClass('hide');closeBtn.prop('disabled',false);mQuery('body').css('overflow-y','');builder.addClass('hide');Mautic.stopIconSpinPostEvent();mQuery('#builder-template-content').remove();},false);}catch(error){console.error(error);}};Mautic.sendBuilderContentToTextarea=function(callback,keepBuilderContent){var customHtml;try{if(Mautic.codeMode){customHtml=Mautic.builderCodeMirror.getValue();customHtml=Mautic.convertDynamicContentSlotsToTokens(customHtml);mQuery('.builder-html').val(customHtml);callback();}else{var builderHtml=mQuery('iframe#builder-template-content').contents();if(keepBuilderContent){Mautic.cloneHtmlContent(builderHtml,function(themeHtml){Mautic.sanitizeHtmlAndStoreToTextarea(themeHtml);callback();});}else{Mautic.sanitizeHtmlAndStoreToTextarea(builderHtml);callback();}}}catch(error){console.error(error);}}
-Mautic.sanitizeHtmlAndStoreToTextarea=function(html){var cleanHtml=Mautic.sanitizeHtmlBeforeSave(html);mQuery('.builder-html').val(Mautic.domToString(cleanHtml));};Mautic.domToString=function(dom){if(typeof dom==='string'){return dom;}
+overlay.remove();builder.removeClass('builder-active').addClass('hide');closeBtn.prop('disabled',false);mQuery('body').css('overflow-y','');builder.addClass('hide');Mautic.stopIconSpinPostEvent();mQuery('#builder-template-content').remove();},false);}catch(error){console.error(error);}};Mautic.sendBuilderContentToTextarea=function(callback,keepBuilderContent){var customHtml;try{if(Mautic.codeMode){customHtml=Mautic.builderCodeMirror.getValue();customHtml=Mautic.convertDynamicContentSlotsToTokens(customHtml);mQuery('.builder-html').val(customHtml);callback();}else{var builderHtml=mQuery('iframe#builder-template-content').contents();if(keepBuilderContent){Mautic.cloneHtmlContent(builderHtml,function(themeHtml){Mautic.sanitizeHtmlAndStoreToTextarea(themeHtml);callback();});}else{Mautic.sanitizeHtmlAndStoreToTextarea(builderHtml);callback();}}}catch(error){console.error(error);}};Mautic.sanitizeHtmlAndStoreToTextarea=function(html){var cleanHtml=Mautic.sanitizeHtmlBeforeSave(html);mQuery('.builder-html').val(Mautic.domToString(cleanHtml));};Mautic.domToString=function(dom){if(typeof dom==='string'){return dom;}
 var xs=new XMLSerializer();return xs.serializeToString(dom.get(0));};Mautic.sanitizeHtmlBeforeSave=function(htmlContent){htmlContent.find('[data-source="mautic"]').remove();htmlContent.find('.atwho-container').remove();htmlContent.find('.fr-image-overlay, .fr-quick-insert, .fr-tooltip, .fr-toolbar, .fr-popup, .fr-image-resizer').remove();htmlContent.find('[data-slot-focus], [data-section-focus]').remove();var customHtml=Mautic.domToString(htmlContent).replace(/url\(&quot;(.+)&quot;\)/g,'url(\'$1\')');return Mautic.convertDynamicContentSlotsToTokens(customHtml);};Mautic.cloneHtmlContent=function(content,callback){var id='iframe-helper';var iframeHelper=mQuery('<iframe id="'+id+'" />');Mautic.buildBuilderIframe(Mautic.domToString(content),id,function(){callback(mQuery('iframe#'+id).contents());iframeHelper.remove();});}
 Mautic.destroySlots=function(){if(typeof Mautic.builderSlots!=='undefined'&&Mautic.builderSlots.length){mQuery.each(Mautic.builderSlots,function(i,slotParams){mQuery(slotParams.slot).trigger('slot:destroy',slotParams);});delete Mautic.builderSlots;}
 Mautic.builderContents.find('[data-slot-container]').sortable().sortable('destroy');Mautic.builderContents.find('*[class=""]').removeAttr('class');Mautic.builderContents=Mautic.clearFroalaStyles(Mautic.builderContents);Mautic.builderContents.find('*[style="z-index: 2501;"]').removeAttr('style');Mautic.builderContents.find('.fr-toolbar, .fr-line-breaker').remove();var htmlTags=document.getElementsByTagName('html');htmlTags[0].removeAttribute('class');};Mautic.clearFroalaStyles=function(content){mQuery.each(content.find('td, th, table, [fr-original-class], [fr-original-style]'),function(){var el=mQuery(this);if(el.attr('fr-original-class')){el.attr('class',el.attr('fr-original-class'));el.removeAttr('fr-original-class');}
@@ -196,7 +195,8 @@ return Mautic.cloneLink;};Mautic.getSlotFocus=function(){Mautic.builderContents.
 var focusFormHeader=parent.mQuery('#customize-slot-panel').find('.panel-heading h4');var newDynConButton=mQuery('<button/>').css('float','right').addClass('btn btn-success btn-xs');newDynConButton.text('Add Variant');newDynConButton.on('click',function(e){e.stopPropagation();Mautic.createNewDynamicContentFilter('#dynamicContentFilterTabs_'+decId,parent.mQuery);var focusForm=Mautic.cloneFocusForm(decId,false);focusForm.insertAfter(parent.mQuery('#slot_dynamiccontent > div.has-error'));});focusFormHeader.append(newDynConButton);return focusForm;};Mautic.removeAddVariantButton=function(){parent.mQuery('#customize-slot-panel').find('.panel-heading button').remove();Mautic.reattachDEC();};Mautic.reattachDEC=function(){if(typeof Mautic.activeDEC!=='undefined'){var element=Mautic.activeDEC.detach();Mautic.activeDECParent.append(element);}};Mautic.isSlotInitiated=function(slot){if(typeof Mautic.builderSlots==='undefined'||Mautic.builderSlots.length===0)return false;return typeof Mautic.builderSlots.find(function(params){return slot.is(params.slot);})!=='undefined';};Mautic.initSlotListeners=function(){Mautic.activateGlobalFroalaOptions();Mautic.builderSlots=[];Mautic.selectedSlot=null;Mautic.builderContents.on('slot:selected',function(event,slot){slot=mQuery(slot);Mautic.builderContents.find('[data-slot-focus]').remove();mQuery(slot).append(Mautic.getSlotFocus());});Mautic.builderContents.on('slot:init',function(event,slot){slot=mQuery(slot);var type=slot.attr('data-slot');if(Mautic.isSlotInitiated(slot))return;var slotToolbar=Mautic.getSlotToolbar(type);var deleteLink=Mautic.getSlotDeleteLink();var cloneLink=Mautic.getSlotCloneLink();var focus=Mautic.getSlotFocus();slot.hover(function(e){e.stopPropagation();slotToolbar=Mautic.getSlotToolbar(type);focus=Mautic.getSlotFocus();if(Mautic.sortActive){return;}
 if(slot.html()==''){slot.addClass('empty');}else{slot.removeClass('empty');}
 slot.append(focus);deleteLink.click(function(e){if(type=='dynamicContent'){var dynConId=slot.attr('data-param-dec-id');dynConId='#emailform_dynamicContent_'+dynConId;var dynConTarget=parent.mQuery(dynConId);dynConTarget.find(dynConId+'_tokenName').val('');}
-slot.trigger('slot:destroy',{slot:slot,type:type});mQuery.each(Mautic.builderSlots,function(i,slotParams){if(slotParams.slot.is(slot)){Mautic.builderSlots.splice(i,1);return false;}});slot.remove();focus.remove();});cloneLink.click(function(e){slot.clone().insertAfter(slot);Mautic.initSlots(slot.closest('[data-slot-container="1"]'));});if(slot.offset().top<25){slotToolbar.css('top','0');}else{slotToolbar.css('top','-24px');}
+slot.trigger('slot:destroy',{slot:slot,type:type});mQuery.each(Mautic.builderSlots,function(i,slotParams){if(slotParams.slot.is(slot)){Mautic.builderSlots.splice(i,1);return false;}});slot.remove();focus.remove();});cloneLink.click(function(e){if(type=='dynamicContent'){var maxId=Mautic.getDynamicContentMaxId();slot.clone().attr('data-param-dec-id',maxId+1).insertAfter(slot);Mautic.createNewDynamicContentItem(parent.mQuery);}else{slot.clone().insertAfter(slot);}
+Mautic.initSlots(slot.closest('[data-slot-container="1"]'));});if(slot.offset().top<25){slotToolbar.css('top','0');}else{slotToolbar.css('top','-24px');}
 slot.append(slotToolbar);},function(){if(Mautic.sortActive){return;}
 slotToolbar.remove();focus.remove();});slot.on('click',function(e){e.stopPropagation();Mautic.deleteCodeModeSlot();Mautic.removeAddVariantButton();var clickedSlot=mQuery(this);clickedSlot.trigger('slot:selected',clickedSlot);var minicolors=parent.mQuery('#slot-form-container .minicolors');if(minicolors.length){parent.mQuery('#slot-form-container input[data-toggle="color"]').each(function(){mQuery(this).minicolors('destroy');});parent.mQuery('#slot-form-container').off('change.minicolors');}
 if(parent.mQuery('#slot-form-container').find('textarea.editor')){parent.mQuery('#slot-form-container').find('textarea.editor').each(function(){parent.mQuery(this).froalaEditor('popups.hideAll');});}
@@ -210,8 +210,7 @@ break;}}
 focusForm.find('textarea.editor').each(function(){var theEditor=this;var slotHtml=parent.mQuery('<div/>').html(clickedSlot.html());slotHtml.find('[data-slot-focus]').remove();slotHtml.find('[data-slot-toolbar]').remove();var buttons=['undo','redo','|','bold','italic','underline','paragraphFormat','fontFamily','fontSize','color','align','formatOL','formatUL','quote','clearFormatting','token','insertLink','insertImage','insertGatedVideo','insertTable','html','fullscreen'];var builderEl=parent.mQuery('.builder');var froalaOptions={toolbarButtons:buttons,toolbarButtonsMD:buttons,toolbarButtonsSM:buttons,toolbarButtonsXS:buttons,toolbarSticky:false,linkList:[],imageEditButtons:['imageReplace','imageAlign','imageRemove','imageAlt','imageSize','|','imageLink','linkOpen','linkEdit','linkRemove']};if(builderEl.length&&builderEl.hasClass('email-builder')){buttons=parent.mQuery.grep(buttons,function(value){return value!='insertGatedVideo';});froalaOptions.imageOutputSize=true;}
 if(focusType!=='dynamicContent'){parent.mQuery(this).on('froalaEditor.initialized',function(e,editor){parent.Mautic.initAtWho(editor.$el,parent.Mautic.getBuilderTokensMethod(),editor);Mautic.setTextSlotEditorStyle(editor.$el,clickedSlot);});}
 parent.mQuery(this).on('froalaEditor.contentChanged',function(e,editor){var slotHtml=mQuery('<div/>').append(editor.html.get());if(!(focusType=='dynamicContent'&&mQuery(this).attr('id').match(/filters/))){clickedSlot.html(slotHtml.html());}});if(!(focusType=='dynamicContent'&&mQuery(this).attr('id').match(/filters/))){parent.mQuery(this).val(slotHtml.html());}
-parent.mQuery(this).froalaEditor(parent.mQuery.extend({},Mautic.basicFroalaOptions,froalaOptions));});});if(type==='image'||type==='imagecaption'||type==='imagecard'){var image=slot.find('img');image.removeAttr('data-froala.editor');image.on('froalaEditor.click',function(e,editor){slot.closest('[data-slot]').trigger('click');});var froalaOptions=mQuery.extend({},Mautic.basicFroalaOptions,{linkList:[],imageEditButtons:['imageReplace','imageAlign','imageAlt','imageSize','|','imageLink','linkOpen','linkEdit','linkRemove'],useClasses:false});image.froalaEditor(froalaOptions);}else if(type==='button'){slot.find('a').click(function(e){e.preventDefault();});}else if(type==='dynamicContent'){if(slot.html().match(/__dynamicContent__/)){var decs=mQuery('[data-slot="dynamicContent"]');var ids=mQuery.map(decs,function(e){return mQuery(e).attr('data-param-dec-id');})
-var maxId=Math.max.apply(Math,ids);if(isNaN(maxId)||Number.NEGATIVE_INFINITY==maxId)maxId=0;slot.attr('data-param-dec-id',maxId+1);slot.html('Dynamic Content');Mautic.createNewDynamicContentItem(parent.mQuery);}}
+parent.mQuery(this).froalaEditor(parent.mQuery.extend({},Mautic.basicFroalaOptions,froalaOptions));});});if(type==='image'||type==='imagecaption'||type==='imagecard'){var image=slot.find('img');image.removeAttr('data-froala.editor');image.on('froalaEditor.click',function(e,editor){slot.closest('[data-slot]').trigger('click');});var froalaOptions=mQuery.extend({},Mautic.basicFroalaOptions,{linkList:[],imageEditButtons:['imageReplace','imageAlign','imageAlt','imageSize','|','imageLink','linkOpen','linkEdit','linkRemove'],useClasses:false});image.froalaEditor(froalaOptions);}else if(type==='button'){slot.find('a').click(function(e){e.preventDefault();});}else if(type==='dynamicContent'){if(slot.html().match(/__dynamicContent__/)){var maxId=Mautic.getDynamicContentMaxId();slot.attr('data-param-dec-id',maxId+1);slot.html('Dynamic Content');Mautic.createNewDynamicContentItem(parent.mQuery);}}
 Mautic.builderSlots.push({slot:slot,type:type});});Mautic.getPredefinedLinks=function(callback){var linkList=[];Mautic.getTokens(Mautic.getBuilderTokensMethod(),function(tokens){if(tokens.length){mQuery.each(tokens,function(token,label){if(token.startsWith('{pagelink=')||token.startsWith('{assetlink=')||token.startsWith('{webview_url')||token.startsWith('{unsubscribe_url')){linkList.push({text:label,href:token});}});}
 return callback(linkList);});};Mautic.builderContents.on('slot:change',function(event,params){var fieldParam=params.field.attr('data-slot-param');var type=params.type;if(type!=="dynamicContent"){Mautic.removeAddVariantButton();}
 Mautic.clearSlotFormError(fieldParam);if(fieldParam==='padding-top'||fieldParam==='padding-bottom'){params.slot.css(fieldParam,params.field.val()+'px');}else if('label-text'===fieldParam){params.slot.find('label.control-label').text(params.field.val());}else if('label-text1'===fieldParam){params.slot.find('label.label1').text(params.field.val());}else if('label-text2'===fieldParam){params.slot.find('label.label2').text(params.field.val());}else if('label-text3'===fieldParam){params.slot.find('label.label3').text(params.field.val());}else if('label-text4'===fieldParam){params.slot.find('label.label4').text(params.field.val());}else if('glink'===fieldParam||'flink'===fieldParam||'tlink'===fieldParam){params.slot.find('#'+fieldParam).attr('href',params.field.val());}else if(fieldParam==='href'){params.slot.find('a').eq(0).attr('href',params.field.val());}else if(fieldParam==='link-text'){params.slot.find('a').eq(0).text(params.field.val());}else if(fieldParam==='float'){var values=['left','center','right'];params.slot.find('a').parent().attr('align',values[params.field.val()]);}else if(fieldParam==='caption'){params.slot.find('figcaption').text(params.field.val());}else if(fieldParam==='cardcaption'){params.slot.find('td.imagecard-caption').text(params.field.val());}else if(fieldParam==='text-align'){var values=['left','center','right'];if(type==='imagecard'){params.slot.find('.imagecard-caption').css(fieldParam,values[params.field.val()]);}else if(type==='imagecaption'){params.slot.find('figcaption').css(fieldParam,values[params.field.val()]);}}else if(fieldParam==='align'){Mautic.builderContents.find('[data-slot-focus]').each(function(){var focusedSlot=mQuery(this).closest('[data-slot]');if(focusedSlot.attr('data-slot')=='image'){focusedSlot.find('img').each(function(){mQuery(this).froalaEditor('popups.hideAll');});Mautic.builderContents.find('.fr-image-resizer.fr-active').removeClass('fr-active');}});var values=['left','center','right'];if('socialfollow'===type){params.slot.find('div.socialfollow').css('text-align',values[params.field.val()]);}else if('imagecaption'===type){params.slot.find('figure').css('text-align',values[params.field.val()]);}else if('imagecard'===type){params.slot.find('td.imagecard-image').css('text-align',values[params.field.val()]);}else{params.slot.find('img').closest('div').css('text-align',values[params.field.val()]);}}else if(fieldParam==='border-radius'){params.slot.find('a.button').css(fieldParam,params.field.val()+'px');}else if(fieldParam==='button-size'){var bg_clr=params.slot.attr('data-param-background-color');var values=[{borderWidth:'10px 20px',padding:'0',fontSize:'14px',borderColor:bg_clr,borderStyle:'solid'},{borderWidth:'20px 23px',padding:'0',fontSize:'20px',borderColor:bg_clr,borderStyle:'solid'},{borderWidth:'25px 40px',padding:'0',fontSize:'30px',borderColor:bg_clr,borderStyle:'solid'}];params.slot.find('a.button').css(values[params.field.val()]);}else if(fieldParam==='caption-color'){params.slot.find('.imagecard-caption').css('background-color','#'+params.field.val());}else if(fieldParam==='background-color'||fieldParam==='color'){var matches=params.field.val().match(/^#?([0-9a-f]{6}|[0-9a-f]{3})$/);if(matches!==null){var color=matches[1];if(fieldParam==='background-color'){if('imagecard'===type){params.slot.find('.imagecard').css(fieldParam,'#'+color);}else{params.slot.find('a.button').css(fieldParam,'#'+color);params.slot.find('a.button').attr('background','#'+color);params.slot.find('a.button').css('border-color','#'+color);}}else if(fieldParam==='color'){if('imagecard'===type){params.slot.find('.imagecard-caption').css(fieldParam,'#'+color);}else if('imagecaption'===type){params.slot.find('figcaption').css(fieldParam,'#'+color);}else{params.slot.find('a.button').css(fieldParam,'#'+color);}}}}else if(/gatedvideo/.test(fieldParam)){var toInsert=fieldParam.split('-')[1];var insertVal=params.field.val();if(toInsert==='url'){var videoProvider=Mautic.getVideoProvider(insertVal);if(videoProvider==null){Mautic.slotFormError(fieldParam,'Please enter a valid YouTube, Vimeo, or MP4 url.');}else{params.slot.find('source').attr('src',insertVal).attr('type',videoProvider);}}else if(toInsert==='gatetime'){params.slot.find('video').attr('data-gate-time',insertVal);}else if(toInsert==='formid'){params.slot.find('video').attr('data-form-id',insertVal);}else if(toInsert==='height'){params.slot.find('video').attr('height',insertVal);}else if(toInsert==='width'){params.slot.find('video').attr('width',insertVal);}}else if(fieldParam==='separator-color'){params.slot.find('hr').css('border-color','#'+params.field.val());}else if(fieldParam==='separator-thickness'){var sep_color=params.slot.attr('data-param-separator-color');params.slot.find('hr').css('border',params.field.val()+'px solid #'+sep_color);}
@@ -235,7 +234,7 @@ return{id:parseInt(dynConTarget.replace(/[^0-9]/g,'')),content:dynConContent};}
 return null;};Mautic.convertDynamicContentSlotsToTokens=function(builderHtml){var dynConSlots=mQuery(builderHtml).find('[data-slot="dynamicContent"]');if(dynConSlots.length){dynConSlots.each(function(i){var $this=mQuery(this);var dynConNum=$this.attr('data-param-dec-id');var dynConId='#emailform_dynamicContent_'+dynConNum;var dynConTarget=mQuery(dynConId);var dynConName=dynConTarget.find(dynConId+'_tokenName').val();var dynConToken='{dynamiccontent="'+dynConName+'"}';if(!Mautic.builderTokens.hasOwnProperty(dynConToken)){Mautic.builderTokens[dynConToken]=dynConName;}
 var parser=new DOMParser();var el=parser.parseFromString(builderHtml,"text/html");var $b=mQuery(el);$b.find('div[data-param-dec-id='+dynConNum+']').replaceWith(dynConToken);builderHtml=Mautic.domToString($b);if($this.parent().hasClass('atwho-inserted')){var toReplace=$this.parent('.atwho-inserted').get(0).outerHTML;builderHtml=builderHtml.replace(toReplace,dynConToken);}});}
 return builderHtml;};Mautic.getPredefinedLinks=function(callback){var linkList=[];Mautic.getTokens(Mautic.getBuilderTokensMethod(),function(tokens){if(tokens.length){mQuery.each(tokens,function(token,label){if(token.startsWith('{pagelink=')||token.startsWith('{assetlink=')||token.startsWith('{webview_url')||token.startsWith('{unsubscribe_url')){linkList.push({text:label,href:token});}});}
-return callback(linkList);});};mQuery(function(){if(parent&&parent.mQuery&&parent.mQuery('#builder-template-content').length){Mautic.builderContents=mQuery('body');if(!parent.Mautic.codeMode){Mautic.initSlotListeners();Mautic.initSections();Mautic.initSlots();}}});;Mautic.getAbTestWinnerForm=function(bundle,formName,abKey){if(abKey&&mQuery(abKey).val()&&mQuery(abKey).closest('.form-group').hasClass('has-error')){mQuery(abKey).closest('.form-group').removeClass('has-error');if(mQuery(abKey).next().hasClass('help-block')){mQuery(abKey).next().remove();}}
+return callback(linkList);});};Mautic.getDynamicContentMaxId=function(){var decs=mQuery('[data-slot="dynamicContent"]');var ids=mQuery.map(decs,function(e){return mQuery(e).attr('data-param-dec-id');});var maxId=Math.max.apply(Math,ids);if(isNaN(maxId)||Number.NEGATIVE_INFINITY===maxId)maxId=0;return maxId;};mQuery(function(){if(parent&&parent.mQuery&&parent.mQuery('#builder-template-content').length){Mautic.builderContents=mQuery('body');if(!parent.Mautic.codeMode){Mautic.initSlotListeners();Mautic.initSections();Mautic.initSlots();}}});;Mautic.getAbTestWinnerForm=function(bundle,formName,abKey){if(abKey&&mQuery(abKey).val()&&mQuery(abKey).closest('.form-group').hasClass('has-error')){mQuery(abKey).closest('.form-group').removeClass('has-error');if(mQuery(abKey).next().hasClass('help-block')){mQuery(abKey).next().remove();}}
 Mautic.activateLabelLoadingIndicator(formName+'_variantSettings_winnerCriteria');var id=mQuery('#'+formName+'_sessionId').val();var query="action="+bundle+":getAbTestForm&abKey="+mQuery(abKey).val()+"&id="+id;mQuery.ajax({url:mauticAjaxUrl,type:"POST",data:query,dataType:"json",success:function(response){if(typeof response.html!='undefined'){if(mQuery('#'+formName+'_variantSettings_properties').length){mQuery('#'+formName+'_variantSettings_properties').replaceWith(response.html);}else{mQuery('#'+formName+'_variantSettings').append(response.html);}
 if(response.html!=''){Mautic.onPageLoad('#'+formName+'_variantSettings_properties',response);}}},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);},complete:function(){Mautic.removeLabelLoadingIndicator();}});};;mQuery(document).on({"chosen:hiding_dropdown":function(){mQuery('#app-wrapper').css('overflow','hidden');},"chosen:showing_dropdown":function(){mQuery('#app-wrapper').css('overflow','visible');}});Mautic.renameFormElements=function(container,oldIdPrefix,oldNamePrefix,newIdPrefix,newNamePrefix){mQuery('*[id^="'+oldIdPrefix+'"]',container).each(function(){var id=mQuery(this).attr('id');id=id.replace(oldIdPrefix,newIdPrefix);mQuery(this).attr('id',id);var name=mQuery(this).attr('name');if(name){name=name.replace(oldNamePrefix,newNamePrefix);mQuery(this).attr('name',name);}});mQuery('label[for^="'+oldIdPrefix+'"]',container).each(function(){var id=mQuery(this).attr('for');id=id.replace(oldIdPrefix,newIdPrefix);mQuery(this).attr('for',id);});};Mautic.ajaxifyForm=function(formName){Mautic.initializeFormFieldVisibilitySwitcher(formName);var form='form[name="'+formName+'"]';mQuery(form+' input, '+form+' select').off('keydown.ajaxform');mQuery(form+' input, '+form+' select').on('keydown.ajaxform',function(e){if(e.keyCode==13&&(e.metaKey||e.ctrlKey)){if(MauticVars.formSubmitInProgress){return false;}
 var saveButton=mQuery(form).find('button.btn-save');var applyButton=mQuery(form).find('button.btn-apply');var modalParent=mQuery(form).closest('.modal');var inMain=mQuery(modalParent).length>0?false:true;if(mQuery(saveButton).length){if(inMain){if(mQuery(form).find('button.btn-save.btn-copy').length){mQuery(mQuery(form).find('button.btn-save.btn-copy')).trigger('click');return;}}else{if(mQuery(modalParent).find('button.btn-save.btn-copy').length){mQuery(mQuery(modalParent).find('button.btn-save.btn-copy')).trigger('click');return;}}
@@ -626,7 +625,8 @@ function setLabelText(slot,querySelector,text){var labels=slot.querySelectorAll(
 var callback=function(){var slots=document.querySelectorAll('div[data-slot="segmentlist"], div[data-slot="categorylist"], div[data-slot="preferredchannel"], div[data-slot="channelfrequency"],div[data-slot="saveprefsbutton"]');for(var i=0;i<slots.length;i++){replaceSlotParams(slots[i]);}};if(document.readyState==="complete"||!(document.readyState==="loading"||document.documentElement.doScroll)){callback();}else{document.addEventListener("DOMContentLoaded",callback);}
 function togglePreferredChannel(channel){var status=document.getElementById(channel).checked;if(status){document.getElementById('lead_contact_frequency_rules_frequency_number_'+channel).disabled=false;document.getElementById('lead_contact_frequency_rules_frequency_time_'+channel).disabled=false;document.getElementById('lead_contact_frequency_rules_contact_pause_start_date_'+channel).disabled=false;document.getElementById('lead_contact_frequency_rules_contact_pause_end_date_'+channel).disabled=false;}else{document.getElementById('lead_contact_frequency_rules_frequency_number_'+channel).disabled=true;document.getElementById('lead_contact_frequency_rules_frequency_time_'+channel).disabled=true;document.getElementById('lead_contact_frequency_rules_contact_pause_start_date_'+channel).disabled=true;document.getElementById('lead_contact_frequency_rules_contact_pause_end_date_'+channel).disabled=true;}}
 function saveUnsubscribePreferences(formId){var forms=document.getElementsByName(formId);for(var i=0;i<forms.length;i++){if(forms[i].tagName==='FORM'){forms[i].submit();}}}};Mautic.matchedFields=function(index,object,integration){var compoundMauticFields=['mauticContactId','mauticContactTimelineLink'];if(mQuery('#integration_details_featureSettings_updateDncByDate_0').is(':checked')){compoundMauticFields.push('mauticContactIsContactableByEmail');}
-var integrationField=mQuery('#integration_details_featureSettings_'+object+'Fields_i_'+index).attr('data-value');var mauticField=mQuery('#integration_details_featureSettings_'+object+'Fields_m_'+index+' option:selected').val();if(mQuery.inArray(mauticField,compoundMauticFields)>=0){mQuery('.btn-arrow'+index).removeClass('active');mQuery('#integration_details_featureSettings_'+object+'Fields_update_mautic'+index+'_0').attr('checked','checked');mQuery('input[name="integration_details[featureSettings]['+object+'Fields][update_mautic'+index+']"]').prop('disabled',true).trigger("chosen:updated");mQuery('.btn-arrow'+index).addClass('disabled');}else{mQuery('input[name="integration_details[featureSettings]['+object+'Fields][update_mautic'+index+']"]').prop('disabled',false).trigger("chosen:updated");mQuery('.btn-arrow'+index).removeClass('disabled');}
+var integrationField=mQuery('#integration_details_featureSettings_'+object+'Fields_i_'+index).attr('data-value');var mauticField=mQuery('#integration_details_featureSettings_'+object+'Fields_m_'+index+' option:selected').val();if(mQuery('.btn-arrow'+index).parent().attr('data-force-direction')!=1){if(mQuery.inArray(mauticField,compoundMauticFields)>=0){mQuery('.btn-arrow'+index).removeClass('active');mQuery('#integration_details_featureSettings_'+object+'Fields_update_mautic'+index+'_0').attr('checked','checked');mQuery('input[name="integration_details[featureSettings]['+object+'Fields][update_mautic'+index+']"]').prop('disabled',true).trigger("chosen:updated");mQuery('.btn-arrow'+index).addClass('disabled');}
+else{mQuery('input[name="integration_details[featureSettings]['+object+'Fields][update_mautic'+index+']"]').prop('disabled',false).trigger("chosen:updated");mQuery('.btn-arrow'+index).removeClass('disabled');}}
 if(object=='lead'){var updateMauticField=mQuery('input[name="integration_details[featureSettings]['+object+'Fields][update_mautic'+index+']"]:checked').val();}else{var updateMauticField=mQuery('input[name="integration_details[featureSettings]['+object+'Fields][update_mautic_company'+index+']"]:checked').val();}
 Mautic.ajaxActionRequest('plugin:matchFields',{object:object,integration:integration,integrationField:integrationField,mauticField:mauticField,updateMautic:updateMauticField},function(response){var theMessage=(response.success)?'<i class="fa fa-check-circle text-success"></i>':'';mQuery('#matched-'+index+"-"+object).html(theMessage);});};Mautic.initiateIntegrationAuthorization=function(){mQuery('#integration_details_in_auth').val(1);Mautic.postForm(mQuery('form[name="integration_details"]'),'loadIntegrationAuthWindow');};Mautic.loadIntegrationAuthWindow=function(response){if(response.newContent){Mautic.processModalContent(response,'#IntegrationEditModal');}else{Mautic.stopPageLoadingBar();Mautic.stopIconSpinPostEvent();mQuery('#integration_details_in_auth').val(0);if(response.authUrl){var generator=window.open(response.authUrl,'integrationauth','height=500,width=500');if(!generator||generator.closed||typeof generator.closed=='undefined'){alert(mauticLang.popupBlockerMessage);}}}};Mautic.refreshIntegrationForm=function(){var opener=window.opener;if(opener){var form=opener.mQuery('form[name="integration_details"]');if(form.length){var action=form.attr('action');if(action){opener.Mautic.startModalLoadingBar('#IntegrationEditModal');opener.Mautic.loadAjaxModal('#IntegrationEditModal',action);}}}
 window.close()};Mautic.integrationOnLoad=function(container,response){if(response&&response.name){var integration='.integration-'+response.name;if(response.enabled){mQuery(integration).removeClass('integration-disabled');}else{mQuery(integration).addClass('integration-disabled');}}else{Mautic.filterIntegrations();}

From 4b2e397a94474fa9aad533ea434ed8e29ca986ff Mon Sep 17 00:00:00 2001
From: Woeler <woeler@woeler.eu>
Date: Fri, 27 Sep 2019 14:14:29 +0200
Subject: [PATCH 3/3] [TASK] Bump version

---
 app/AppKernel.php | 6 +++---
 app/version.txt   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/AppKernel.php b/app/AppKernel.php
index 4e1e24ad48c..1a0147f2ebb 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -34,14 +34,14 @@ class AppKernel extends Kernel
      *
      * @const integer
      */
-    const MINOR_VERSION = 15;
+    const MINOR_VERSION = 16;
 
     /**
      * Patch version number.
      *
      * @const integer
      */
-    const PATCH_VERSION = 3;
+    const PATCH_VERSION = 0;
 
     /**
      * Extra version identifier.
@@ -51,7 +51,7 @@ class AppKernel extends Kernel
      *
      * @const string
      */
-    const EXTRA_VERSION = '-beta';
+    const EXTRA_VERSION = '-dev';
 
     /**
      * @var array
diff --git a/app/version.txt b/app/version.txt
index 4cea1055bce..f9b87778ca2 100644
--- a/app/version.txt
+++ b/app/version.txt
@@ -1 +1 @@
-2.15.3-beta
+2.16.0-dev