diff --git a/wire/modules/AdminTheme/AdminThemeReno/AdminThemeRenoHelpers.php b/wire/modules/AdminTheme/AdminThemeReno/AdminThemeRenoHelpers.php
index 1251d0be..547a7609 100644
--- a/wire/modules/AdminTheme/AdminThemeReno/AdminThemeRenoHelpers.php
+++ b/wire/modules/AdminTheme/AdminThemeReno/AdminThemeRenoHelpers.php
@@ -354,8 +354,8 @@ class AdminThemeRenoHelpers extends AdminThemeDefaultHelpers {
$adminTheme = $this->wire('adminTheme');
$field_name = "userFields_". $user->template->name;
- trim($adminTheme->$field_name) == '' ? $adminTheme->$field_name = 'name' : ''; // force to name field if empty
- $userFields = explode(',', $adminTheme->$field_name);
+ trim("$adminTheme->$field_name") == '' ? $adminTheme->$field_name = 'name' : ''; // force to name field if empty
+ $userFields = explode(',', "$adminTheme->$field_name");
foreach($userFields as $f){
$f = trim($f);
@@ -389,4 +389,4 @@ class AdminThemeRenoHelpers extends AdminThemeDefaultHelpers {
return $out;
}
-}
\ No newline at end of file
+}
diff --git a/wire/modules/Inputfield/InputfieldAsmSelect/asmselect/jquery.asmselect.js b/wire/modules/Inputfield/InputfieldAsmSelect/asmselect/jquery.asmselect.js
index 0f127407..126c6c28 100644
--- a/wire/modules/Inputfield/InputfieldAsmSelect/asmselect/jquery.asmselect.js
+++ b/wire/modules/Inputfield/InputfieldAsmSelect/asmselect/jquery.asmselect.js
@@ -616,7 +616,7 @@
*/
function enableSelectOption($option) {
- $option.removeClass(options.optionDisabledClass).attr("disabled", false);
+ $option.removeClass(options.optionDisabledClass).prop("disabled", false);
if(options.hideWhenEmpty) $select.show();
if(options.hideWhenAdded) $option.show();
diff --git a/wire/modules/Inputfield/InputfieldAsmSelect/asmselect/jquery.asmselect.min.js b/wire/modules/Inputfield/InputfieldAsmSelect/asmselect/jquery.asmselect.min.js
index 2366bc0d..9d7fe97c 100644
--- a/wire/modules/Inputfield/InputfieldAsmSelect/asmselect/jquery.asmselect.min.js
+++ b/wire/modules/Inputfield/InputfieldAsmSelect/asmselect/jquery.asmselect.min.js
@@ -1 +1 @@
-(function($){$.fn.asmSelect=function(customOptions){var options={listType:"ol",sortable:false,addable:true,deletable:true,highlight:false,fieldset:false,animate:false,addItemTarget:"bottom",hideWhenAdded:false,hideWhenEmpty:false,debugMode:false,jQueryUI:true,hideDeleted:true,deletedOpacity:.5,deletedPrepend:"-",useSelect2:true,removeWhenAdded:false,highlightTag:"",sortLabel:'↕',removeLabel:'×',highlightAddedLabel:"Added: ",highlightRemovedLabel:"Removed: ",containerClass:"asmContainer",selectClass:"asmSelect",optionDisabledClass:"asmOptionDisabled",listClass:"asmList",listSortableClass:"asmListSortable",listItemClass:"asmListItem",listItemLabelClass:"asmListItemLabel",listItemDescClass:"asmListItemDesc",listItemStatusClass:"asmListItemStatus",listItemHandleClass:"asmListItemHandle",removeClass:"asmListItemRemove",editClass:"asmListItemEdit",highlightClass:"asmHighlight",deletedClass:"asmListItemDeleted",editLink:"",editLabel:'',editLinkOnlySelected:true,editLinkModal:true,editLinkButtonSelector:"form button.ui-button:visible",optionParentClass:"asmParent",optionParentIcon:"⬇",optionChildAttr:"data-asmParent",optionParentOpenClass:"asmParentOpen",optionChildClass:"asmChild",optionChildIndent:" ",optionParentLabel:"← Click again to make selection"};$.extend(options,customOptions);return this.each(function(index){var $original=$(this);var $container;var $select;var $select2=null;var $ol;var buildingSelect=false;var ieClick=false;var ignoreOriginalChangeEvent=false;var fieldsetCloseItems={};var msie=0;var $highlightSpan=null;function init(){if(options.deletable&&!options.addable)options.hideDeleted=false;$original.find("option[selected]").addClass("asmOriginalSelected");while($("#"+options.containerClass+index).length>0)index++;$select=$("").addClass(options.selectClass).addClass($original.attr("class")).attr("name",options.selectClass+index).attr("id",options.selectClass+index);if(!options.addable)$select.hide();$selectRemoved=$("");$ol=$("<"+options.listType+">").addClass(options.listClass).attr("id",options.listClass+index);$container=$("").addClass(options.containerClass).attr("id",options.containerClass+index);buildSelect();$select.on("change",selectChangeEvent).on("click",selectClickEvent);$original.on("change",originalChangeEvent).wrap($container).before($select).before($ol);if(options.sortable)makeSortable();if(options.fieldset){setupFieldsets();$original.children("option").each(function(){var name=$(this).text();if(name.indexOf("_END")>0&&name.substring(name.length-4)=="_END"){fieldsetCloseItems[name]=$(this)}})}$original.trigger("init");if(options.editLinkModal==="longclick"){$ol.on("longclick","a.asmEditLinkModalLongclick",clickEditLink)}if($select2&&$select2.length){$select2.addClass($select.attr("class")).removeClass("asmSelect").attr("id",$select.attr("id")+"-helper").hide();$select.after($select2)}}function makeSortable(){var fieldsetItems=[];var sortableUpdate=function($ul,e,data){var $option=$("#"+data.item.attr("rel"));var updatedOptionId=$option.attr("id");$ul.children("li").each(function(n){$option=$("#"+$(this).attr("rel"));$original.append($option)});if(updatedOptionId){triggerOriginalChange(updatedOptionId,"sort")}};$ol.sortable({items:"li."+options.listItemClass,axis:"y",cancel:"a.asmEditLinkModalLongclick",update:function(e,data){if(data.item.hasClass("asmFieldsetStart"))return;sortableUpdate(jQuery(this),e,data);$ol.trigger("sorted",[data.item])},start:function(e,data){if(options.jQueryUI)data.item.addClass("ui-state-highlight");if(data.item.hasClass("asmFieldsetStart")){var $next=data.item;var stopName=data.item.find("."+options.listItemLabelClass).text()+"_END";do{if($next.find("."+options.listItemLabelClass).text()==stopName)break;$next=$next.next("li");if($next.length&&!$next.hasClass("ui-sortable-placeholder")){$next.fadeTo(50,.7).slideUp("fast");fieldsetItems.push($next)}}while($next.length)}},stop:function(e,data){if(options.jQueryUI)data.item.removeClass("ui-state-highlight");if(data.item.hasClass("asmFieldsetStart")){var $lastItem=data.item;for(var n=0;n0&&msie<7&&!ieClick)return;var $select=$(this);var $option=$select.children("option:selected");if($highlightSpan&&$highlightSpan.length)$highlightSpan.remove();if(!$option.attr("value").length)return false;if($option.hasClass(options.optionParentClass)){parentOptionSelected($select,$option);e.stopPropagation();return false}var id=$option.slice(0,1).attr("rel");addListItem(id);ieClick=false;triggerOriginalChange(id,"add");if($option.hasClass(options.optionChildClass)){childOptionSelected($select,$option)}}function parentOptionSelected($select,$option){var $sel=$select;var isOpenParent=$option.hasClass(options.optionParentOpenClass);if(options.useSelect2&&!isOpenParent)$sel=getSelect2();var $children=$sel.find("option."+options.optionChildClass+"["+options.optionChildAttr+"='"+$option.attr("value")+"']");var parentHTML=$option.html();var openLabel=" +"+$children.filter(":not(:disabled)").length+" "+options.optionParentIcon;if(isOpenParent){hideSelectOptions($children);parentHTML=parentHTML.replace(/\+\d+ ./,"");$option.removeClass(options.optionParentOpenClass).prop("selected",false)}else{var indent=options.optionChildIndent;if($option.hasClass(options.optionChildClass))indent+=indent;$children.each(function(){var $child=$(this);var childHTML=$child.html();if(childHTML.indexOf(options.optionChildIndent)!==0){$child.html(indent+childHTML)}});showSelectOptions($children,$option);$select.find(":selected").prop("selected",false);if(!$option.hasClass(options.optionChildClass)){$select.find("."+options.optionParentOpenClass).each(function(){$(this).prop("selected",true).trigger("change")})}$option.addClass(options.optionParentOpenClass).prop("selected",true);parentHTML+=openLabel;var highlightOption=options.highlight;options.highlight=true;setHighlight(null,options.optionParentLabel,true);if(!highlightOption)options.highlight=false}$option.html(parentHTML)}function childOptionSelected($select,$option){$select.find("option[value='"+$option.attr(options.optionChildAttr)+"']").prop("selected",true)}function selectClickEvent(){ieClick=true}function originalChangeEvent(e){if(ignoreOriginalChangeEvent){ignoreOriginalChangeEvent=false;return}$select.empty();if(options.useSelect2&&$select2)$select2.empty();$ol.empty();buildSelect();if(typeof $.browser!="undefined"){if($.browser.opera)$ol.hide().fadeIn("fast")}if(options.fieldset)setupFieldsets()}function buildSelect(){buildingSelect=true;var title=$original.attr("title");var numActive=0;if(title===undefined)title="";$select.prepend("");$original.children("option").each(function(n){var $t=$(this);var id;if(!$t.attr("id"))$t.attr("id","asm"+index+"option"+n);id=$t.attr("id");if($t.is(":selected")){addListItem(id);addSelectOption(id,true)}else if($t.is(":disabled")){addSelectOption(id,true)}else{numActive++;addSelectOption(id)}});if(!options.debugMode)$original.hide();selectFirstItem();if(options.hideWhenEmpty){if(numActive>0)$select.show();else $select.hide()}buildingSelect=false}function addSelectOption(optionId,disabled){if(typeof disabled=="undefined")disabled=false;var $O=$("#"+optionId);var data_asmParent=options.optionChildAttr;var $option=$("").val($O.val()).attr("rel",optionId);if($O.hasClass(options.optionParentClass)){$option.addClass(options.optionParentClass)}if(disabled)disableSelectOption($option);if($O.attr(data_asmParent)){$option.addClass(options.optionChildClass);$option.attr(data_asmParent,$O.attr(data_asmParent));if(options.useSelect2){var $sel2=getSelect2();$sel2.append($option)}else{hideSelectOptions($option);$select.append($option)}}else{$select.append($option)}}function getSelect2(){if($select2&&$select2.length)return $select2;$select2=$("");return $select2}function hideSelectOptions($options){$options.each(function(){var $option=$(this);if(options.useSelect2){var $sel2=getSelect2();$sel2.append($option);if($option.hasClass(options.optionParentOpenClass)){hideSelectOptions($select.children("option."+options.optionChildClass+"["+options.optionChildAttr+'="'+$option.attr("value")+'"]'))}}else{$option.attr("hidden","hidden")}})}function showSelectOptions($options,$afterOption){$options.each(function(){var $option=$(this);if(options.useSelect2){if(typeof $afterOption!="undefined"){$afterOption.after($option);$afterOption=$option}else{$select.append($option)}}else{$option.removeAttr("hidden")}})}function selectFirstItem(){$select.children().first().prop("selected",true)}function disableSelectOption($option){$option.addClass(options.optionDisabledClass).prop("selected",false).prop("disabled",true);if(options.hideWhenEmpty){if($option.siblings("[disabled!=true]").length<2)$select.hide()}if(options.hideWhenAdded)$option.hide();if(msie)$select.hide().show()}function enableSelectOption($option){$option.removeClass(options.optionDisabledClass).attr("disabled",false);if(options.hideWhenEmpty)$select.show();if(options.hideWhenAdded)$option.show();if(msie)$select.hide().show()}function addListItem(optionId){var $O=$("#"+optionId);if(!$O)return;var $removeLink=null;if(options.deletable)$removeLink=$("").attr("href","#").addClass(options.removeClass).prepend(options.removeLabel).on("click",function(){dropListItem($(this).parent("li").attr("rel"));return false});var $itemLabel=$("").addClass(options.listItemLabelClass);var $itemStatus=$("").addClass(options.listItemStatusClass);if($O.attr("data-status"))$itemStatus.html($O.attr("data-status"));var $itemDesc=$("").addClass(options.listItemDescClass);if(options.editLink.length>0&&($O.is(":selected")||!options.editLinkOnlySelected)){var $editLink=$("").html($O.html()).attr("href",options.editLink.replace(/\{value\}/,$O.val())).append(options.editLabel);if(options.editLinkModal==="longclick"){$editLink.addClass("asmEditLinkModalLongclick")}else if(options.editLinkModal){$editLink.on("click",clickEditLink)}$itemLabel.addClass(options.editClass).append($editLink);if($O.attr("data-desc")){var $editLink2=$("").html($O.attr("data-desc")).attr("href",$editLink.attr("href")).append(options.editLabel);$itemDesc.addClass(options.editClass).append($editLink2);if(options.editLinkModal==="longclick"){$editLink2.addClass("asmEditLinkModalLongclick")}else if(options.editLinkModal){$editLink2.on("click",clickEditLink)}}}else{$itemLabel.html($O.html());if($O.attr("data-desc"))$itemDesc.html($O.attr("data-desc"))}var $item=$("").attr("rel",optionId).addClass(options.listItemClass).append($itemLabel).append($itemDesc).append($itemStatus);if($removeLink)$item.append($removeLink);$item.hide();if(options.jQueryUI){$item.addClass("ui-state-default").on("mouseenter",function(){$(this).addClass("ui-state-hover").removeClass("ui-state-default")}).on("mouseleave",function(){$(this).addClass("ui-state-default").removeClass("ui-state-hover")});if(options.sortable){if($O.attr("data-handle")){$item.prepend($($O.attr("data-handle")).addClass(options.listItemHandleClass))}else{$item.prepend($(options.sortLabel).addClass(options.listItemHandleClass))}}}if(!buildingSelect){if($O.is(":selected"))return;$O.prop("selected",true)}if(options.addItemTarget=="top"&&!buildingSelect){$ol.prepend($item);if(options.sortable)$original.prepend($O)}else{$ol.append($item);if(options.sortable)$original.append($O)}addListItemShow($item);disableSelectOption($("[rel="+optionId+"]",$select));if(!buildingSelect){setHighlight($item,options.highlightAddedLabel);selectFirstItem();if(options.sortable)$ol.sortable("refresh");if(options.fieldset){var itemName=$O.text();if(itemName.indexOf("_END")>0&&itemName.substring(itemName.length-4)=="_END"){$item.addClass("asmFieldset asmFieldsetEnd")}else{var fieldsetCloseName=itemName+"_END";if(typeof fieldsetCloseItems[fieldsetCloseName]!="undefined"){$item.addClass("asmFieldset asmFieldsetStart");addListItem(fieldsetCloseItems[fieldsetCloseName].attr("id"))}}}}}function addListItemShow($item){if(options.animate&&!buildingSelect){$item.animate({opacity:"show",height:"show"},100,"swing",function(){$item.animate({height:"+=2px"},50,"swing",function(){$item.animate({height:"-=2px"},25,"swing")})})}else{$item.show()}}function dropListItem(optionId,highlightItem){var $O=$("#"+optionId);if(options.hideDeleted||!$O.hasClass("asmOriginalSelected")){if(typeof highlightItem=="undefined")highlightItem=true;$O.prop("selected",false);$item=$ol.children("li[rel="+optionId+"]");dropListItemHide($item);enableSelectOption($("option[rel="+optionId+"]"));if(highlightItem)setHighlight($item,options.highlightRemovedLabel)}else{$item=$ol.children("li[rel="+optionId+"]");var value=$O.attr("value");if(value=="undefined")value=$O.text();if($item.hasClass(options.deletedClass)){$item.removeClass(options.deletedClass);if(options.deletedOpacity!=1)$item.css("opacity",1);$O.attr("value",value.substring(options.deletedPrepend.length))}else{$item.addClass(options.deletedClass);if(options.deletedOpacity!=1)$item.css("opacity",options.deletedOpacity);$O.attr("value",options.deletedPrepend+value)}}triggerOriginalChange(optionId,"drop")}function dropListItemHide($item){if(options.animate&&!buildingSelect){$prevItem=$item.prev("li");$item.animate({opacity:"hide",height:"hide"},100,"linear",function(){$prevItem.animate({height:"-=2px"},50,"swing",function(){$prevItem.animate({height:"+=2px"},100,"swing")});$item.remove()})}else{$item.remove()}}function setHighlight($item,label,remain){if(!options.highlight)return;if(typeof remain=="undefined")remain=false;$select.next("#"+options.highlightClass+index).remove();var $highlight=$(options.highlightTag).hide().addClass(options.highlightClass).attr("id",options.highlightClass+index);if($item){$highlight.html(label+$item.children("."+options.listItemLabelClass).slice(0,1).text())}else{$highlight.html(label)}$select.after($highlight);if(remain){$highlight.fadeIn("fast");$highlightSpan=$highlight}else{$highlight.fadeIn("fast",function(){setTimeout(function(){$highlight.fadeOut("slow",function(){$(this).remove()})},50)})}}function triggerOriginalChange(optionId,type){ignoreOriginalChangeEvent=true;$option=$("#"+optionId);$original.trigger("change",[{option:$option,value:$option.val(),id:optionId,item:$ol.children("[rel="+optionId+"]"),type:type}])}function clickEditLink(e){if(!options.editLinkModal)return true;var $asmItem=$(this).parents("."+options.listItemClass);var href=$(this).attr("href");var $iframe=pwModalWindow(href,{},"medium");$iframe.on("load",function(){var $icontents=$iframe.contents();var buttons=[];var buttonCnt=0;$icontents.find(options.editLinkButtonSelector).each(function(n){var $button=$(this);var label=$button.text();var valid=true;var secondary=$button.is(".ui-priority-secondary");for(var i=0;i0)$asmItem.find("."+options.listItemStatusClass).html($asmSetStatus.eq(0).val());var $asmSetDesc=$icontents.find("#"+options.listItemDescClass);if($asmSetDesc.length==0)$asmSetDesc=$icontents.find(":input."+options.listItemDescClass);if($asmSetDesc.length>0){$asmSetDesc=$asmSetDesc.eq(0);var asmSetDesc=$("").text($asmSetDesc.val()).html();var $desc=$asmItem.find("."+options.listItemDescClass);var $descA=$desc.find("a");if($descA.length>0){$descA.html(asmSetDesc)}else{$desc.html(asmSetDesc)}}}$iframe.dialog("close")}};buttonCnt++}$button.hide()});$iframe.setButtons(buttons)});return false}function setupFieldsets(){$ol.find("span.asmFieldsetIndent").remove();$ol.children("li").children("span."+options.listItemLabelClass).each(function(){var $t=$(this);var label=$t.text();if(label.substring(label.length-4)!="_END")return;label=label.substring(0,label.length-4);var $li=$(this).closest("li."+options.listItemClass);$li.addClass("asmFieldset asmFieldsetEnd");while(1){$li=$li.prev("li."+options.listItemClass);if($li.length<1)break;var $span=$li.children("span."+options.listItemLabelClass);var label2=$span.text();if(label2==label){$li.addClass("asmFieldset asmFieldsetStart");break}$span.prepend($(''))}})}init()})}})(jQuery);
\ No newline at end of file
+(function($){$.fn.asmSelect=function(customOptions){var options={listType:"ol",sortable:false,addable:true,deletable:true,highlight:false,fieldset:false,animate:false,addItemTarget:"bottom",hideWhenAdded:false,hideWhenEmpty:false,debugMode:false,jQueryUI:true,hideDeleted:true,deletedOpacity:.5,deletedPrepend:"-",useSelect2:true,removeWhenAdded:false,highlightTag:"",sortLabel:'↕',removeLabel:'×',highlightAddedLabel:"Added: ",highlightRemovedLabel:"Removed: ",containerClass:"asmContainer",selectClass:"asmSelect",optionDisabledClass:"asmOptionDisabled",listClass:"asmList",listSortableClass:"asmListSortable",listItemClass:"asmListItem",listItemLabelClass:"asmListItemLabel",listItemDescClass:"asmListItemDesc",listItemStatusClass:"asmListItemStatus",listItemHandleClass:"asmListItemHandle",removeClass:"asmListItemRemove",editClass:"asmListItemEdit",highlightClass:"asmHighlight",deletedClass:"asmListItemDeleted",editLink:"",editLabel:'',editLinkOnlySelected:true,editLinkModal:true,editLinkButtonSelector:"form button.ui-button:visible",optionParentClass:"asmParent",optionParentIcon:"⬇",optionChildAttr:"data-asmParent",optionParentOpenClass:"asmParentOpen",optionChildClass:"asmChild",optionChildIndent:" ",optionParentLabel:"← Click again to make selection"};$.extend(options,customOptions);return this.each(function(index){var $original=$(this);var $container;var $select;var $select2=null;var $ol;var buildingSelect=false;var ieClick=false;var ignoreOriginalChangeEvent=false;var fieldsetCloseItems={};var msie=0;var $highlightSpan=null;function init(){if(options.deletable&&!options.addable)options.hideDeleted=false;$original.find("option[selected]").addClass("asmOriginalSelected");while($("#"+options.containerClass+index).length>0)index++;$select=$("").addClass(options.selectClass).addClass($original.attr("class")).attr("name",options.selectClass+index).attr("id",options.selectClass+index);if(!options.addable)$select.hide();$selectRemoved=$("");$ol=$("<"+options.listType+">").addClass(options.listClass).attr("id",options.listClass+index);$container=$("").addClass(options.containerClass).attr("id",options.containerClass+index);buildSelect();$select.on("change",selectChangeEvent).on("click",selectClickEvent);$original.on("change",originalChangeEvent).wrap($container).before($select).before($ol);if(options.sortable)makeSortable();if(options.fieldset){setupFieldsets();$original.children("option").each(function(){var name=$(this).text();if(name.indexOf("_END")>0&&name.substring(name.length-4)=="_END"){fieldsetCloseItems[name]=$(this)}})}$original.trigger("init");if(options.editLinkModal==="longclick"){$ol.on("longclick","a.asmEditLinkModalLongclick",clickEditLink)}if($select2&&$select2.length){$select2.addClass($select.attr("class")).removeClass("asmSelect").attr("id",$select.attr("id")+"-helper").hide();$select.after($select2)}}function makeSortable(){var fieldsetItems=[];var sortableUpdate=function($ul,e,data){var $option=$("#"+data.item.attr("rel"));var updatedOptionId=$option.attr("id");$ul.children("li").each(function(n){$option=$("#"+$(this).attr("rel"));$original.append($option)});if(updatedOptionId){triggerOriginalChange(updatedOptionId,"sort")}};$ol.sortable({items:"li."+options.listItemClass,axis:"y",cancel:"a.asmEditLinkModalLongclick",update:function(e,data){if(data.item.hasClass("asmFieldsetStart"))return;sortableUpdate(jQuery(this),e,data);$ol.trigger("sorted",[data.item])},start:function(e,data){if(options.jQueryUI)data.item.addClass("ui-state-highlight");if(data.item.hasClass("asmFieldsetStart")){var $next=data.item;var stopName=data.item.find("."+options.listItemLabelClass).text()+"_END";do{if($next.find("."+options.listItemLabelClass).text()==stopName)break;$next=$next.next("li");if($next.length&&!$next.hasClass("ui-sortable-placeholder")){$next.fadeTo(50,.7).slideUp("fast");fieldsetItems.push($next)}}while($next.length)}},stop:function(e,data){if(options.jQueryUI)data.item.removeClass("ui-state-highlight");if(data.item.hasClass("asmFieldsetStart")){var $lastItem=data.item;for(var n=0;n0&&msie<7&&!ieClick)return;var $select=$(this);var $option=$select.children("option:selected");if($highlightSpan&&$highlightSpan.length)$highlightSpan.remove();if(!$option.attr("value").length)return false;if($option.hasClass(options.optionParentClass)){parentOptionSelected($select,$option);e.stopPropagation();return false}var id=$option.slice(0,1).attr("rel");addListItem(id);ieClick=false;triggerOriginalChange(id,"add");if($option.hasClass(options.optionChildClass)){childOptionSelected($select,$option)}}function parentOptionSelected($select,$option){var $sel=$select;var isOpenParent=$option.hasClass(options.optionParentOpenClass);if(options.useSelect2&&!isOpenParent)$sel=getSelect2();var $children=$sel.find("option."+options.optionChildClass+"["+options.optionChildAttr+"='"+$option.attr("value")+"']");var parentHTML=$option.html();var openLabel=" +"+$children.filter(":not(:disabled)").length+" "+options.optionParentIcon;if(isOpenParent){hideSelectOptions($children);parentHTML=parentHTML.replace(/\+\d+ ./,"");$option.removeClass(options.optionParentOpenClass).prop("selected",false)}else{var indent=options.optionChildIndent;if($option.hasClass(options.optionChildClass))indent+=indent;$children.each(function(){var $child=$(this);var childHTML=$child.html();if(childHTML.indexOf(options.optionChildIndent)!==0){$child.html(indent+childHTML)}});showSelectOptions($children,$option);$select.find(":selected").prop("selected",false);if(!$option.hasClass(options.optionChildClass)){$select.find("."+options.optionParentOpenClass).each(function(){$(this).prop("selected",true).trigger("change")})}$option.addClass(options.optionParentOpenClass).prop("selected",true);parentHTML+=openLabel;var highlightOption=options.highlight;options.highlight=true;setHighlight(null,options.optionParentLabel,true);if(!highlightOption)options.highlight=false}$option.html(parentHTML)}function childOptionSelected($select,$option){$select.find("option[value='"+$option.attr(options.optionChildAttr)+"']").prop("selected",true)}function selectClickEvent(){ieClick=true}function originalChangeEvent(e){if(ignoreOriginalChangeEvent){ignoreOriginalChangeEvent=false;return}$select.empty();if(options.useSelect2&&$select2)$select2.empty();$ol.empty();buildSelect();if(typeof $.browser!="undefined"){if($.browser.opera)$ol.hide().fadeIn("fast")}if(options.fieldset)setupFieldsets()}function buildSelect(){buildingSelect=true;var title=$original.attr("title");var numActive=0;if(title===undefined)title="";$select.prepend("");$original.children("option").each(function(n){var $t=$(this);var id;if(!$t.attr("id"))$t.attr("id","asm"+index+"option"+n);id=$t.attr("id");if($t.is(":selected")){addListItem(id);addSelectOption(id,true)}else if($t.is(":disabled")){addSelectOption(id,true)}else{numActive++;addSelectOption(id)}});if(!options.debugMode)$original.hide();selectFirstItem();if(options.hideWhenEmpty){if(numActive>0)$select.show();else $select.hide()}buildingSelect=false}function addSelectOption(optionId,disabled){if(typeof disabled=="undefined")disabled=false;var $O=$("#"+optionId);var data_asmParent=options.optionChildAttr;var $option=$("").val($O.val()).attr("rel",optionId);if($O.hasClass(options.optionParentClass)){$option.addClass(options.optionParentClass)}if(disabled)disableSelectOption($option);if($O.attr(data_asmParent)){$option.addClass(options.optionChildClass);$option.attr(data_asmParent,$O.attr(data_asmParent));if(options.useSelect2){var $sel2=getSelect2();$sel2.append($option)}else{hideSelectOptions($option);$select.append($option)}}else{$select.append($option)}}function getSelect2(){if($select2&&$select2.length)return $select2;$select2=$("");return $select2}function hideSelectOptions($options){$options.each(function(){var $option=$(this);if(options.useSelect2){var $sel2=getSelect2();$sel2.append($option);if($option.hasClass(options.optionParentOpenClass)){hideSelectOptions($select.children("option."+options.optionChildClass+"["+options.optionChildAttr+'="'+$option.attr("value")+'"]'))}}else{$option.attr("hidden","hidden")}})}function showSelectOptions($options,$afterOption){$options.each(function(){var $option=$(this);if(options.useSelect2){if(typeof $afterOption!="undefined"){$afterOption.after($option);$afterOption=$option}else{$select.append($option)}}else{$option.removeAttr("hidden")}})}function selectFirstItem(){$select.children().first().prop("selected",true)}function disableSelectOption($option){$option.addClass(options.optionDisabledClass).prop("selected",false).prop("disabled",true);if(options.hideWhenEmpty){if($option.siblings("[disabled!=true]").length<2)$select.hide()}if(options.hideWhenAdded)$option.hide();if(msie)$select.hide().show()}function enableSelectOption($option){$option.removeClass(options.optionDisabledClass).prop("disabled",false);if(options.hideWhenEmpty)$select.show();if(options.hideWhenAdded)$option.show();if(msie)$select.hide().show()}function addListItem(optionId){var $O=$("#"+optionId);if(!$O)return;var $removeLink=null;if(options.deletable)$removeLink=$("").attr("href","#").addClass(options.removeClass).prepend(options.removeLabel).on("click",function(){dropListItem($(this).parent("li").attr("rel"));return false});var $itemLabel=$("").addClass(options.listItemLabelClass);var $itemStatus=$("").addClass(options.listItemStatusClass);if($O.attr("data-status"))$itemStatus.html($O.attr("data-status"));var $itemDesc=$("").addClass(options.listItemDescClass);if(options.editLink.length>0&&($O.is(":selected")||!options.editLinkOnlySelected)){var $editLink=$("").html($O.html()).attr("href",options.editLink.replace(/\{value\}/,$O.val())).append(options.editLabel);if(options.editLinkModal==="longclick"){$editLink.addClass("asmEditLinkModalLongclick")}else if(options.editLinkModal){$editLink.on("click",clickEditLink)}$itemLabel.addClass(options.editClass).append($editLink);if($O.attr("data-desc")){var $editLink2=$("").html($O.attr("data-desc")).attr("href",$editLink.attr("href")).append(options.editLabel);$itemDesc.addClass(options.editClass).append($editLink2);if(options.editLinkModal==="longclick"){$editLink2.addClass("asmEditLinkModalLongclick")}else if(options.editLinkModal){$editLink2.on("click",clickEditLink)}}}else{$itemLabel.html($O.html());if($O.attr("data-desc"))$itemDesc.html($O.attr("data-desc"))}var $item=$("").attr("rel",optionId).addClass(options.listItemClass).append($itemLabel).append($itemDesc).append($itemStatus);if($removeLink)$item.append($removeLink);$item.hide();if(options.jQueryUI){$item.addClass("ui-state-default").on("mouseenter",function(){$(this).addClass("ui-state-hover").removeClass("ui-state-default")}).on("mouseleave",function(){$(this).addClass("ui-state-default").removeClass("ui-state-hover")});if(options.sortable){if($O.attr("data-handle")){$item.prepend($($O.attr("data-handle")).addClass(options.listItemHandleClass))}else{$item.prepend($(options.sortLabel).addClass(options.listItemHandleClass))}}}if(!buildingSelect){if($O.is(":selected"))return;$O.prop("selected",true)}if(options.addItemTarget=="top"&&!buildingSelect){$ol.prepend($item);if(options.sortable)$original.prepend($O)}else{$ol.append($item);if(options.sortable)$original.append($O)}addListItemShow($item);disableSelectOption($("[rel="+optionId+"]",$select));if(!buildingSelect){setHighlight($item,options.highlightAddedLabel);selectFirstItem();if(options.sortable)$ol.sortable("refresh");if(options.fieldset){var itemName=$O.text();if(itemName.indexOf("_END")>0&&itemName.substring(itemName.length-4)=="_END"){$item.addClass("asmFieldset asmFieldsetEnd")}else{var fieldsetCloseName=itemName+"_END";if(typeof fieldsetCloseItems[fieldsetCloseName]!="undefined"){$item.addClass("asmFieldset asmFieldsetStart");addListItem(fieldsetCloseItems[fieldsetCloseName].attr("id"))}}}}}function addListItemShow($item){if(options.animate&&!buildingSelect){$item.animate({opacity:"show",height:"show"},100,"swing",function(){$item.animate({height:"+=2px"},50,"swing",function(){$item.animate({height:"-=2px"},25,"swing")})})}else{$item.show()}}function dropListItem(optionId,highlightItem){var $O=$("#"+optionId);if(options.hideDeleted||!$O.hasClass("asmOriginalSelected")){if(typeof highlightItem=="undefined")highlightItem=true;$O.prop("selected",false);$item=$ol.children("li[rel="+optionId+"]");dropListItemHide($item);enableSelectOption($("option[rel="+optionId+"]"));if(highlightItem)setHighlight($item,options.highlightRemovedLabel)}else{$item=$ol.children("li[rel="+optionId+"]");var value=$O.attr("value");if(value=="undefined")value=$O.text();if($item.hasClass(options.deletedClass)){$item.removeClass(options.deletedClass);if(options.deletedOpacity!=1)$item.css("opacity",1);$O.attr("value",value.substring(options.deletedPrepend.length))}else{$item.addClass(options.deletedClass);if(options.deletedOpacity!=1)$item.css("opacity",options.deletedOpacity);$O.attr("value",options.deletedPrepend+value)}}triggerOriginalChange(optionId,"drop")}function dropListItemHide($item){if(options.animate&&!buildingSelect){$prevItem=$item.prev("li");$item.animate({opacity:"hide",height:"hide"},100,"linear",function(){$prevItem.animate({height:"-=2px"},50,"swing",function(){$prevItem.animate({height:"+=2px"},100,"swing")});$item.remove()})}else{$item.remove()}}function setHighlight($item,label,remain){if(!options.highlight)return;if(typeof remain=="undefined")remain=false;$select.next("#"+options.highlightClass+index).remove();var $highlight=$(options.highlightTag).hide().addClass(options.highlightClass).attr("id",options.highlightClass+index);if($item){$highlight.html(label+$item.children("."+options.listItemLabelClass).slice(0,1).text())}else{$highlight.html(label)}$select.after($highlight);if(remain){$highlight.fadeIn("fast");$highlightSpan=$highlight}else{$highlight.fadeIn("fast",function(){setTimeout(function(){$highlight.fadeOut("slow",function(){$(this).remove()})},50)})}}function triggerOriginalChange(optionId,type){ignoreOriginalChangeEvent=true;$option=$("#"+optionId);$original.trigger("change",[{option:$option,value:$option.val(),id:optionId,item:$ol.children("[rel="+optionId+"]"),type:type}])}function clickEditLink(e){if(!options.editLinkModal)return true;var $asmItem=$(this).parents("."+options.listItemClass);var href=$(this).attr("href");var $iframe=pwModalWindow(href,{},"medium");$iframe.on("load",function(){var $icontents=$iframe.contents();var buttons=[];var buttonCnt=0;$icontents.find(options.editLinkButtonSelector).each(function(n){var $button=$(this);var label=$button.text();var valid=true;var secondary=$button.is(".ui-priority-secondary");for(var i=0;i0)$asmItem.find("."+options.listItemStatusClass).html($asmSetStatus.eq(0).val());var $asmSetDesc=$icontents.find("#"+options.listItemDescClass);if($asmSetDesc.length==0)$asmSetDesc=$icontents.find(":input."+options.listItemDescClass);if($asmSetDesc.length>0){$asmSetDesc=$asmSetDesc.eq(0);var asmSetDesc=$("").text($asmSetDesc.val()).html();var $desc=$asmItem.find("."+options.listItemDescClass);var $descA=$desc.find("a");if($descA.length>0){$descA.html(asmSetDesc)}else{$desc.html(asmSetDesc)}}}$iframe.dialog("close")}};buttonCnt++}$button.hide()});$iframe.setButtons(buttons)});return false}function setupFieldsets(){$ol.find("span.asmFieldsetIndent").remove();$ol.children("li").children("span."+options.listItemLabelClass).each(function(){var $t=$(this);var label=$t.text();if(label.substring(label.length-4)!="_END")return;label=label.substring(0,label.length-4);var $li=$(this).closest("li."+options.listItemClass);$li.addClass("asmFieldset asmFieldsetEnd");while(1){$li=$li.prev("li."+options.listItemClass);if($li.length<1)break;var $span=$li.children("span."+options.listItemLabelClass);var label2=$span.text();if(label2==label){$li.addClass("asmFieldset asmFieldsetStart");break}$span.prepend($(''))}})}init()})}})(jQuery);
\ No newline at end of file
diff --git a/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.js b/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.js
index f95451c5..c69209b7 100644
--- a/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.js
+++ b/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.js
@@ -22,17 +22,17 @@ jQuery(document).ready(function($) {
};
if($inputOld.length) {
- $input.attr('disabled', 'disabled');
+ $input.prop('disabled', true);
inputOldEvent = function() {
if($(this).val().length > 0) {
$inputOld.off('keyup input change blur', inputOldEvent);
- $input.removeAttr('disabled');
+ $input.prop('disabled', false);
}
};
$inputOld.on('keyup input change blur', inputOldEvent);
}
- if($confirm.length) $confirm.attr('disabled', 'disabled');
+ if($confirm.length) $confirm.prop('disabled', true);
$input.complexify(options, function(valid, complexity) {
@@ -122,9 +122,9 @@ jQuery(document).ready(function($) {
}
if($on.hasClass('pass-fail') || $on.hasClass('pass-short') || $on.hasClass('pass-common')
|| $on.hasClass('pass-invalid') || $on.hasClass('pass-same')) {
- $confirm.attr('disabled', 'disabled').val('').trigger('change');
+ $confirm.prop('disabled', true).val('').trigger('change');
} else {
- $confirm.removeAttr('disabled');
+ $confirm.prop('disabled', false);
$on.find('small').remove();
$on.append("(" + Math.floor(complexity) + "%)");
}
diff --git a/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.min.js b/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.min.js
index a30eac9a..04d31402 100644
--- a/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.min.js
+++ b/wire/modules/Inputfield/InputfieldPassword/InputfieldPassword.min.js
@@ -1 +1 @@
-jQuery(document).ready(function($){var $inputs=$("input.InputfieldPasswordComplexify");$inputs.each(function(){var $input=$(this);var $inputfield=$input.closest(".Inputfield");var $confirm=$inputfield.find(".InputfieldPasswordConfirm");var $confirms=$confirm.next(".pass-confirm");var $inputOld=$inputfield.find("input.InputfieldPasswordOld");var $wrapScores=$input.siblings(".pass-scores");var $percent=$input.siblings(".pass-percent");var $scores=$wrapScores.children();var requirements=$wrapScores.attr("data-requirements").split(" ");var minlength=parseInt($input.attr("data-minlength"));var inputOldEvent;var options={banMode:$input.attr("data-banMode"),strengthScaleFactor:parseFloat($input.attr("data-factor")),minimumChars:minlength};if($inputOld.length){$input.attr("disabled","disabled");inputOldEvent=function(){if($(this).val().length>0){$inputOld.off("keyup input change blur",inputOldEvent);$input.removeAttr("disabled")}};$inputOld.on("keyup input change blur",inputOldEvent)}if($confirm.length)$confirm.attr("disabled","disabled");$input.complexify(options,function(valid,complexity){var $on=null;var val=$input.val();var len=val.length;var numGood=0;if(len>0){for(var n=0;n("+Math.floor(complexity)+"%)")}if($confirm.val().length){$confirm.trigger("change")}});$input.on("change",function(){var val=$(this).val();if(val.length>0){$input.attr("required","required");$confirm.attr("required","required")}else if(!$(this).closest(".InputfieldStateRequired").length){$input.removeAttr("required");$confirm.removeAttr("required")}});$confirm.on("keyup change",function(){var val1=$input.val();var val2=$(this).val();var $on=null;var $p=$input.closest("p").removeClass("pass-matches");if(val2.length==0){$on=$confirms.children(".confirm-pending")}else if(val1==val2){$on=$confirms.children(".confirm-yes");$p.addClass("pass-matches")}else if(val1.indexOf(val2)===0){$on=$confirms.children(".confirm-qty");$on.children("span").html(val2.length+"/"+val1.length)}else{$on=$confirms.children(".confirm-no")}if($on)$on.addClass("on").siblings(".on").removeClass("on")});var $passMask=$inputfield.find(".pass-mask");if($passMask.length){var $passMaskShow=$passMask.find(".pass-mask-show");var $passMaskHide=$passMask.find(".pass-mask-hide");$passMaskHide.hide();$passMaskShow.on("click",function(e){$(this).hide();$passMaskHide.show();$inputfield.find("input[type=password]").prop("type","text").addClass("pass-unmask");return false});$passMaskHide.hide().on("click",function(e){$(this).hide();$passMaskShow.show();$inputfield.find("input.pass-unmask").prop("type","password").removeClass("pass-unmask");return false})}});var $ffinputs=$(".InputfieldPassword").find("input[autocomplete='new-password']");if($ffinputs.length){setTimeout(function(){$ffinputs.each(function(){if($(this).val().length<1||$(this).attr("value").length>0)return;$(this).val("").trigger("keyup").trigger("change").closest(".Inputfield").removeClass("InputfieldStateChanged")})},1e3)}});
\ No newline at end of file
+jQuery(document).ready(function($){var $inputs=$("input.InputfieldPasswordComplexify");$inputs.each(function(){var $input=$(this);var $inputfield=$input.closest(".Inputfield");var $confirm=$inputfield.find(".InputfieldPasswordConfirm");var $confirms=$confirm.next(".pass-confirm");var $inputOld=$inputfield.find("input.InputfieldPasswordOld");var $wrapScores=$input.siblings(".pass-scores");var $percent=$input.siblings(".pass-percent");var $scores=$wrapScores.children();var requirements=$wrapScores.attr("data-requirements").split(" ");var minlength=parseInt($input.attr("data-minlength"));var inputOldEvent;var options={banMode:$input.attr("data-banMode"),strengthScaleFactor:parseFloat($input.attr("data-factor")),minimumChars:minlength};if($inputOld.length){$input.prop("disabled",true);inputOldEvent=function(){if($(this).val().length>0){$inputOld.off("keyup input change blur",inputOldEvent);$input.prop("disabled",false)}};$inputOld.on("keyup input change blur",inputOldEvent)}if($confirm.length)$confirm.prop("disabled",true);$input.complexify(options,function(valid,complexity){var $on=null;var val=$input.val();var len=val.length;var numGood=0;if(len>0){for(var n=0;n("+Math.floor(complexity)+"%)")}if($confirm.val().length){$confirm.trigger("change")}});$input.on("change",function(){var val=$(this).val();if(val.length>0){$input.attr("required","required");$confirm.attr("required","required")}else if(!$(this).closest(".InputfieldStateRequired").length){$input.removeAttr("required");$confirm.removeAttr("required")}});$confirm.on("keyup change",function(){var val1=$input.val();var val2=$(this).val();var $on=null;var $p=$input.closest("p").removeClass("pass-matches");if(val2.length==0){$on=$confirms.children(".confirm-pending")}else if(val1==val2){$on=$confirms.children(".confirm-yes");$p.addClass("pass-matches")}else if(val1.indexOf(val2)===0){$on=$confirms.children(".confirm-qty");$on.children("span").html(val2.length+"/"+val1.length)}else{$on=$confirms.children(".confirm-no")}if($on)$on.addClass("on").siblings(".on").removeClass("on")});var $passMask=$inputfield.find(".pass-mask");if($passMask.length){var $passMaskShow=$passMask.find(".pass-mask-show");var $passMaskHide=$passMask.find(".pass-mask-hide");$passMaskHide.hide();$passMaskShow.on("click",function(e){$(this).hide();$passMaskHide.show();$inputfield.find("input[type=password]").prop("type","text").addClass("pass-unmask");return false});$passMaskHide.hide().on("click",function(e){$(this).hide();$passMaskShow.show();$inputfield.find("input.pass-unmask").prop("type","password").removeClass("pass-unmask");return false})}});var $ffinputs=$(".InputfieldPassword").find("input[autocomplete='new-password']");if($ffinputs.length){setTimeout(function(){$ffinputs.each(function(){if($(this).val().length<1||$(this).attr("value").length>0)return;$(this).val("").trigger("keyup").trigger("change").closest(".Inputfield").removeClass("InputfieldStateChanged")})},1e3)}});
\ No newline at end of file
diff --git a/wire/modules/Inputfield/InputfieldPassword/complexify/jquery.complexify.js b/wire/modules/Inputfield/InputfieldPassword/complexify/jquery.complexify.js
index 251b416b..4e219e2e 100755
--- a/wire/modules/Inputfield/InputfieldPassword/complexify/jquery.complexify.js
+++ b/wire/modules/Inputfield/InputfieldPassword/complexify/jquery.complexify.js
@@ -119,7 +119,7 @@
banMode: 'strict' // (strict|loose)
};
- if($.isFunction(options) && !callback) {
+ if(typeof options === "function" && !callback) {
callback = options;
options = {};
}
diff --git a/wire/modules/Inputfield/InputfieldPassword/complexify/jquery.complexify.min.js b/wire/modules/Inputfield/InputfieldPassword/complexify/jquery.complexify.min.js
index 727aaf00..e5fd3f15 100755
--- a/wire/modules/Inputfield/InputfieldPassword/complexify/jquery.complexify.min.js
+++ b/wire/modules/Inputfield/InputfieldPassword/complexify/jquery.complexify.min.js
@@ -1 +1 @@
-(function($){$.fn.extend({complexify:function(options,callback){var MIN_COMPLEXITY=49;var MAX_COMPLEXITY=120;var CHARSETS=[[32,32],[48,57],[65,90],[97,122],[33,47],[58,64],[91,96],[123,126],[128,255],[256,383],[384,591],[592,687],[688,767],[768,879],[880,1023],[1024,1279],[1328,1423],[1424,1535],[1536,1791],[1792,1871],[1920,1983],[2304,2431],[2432,2559],[2560,2687],[2688,2815],[2816,2943],[2944,3071],[3072,3199],[3200,3327],[3328,3455],[3456,3583],[3584,3711],[3712,3839],[3840,4095],[4096,4255],[4256,4351],[4352,4607],[4608,4991],[5024,5119],[5120,5759],[5760,5791],[5792,5887],[6016,6143],[6144,6319],[7680,7935],[7936,8191],[8192,8303],[8304,8351],[8352,8399],[8400,8447],[8448,8527],[8528,8591],[8592,8703],[8704,8959],[8960,9215],[9216,9279],[9280,9311],[9312,9471],[9472,9599],[9600,9631],[9632,9727],[9728,9983],[9984,10175],[10240,10495],[11904,12031],[12032,12255],[12272,12287],[12288,12351],[12352,12447],[12448,12543],[12544,12591],[12592,12687],[12688,12703],[12704,12735],[12800,13055],[13056,13311],[13312,19893],[19968,40959],[40960,42127],[42128,42191],[44032,55203],[55296,56191],[56192,56319],[56320,57343],[57344,63743],[63744,64255],[64256,64335],[64336,65023],[65056,65071],[65072,65103],[65104,65135],[65136,65278],[65279,65279],[65280,65519],[65520,65533]];var defaults={minimumChars:8,strengthScaleFactor:1,bannedPasswords:window.COMPLEXIFY_BANLIST||[],banMode:"strict"};if($.isFunction(options)&&!callback){callback=options;options={}}options=$.extend(defaults,options);function additionalComplexityForCharset(str,charset){for(var i=str.length-1;i>=0;i--){if(charset[0]<=str.charCodeAt(i)&&str.charCodeAt(i)<=charset[1]){return charset[1]-charset[0]+1}}return 0}function inBanlist(str){if(options.banMode==="strict"){for(var i=0;i-1?true:false}}function evaluateSecurity(){var password=$(this).val();var complexity=0,valid=false;if(!inBanlist(password)){for(var i=CHARSETS.length-1;i>=0;i--){complexity+=additionalComplexityForCharset(password,CHARSETS[i])}}else{complexity=1}complexity=Math.log(Math.pow(complexity,password.length))*(1/options.strengthScaleFactor);valid=complexity>MIN_COMPLEXITY&&password.length>=options.minimumChars;complexity=complexity/MAX_COMPLEXITY*100;complexity=complexity>100?100:complexity;callback.call(this,valid,complexity)}this.each(function(){if($(this).val()){evaluateSecurity.apply(this)}});return this.each(function(){$(this).on("keyup focus input propertychange mouseup",evaluateSecurity)})}})})(jQuery);
\ No newline at end of file
+(function($){$.fn.extend({complexify:function(options,callback){var MIN_COMPLEXITY=49;var MAX_COMPLEXITY=120;var CHARSETS=[[32,32],[48,57],[65,90],[97,122],[33,47],[58,64],[91,96],[123,126],[128,255],[256,383],[384,591],[592,687],[688,767],[768,879],[880,1023],[1024,1279],[1328,1423],[1424,1535],[1536,1791],[1792,1871],[1920,1983],[2304,2431],[2432,2559],[2560,2687],[2688,2815],[2816,2943],[2944,3071],[3072,3199],[3200,3327],[3328,3455],[3456,3583],[3584,3711],[3712,3839],[3840,4095],[4096,4255],[4256,4351],[4352,4607],[4608,4991],[5024,5119],[5120,5759],[5760,5791],[5792,5887],[6016,6143],[6144,6319],[7680,7935],[7936,8191],[8192,8303],[8304,8351],[8352,8399],[8400,8447],[8448,8527],[8528,8591],[8592,8703],[8704,8959],[8960,9215],[9216,9279],[9280,9311],[9312,9471],[9472,9599],[9600,9631],[9632,9727],[9728,9983],[9984,10175],[10240,10495],[11904,12031],[12032,12255],[12272,12287],[12288,12351],[12352,12447],[12448,12543],[12544,12591],[12592,12687],[12688,12703],[12704,12735],[12800,13055],[13056,13311],[13312,19893],[19968,40959],[40960,42127],[42128,42191],[44032,55203],[55296,56191],[56192,56319],[56320,57343],[57344,63743],[63744,64255],[64256,64335],[64336,65023],[65056,65071],[65072,65103],[65104,65135],[65136,65278],[65279,65279],[65280,65519],[65520,65533]];var defaults={minimumChars:8,strengthScaleFactor:1,bannedPasswords:window.COMPLEXIFY_BANLIST||[],banMode:"strict"};if(typeof options==="function"&&!callback){callback=options;options={}}options=$.extend(defaults,options);function additionalComplexityForCharset(str,charset){for(var i=str.length-1;i>=0;i--){if(charset[0]<=str.charCodeAt(i)&&str.charCodeAt(i)<=charset[1]){return charset[1]-charset[0]+1}}return 0}function inBanlist(str){if(options.banMode==="strict"){for(var i=0;i-1?true:false}}function evaluateSecurity(){var password=$(this).val();var complexity=0,valid=false;if(!inBanlist(password)){for(var i=CHARSETS.length-1;i>=0;i--){complexity+=additionalComplexityForCharset(password,CHARSETS[i])}}else{complexity=1}complexity=Math.log(Math.pow(complexity,password.length))*(1/options.strengthScaleFactor);valid=complexity>MIN_COMPLEXITY&&password.length>=options.minimumChars;complexity=complexity/MAX_COMPLEXITY*100;complexity=complexity>100?100:complexity;callback.call(this,valid,complexity)}this.each(function(){if($(this).val()){evaluateSecurity.apply(this)}});return this.each(function(){$(this).on("keyup focus input propertychange mouseup",evaluateSecurity)})}})})(jQuery);
\ No newline at end of file
diff --git a/wire/modules/Inputfield/InputfieldSelector/InputfieldSelector.js b/wire/modules/Inputfield/InputfieldSelector/InputfieldSelector.js
index ce0e7b61..80f26020 100644
--- a/wire/modules/Inputfield/InputfieldSelector/InputfieldSelector.js
+++ b/wire/modules/Inputfield/InputfieldSelector/InputfieldSelector.js
@@ -116,7 +116,7 @@ var InputfieldSelector = {
*
*/
disableOption: function($option) {
- $option.attr('disabled', 'disabled');
+ $option.prop('disabled', true).prop('hidden', true);
},
/**
@@ -126,8 +126,7 @@ var InputfieldSelector = {
*
*/
enableOption: function($option) {
- $option.removeAttr('disabled');
-
+ $option.prop('disabled', false).prop('hidden', false);
},
/**
@@ -165,7 +164,7 @@ var InputfieldSelector = {
$newRow.find('.opval').html('');
$newRow.find('.select-field').val(''); // .select2();
$newRow.hide();
- $newRow.find("option[disabled=disabled]").remove();
+ $newRow.find('option:disabled').prop('hidden', true);
$list.append($newRow);
$newRow.slideDown('fast');
InputfieldSelector.normalizeHeightRow($newRow);
@@ -183,8 +182,7 @@ var InputfieldSelector = {
if($selectField.val() == 'template') {
// if template setting is removed, restore any disabled fields
$row.parents(".InputfieldSelector").find("select.select-field").each(function() {
- // $(this).find("option[disabled=disabled]").removeAttr('disabled');
- $(this).find("option[disabled=disabled]").each(function() {
+ $(this).find("option:disabled").each(function() {
InputfieldSelector.enableOption($(this));
});
});
@@ -397,7 +395,6 @@ var InputfieldSelector = {
$item.trigger('blur').hide();
setTimeout(function() {
$item.val(ui.item.label);
- //$item.attr('disabled', 'disabled');
$item.fadeIn('fast');
}, 100);
InputfieldSelector.changeAny($input);
@@ -477,9 +474,9 @@ var InputfieldSelector = {
if(op && op.indexOf('"') > -1) {
// handle: 'is empty' or 'is not empty' operators
value = ' ';
- $value.attr('disabled', 'disabled');
+ $value.prop('disabled', true);
} else if($value.is(":disabled")) {
- $value.removeAttr('disabled');
+ $value.prop('disabled', false);
}
if(op && op.indexOf('!') === 0 && op !== '!=') {
@@ -519,18 +516,18 @@ var InputfieldSelector = {
if(useOrValue) { // && !$row.is('.has-or-value')) {
$row.addClass('has-or-value');
- $row.find(".select-field, .select-operator, .select-subfield").attr('disabled', 'disabled');
+ $row.find(".select-field, .select-operator, .select-subfield").prop('disabled', true);
} else if($row.is('.has-or-value')) {
$row.removeClass('has-or-value');
- $row.find(".select-field, .select-operator, .select-subfield").removeAttr('disabled');
+ $row.find(".select-field, .select-operator, .select-subfield").prop('disabled', false);
}
if(useOrField) { // && !$row.is('.has-or-field')) {
$row.addClass('has-or-field');
- $row.find(".input-value, .select-operator").attr('disabled', 'disabled');
+ $row.find('.input-value, .select-operator').prop('disabled', true);
} else if($row.is('.has-or-field')) {
$row.removeClass('has-or-field');
- $row.find(".input-value, .select-operator").removeAttr('disabled');
+ $row.find(".input-value, .select-operator").prop('disabled', false);
}
selectors[n++] = {
@@ -563,7 +560,6 @@ var InputfieldSelector = {
var $option = $(this);
var templates = $option.attr('data-templates');
if(typeof templates != "undefined" && templates != "*") {
- // $option.removeAttr('disabled');
InputfieldSelector.enableOption($option);
var numFound = 0;
for(i = 0; i < templateIDs.length; i++) {
@@ -571,17 +567,15 @@ var InputfieldSelector = {
}
//if(templates.indexOf('|' + templatesID + '|') == -1) {
if(numFound) {
- //$option.removeAttr('disabled');
InputfieldSelector.enableOption($option);
} else {
- //if(!$option.is(":selected")) $option.attr('disabled', 'disabled');
if(!$option.is(":selected")) InputfieldSelector.disableOption($option);
numDisabledOptions++;
}
}
});
if(numDisabledOptions > 0 && !$select.parent().is(".selector-template-row")) {
- $select.find('option[disabled=disabled]').remove();
+ $select.find('option:disabled').prop('hidden', true);
}
});
diff --git a/wire/modules/Inputfield/InputfieldSelector/InputfieldSelector.min.js b/wire/modules/Inputfield/InputfieldSelector/InputfieldSelector.min.js
index 4959f6f0..f2589246 100644
--- a/wire/modules/Inputfield/InputfieldSelector/InputfieldSelector.min.js
+++ b/wire/modules/Inputfield/InputfieldSelector/InputfieldSelector.min.js
@@ -1 +1 @@
-var InputfieldSelector={selector:"",spinner:"",borderColor:"#eee",init:function(){$(document).on("change",".InputfieldSelector select.select-field",InputfieldSelector.changeField);$(document).on("change",".InputfieldSelector select.select-subfield",InputfieldSelector.changeField);$(document).on("change",".InputfieldSelector :input:not(.select-field):not(.input-value-autocomplete)",function(){InputfieldSelector.changeAny($(this))});$(document).on("opened",".InputfieldSelector",function(){InputfieldSelector.normalizeHeightRows($(this))});var timeout=null;$(document).on("keyup",".InputfieldSelector input.input-value",function(){var $t=$(this);clearTimeout(timeout);if($t.hasClass("input-value-subselect")&&InputfieldSelector.valueHasOperator($t.val())){var $preview=$t.closest(".InputfieldContent").find(".selector-preview");$preview.html('Subselect detected: when done click here to commit your change.');return}timeout=setTimeout(function(){InputfieldSelector.changeAny($t)},100)});$(document).on("click",".InputfieldSelector .selector-add",function(){InputfieldSelector.addRow($(this));return false});$(document).on("click",".InputfieldSelector a.delete-row",InputfieldSelector.deleteRow);$(".InputfieldSelector .selector-preview").hide();$(document).on("wiretabclick",function(event,$newTab,$oldTab){var $inputfield=$newTab.find(".InputfieldSelector");if($inputfield.length==0)return;InputfieldSelector.normalizeHeightRows($inputfield)});var $rows=$(".InputfieldSelector .selector-row");if($rows.length>0){$rows.eq(0).find(".select-field").each(function(){InputfieldSelector.changeAny($(this))});$rows.eq(1).find(".input-value").trigger("change");$rows.each(function(){var $row=$(this);$row.css("border-color",InputfieldSelector.borderColor);InputfieldSelector.normalizeHeightRow($row);var $ac=$row.find(".input-value-autocomplete");if($ac.length>0){var subfield=$row.find(".select-subfield");var field=subfield.length?subfield.val():$row.find(".select-field").val();var name=$row.parents(".InputfieldSelector").find("input.selector-value").attr("name");InputfieldSelector.setupAutocomplete($ac,field,name)}})}$(".InputfieldSelector").each(function(){if($(this).find(".selector-preview-disabled").length>0)return;$(this).find(".input-value").eq(0).trigger("change")})},disableOption:function($option){$option.attr("disabled","disabled")},enableOption:function($option){$option.removeAttr("disabled")},valueHasOperator:function(value){var operators=["=","<",">"];var hasOperator=false;for(n=0;n-1&&value.substring(pos-1,1)!="\\"){hasOperator=true;break}}return hasOperator},addRow:function($context){var $list=$context.parents(".InputfieldSelector").find(".selector-list");var $row=$list.find(".selector-template-row");var $newRow=$row.clone();$newRow.removeClass("selector-template-row");$newRow.find(".opval").html("");$newRow.find(".select-field").val("");$newRow.hide();$newRow.find("option[disabled=disabled]").remove();$list.append($newRow);$newRow.slideDown("fast");InputfieldSelector.normalizeHeightRow($newRow)},deleteRow:function(){var $row=$(this).parents(".selector-row");var $selectField=$row.find(".select-field");if($selectField.val()=="template"){$row.parents(".InputfieldSelector").find("select.select-field").each(function(){$(this).find("option[disabled=disabled]").each(function(){InputfieldSelector.enableOption($(this))})})}var $siblings=$row.siblings();$row.slideUp("fast",function(){$row.remove();InputfieldSelector.changeAny($siblings.eq(0))});return false},changeFieldToggle:function($select){var $rootParent=$select.parents(".InputfieldSelector");var currentSetting=$rootParent.hasClass("InputfieldSelector_names")?"names":"labels";var newSetting=currentSetting==="labels"?"names":"labels";$rootParent.find(".select-field, .select-subfield").each(function(){$(this).find("option").each(function(){var name=$(this).attr("data-name");if(!name){if($(this).attr("value")=="toggle-names-labels"){$(this).html($(this).attr("data-"+currentSetting))}return}if(currentSetting=="labels"){$(this).html(name)}else{$(this).html($(this).attr("data-label"))}})});$rootParent.removeClass("InputfieldSelector_"+currentSetting).addClass("InputfieldSelector_"+newSetting);$select.val($select.attr("data-selected"));return false},changeField:function(){var $select=$(this);var $option=$select.children("option:selected");var field=$select.val();if(!field||field.length==0)return;if(field=="toggle-names-labels")return InputfieldSelector.changeFieldToggle($select);var $row=$select.parents(".selector-row");var action="opval";$row.children(".opval").html("");$select.attr("data-selected",field);var $hiddenInput=$select.parents(".InputfieldSelector").find(".selector-value");var name=$hiddenInput.attr("name");var type=$select.attr("data-type");if(field.match(/\.$/)){action="subfield-opval";if(field.indexOf("@")>-1)field=field.substring(1,field.length-1);else field=field.substring(0,field.length-1);$row.addClass("has-subfield")}else if(field.match(/\.id$/)){field="id";action="opval";type="selector"}else if($select.is(".select-field")){$row.children(".subfield").html("");$row.removeClass("has-subfield")}var url="./?InputfieldSelector="+action+"&field="+field+"&type="+type+"&name="+name;var $spinner=$(InputfieldSelector.spinner);$row.append($spinner);$.get(url,function(data){$spinner.remove();function actionOpval($data){$data.hide();var $opval=$row.children(".opval");$opval.html("").append($data);$opval.children(":not(.input-or)").fadeIn("fast");InputfieldSelector.changeAny($select);var $ac=$opval.find(".input-value-autocomplete");if($ac.length>0)InputfieldSelector.setupAutocomplete($ac,field,name)}function actionSubfield($data){$data.hide();var $subfield=$row.children(".subfield");$subfield.html("").append($data);$data.fadeIn("fast",function(){})}if(action=="subfield-opval"){data=data.split("");actionSubfield($(data[0]));actionOpval($(data[1]))}else if(action=="opval"){actionOpval($(data))}else{actionSubfield($(data))}InputfieldSelector.normalizeHeightRow($row);$row.closest(".InputfieldContent").find(".hasDatepicker").datepicker("destroy").removeAttr("id").removeClass("hasDatepicker")})},normalizeHeightRow:function($row){InputfieldSelector.normalizeHeight($row.find(":input, i.fa"))},normalizeHeightRows:function($parent){$parent.find(".selector-row").each(function(){InputfieldSelector.normalizeHeightRow($(this))})},normalizeHeight:function($items){var maxHeight=0;$items.each(function(){$(this).css("margin-top",0);var h=$(this).outerHeight();if(h>maxHeight)maxHeight=h});$items.each(function(){var h=$(this).outerHeight();if(h0)templateIDs.push(templateID)}if($row.hasClass("has-subfield")){var $selectSubfield=$row.find(".select-subfield");var $selectOption=$selectSubfield.children("option:selected");var subfield=$selectSubfield.val();if(subfield.length>0){if(subfield.indexOf(".")>0){if(fieldName.indexOf("@")>-1)fieldName="@"+subfield;else fieldName=subfield}else if($selectOption.hasClass("select-subfield-default")){fieldName=subfield}else{fieldName+=subfield}if(fieldName.indexOf(".data")>0)fieldName=fieldName.replace(/\.data$/,"")}}var $op=$select.siblings(".opval").children(".select-operator");var op=$op.val();var $value=$op.next(".input-value");var value=$value.val();var fieldPrefix="";if(op&&op.indexOf('"')>-1){value=" ";$value.attr("disabled","disabled")}else if($value.is(":disabled")){$value.removeAttr("disabled")}if(op&&op.indexOf("!")===0&&op!=="!="){fieldPrefix="!";op=op.substring(1)}if(typeof value!="undefined")if(value.length){if($value.hasClass("input-value-subselect")&&InputfieldSelector.valueHasOperator(value)){value="["+value+"]"}else if(fieldName!="_custom"&&op.indexOf('"')<0){if(value.indexOf('"')>-1){if(value.indexOf("'")===-1){value="'"+value+"'"}else{value='"'+value.replace(/"/g,"")+'"'}}else if(!value.match(/^[-_a-zA-Z0-9]*$/)){value='"'+value+'"'}}}var testField=","+fieldPrefix+fieldName+"~"+op+"~";var testValue="~"+op+"~"+value+",";var mayOrValue=value&&value.length>0&&test.indexOf(testField)>-1;var mayOrField=value&&value.length>0&&test.indexOf(testValue)>-1;var $orCheckbox=$row.find(".input-or");var useOrValue=mayOrValue&&$orCheckbox.is(":checked");var useOrField=mayOrField&&$orCheckbox.is(":checked");var isOrGroup=(useOrField||useOrValue)&&fieldName=="_custom";if(useOrValue){$row.addClass("has-or-value");$row.find(".select-field, .select-operator, .select-subfield").attr("disabled","disabled")}else if($row.is(".has-or-value")){$row.removeClass("has-or-value");$row.find(".select-field, .select-operator, .select-subfield").removeAttr("disabled")}if(useOrField){$row.addClass("has-or-field");$row.find(".input-value, .select-operator").attr("disabled","disabled")}else if($row.is(".has-or-field")){$row.removeClass("has-or-field");$row.find(".input-value, .select-operator").removeAttr("disabled")}selectors[n++]={not:fieldPrefix==="!",field:fieldName,operator:op,value:value,mayOrValue:mayOrValue,mayOrField:mayOrField,useOrValue:useOrValue,useOrField:useOrField,isOrGroup:isOrGroup,checkbox:$orCheckbox};if(mayOrField||mayOrValue)showOrNotes=true;test+=","+fieldPrefix+fieldName+"~"+op+"~"+value+",";selector+=","+fieldPrefix+fieldName+op+value});if(templateIDs.length>0){var $masterSelect=null;$selectFields.each(function(){var $select=$(this);var numDisabledOptions=0;$select.find("option").each(function(){var $option=$(this);var templates=$option.attr("data-templates");if(typeof templates!="undefined"&&templates!="*"){InputfieldSelector.enableOption($option);var numFound=0;for(i=0;i-1)numFound++}if(numFound){InputfieldSelector.enableOption($option)}else{if(!$option.is(":selected"))InputfieldSelector.disableOption($option);numDisabledOptions++}}});if(numDisabledOptions>0&&!$select.parent().is(".selector-template-row")){$select.find("option[disabled=disabled]").remove()}})}selector="";for(n=0;n0)selector+=", ";for(var i=0;i0&&selector!=InputfieldSelector.selector){if(!$preview.is(".selector-preview-disabled")){$preview.html(""+initValue+selector+"");$preview.fadeIn()}var $counter=$preview.siblings(".selector-counter");if($counter.length>0&&!$counter.is(".selector-counter-disabled")){$counter.html(InputfieldSelector.spinner).fadeIn("fast");InputfieldSelector.selector=selector;$.post("./?InputfieldSelector=test&name="+$hiddenInput.attr("name"),{selector:selector},function(data){$counter.hide();$counter.html(data);$counter.show()})}}if($hiddenInput.val()!=selector){$hiddenInput.val(selector);if(selector.length==0){$preview.hide();$preview.siblings(".selector-counter").html("")}$hiddenInput.trigger("change")}InputfieldSelector.selector=selector;var $orNotes=$inputfield.find(".or-notes");if(showOrNotes)$orNotes.fadeIn();else $orNotes.hide()}};$(document).ready(function(){InputfieldSelector.init()});
\ No newline at end of file
+var InputfieldSelector={selector:"",spinner:"",borderColor:"#eee",init:function(){$(document).on("change",".InputfieldSelector select.select-field",InputfieldSelector.changeField);$(document).on("change",".InputfieldSelector select.select-subfield",InputfieldSelector.changeField);$(document).on("change",".InputfieldSelector :input:not(.select-field):not(.input-value-autocomplete)",function(){InputfieldSelector.changeAny($(this))});$(document).on("opened",".InputfieldSelector",function(){InputfieldSelector.normalizeHeightRows($(this))});var timeout=null;$(document).on("keyup",".InputfieldSelector input.input-value",function(){var $t=$(this);clearTimeout(timeout);if($t.hasClass("input-value-subselect")&&InputfieldSelector.valueHasOperator($t.val())){var $preview=$t.closest(".InputfieldContent").find(".selector-preview");$preview.html('Subselect detected: when done click here to commit your change.');return}timeout=setTimeout(function(){InputfieldSelector.changeAny($t)},100)});$(document).on("click",".InputfieldSelector .selector-add",function(){InputfieldSelector.addRow($(this));return false});$(document).on("click",".InputfieldSelector a.delete-row",InputfieldSelector.deleteRow);$(".InputfieldSelector .selector-preview").hide();$(document).on("wiretabclick",function(event,$newTab,$oldTab){var $inputfield=$newTab.find(".InputfieldSelector");if($inputfield.length==0)return;InputfieldSelector.normalizeHeightRows($inputfield)});var $rows=$(".InputfieldSelector .selector-row");if($rows.length>0){$rows.eq(0).find(".select-field").each(function(){InputfieldSelector.changeAny($(this))});$rows.eq(1).find(".input-value").trigger("change");$rows.each(function(){var $row=$(this);$row.css("border-color",InputfieldSelector.borderColor);InputfieldSelector.normalizeHeightRow($row);var $ac=$row.find(".input-value-autocomplete");if($ac.length>0){var subfield=$row.find(".select-subfield");var field=subfield.length?subfield.val():$row.find(".select-field").val();var name=$row.parents(".InputfieldSelector").find("input.selector-value").attr("name");InputfieldSelector.setupAutocomplete($ac,field,name)}})}$(".InputfieldSelector").each(function(){if($(this).find(".selector-preview-disabled").length>0)return;$(this).find(".input-value").eq(0).trigger("change")})},disableOption:function($option){$option.prop("disabled",true).prop("hidden",true)},enableOption:function($option){$option.prop("disabled",false).prop("hidden",false)},valueHasOperator:function(value){var operators=["=","<",">"];var hasOperator=false;for(n=0;n-1&&value.substring(pos-1,1)!="\\"){hasOperator=true;break}}return hasOperator},addRow:function($context){var $list=$context.parents(".InputfieldSelector").find(".selector-list");var $row=$list.find(".selector-template-row");var $newRow=$row.clone();$newRow.removeClass("selector-template-row");$newRow.find(".opval").html("");$newRow.find(".select-field").val("");$newRow.hide();$newRow.find("option:disabled").prop("hidden",true);$list.append($newRow);$newRow.slideDown("fast");InputfieldSelector.normalizeHeightRow($newRow)},deleteRow:function(){var $row=$(this).parents(".selector-row");var $selectField=$row.find(".select-field");if($selectField.val()=="template"){$row.parents(".InputfieldSelector").find("select.select-field").each(function(){$(this).find("option:disabled").each(function(){InputfieldSelector.enableOption($(this))})})}var $siblings=$row.siblings();$row.slideUp("fast",function(){$row.remove();InputfieldSelector.changeAny($siblings.eq(0))});return false},changeFieldToggle:function($select){var $rootParent=$select.parents(".InputfieldSelector");var currentSetting=$rootParent.hasClass("InputfieldSelector_names")?"names":"labels";var newSetting=currentSetting==="labels"?"names":"labels";$rootParent.find(".select-field, .select-subfield").each(function(){$(this).find("option").each(function(){var name=$(this).attr("data-name");if(!name){if($(this).attr("value")=="toggle-names-labels"){$(this).html($(this).attr("data-"+currentSetting))}return}if(currentSetting=="labels"){$(this).html(name)}else{$(this).html($(this).attr("data-label"))}})});$rootParent.removeClass("InputfieldSelector_"+currentSetting).addClass("InputfieldSelector_"+newSetting);$select.val($select.attr("data-selected"));return false},changeField:function(){var $select=$(this);var $option=$select.children("option:selected");var field=$select.val();if(!field||field.length==0)return;if(field=="toggle-names-labels")return InputfieldSelector.changeFieldToggle($select);var $row=$select.parents(".selector-row");var action="opval";$row.children(".opval").html("");$select.attr("data-selected",field);var $hiddenInput=$select.parents(".InputfieldSelector").find(".selector-value");var name=$hiddenInput.attr("name");var type=$select.attr("data-type");if(field.match(/\.$/)){action="subfield-opval";if(field.indexOf("@")>-1)field=field.substring(1,field.length-1);else field=field.substring(0,field.length-1);$row.addClass("has-subfield")}else if(field.match(/\.id$/)){field="id";action="opval";type="selector"}else if($select.is(".select-field")){$row.children(".subfield").html("");$row.removeClass("has-subfield")}var url="./?InputfieldSelector="+action+"&field="+field+"&type="+type+"&name="+name;var $spinner=$(InputfieldSelector.spinner);$row.append($spinner);$.get(url,function(data){$spinner.remove();function actionOpval($data){$data.hide();var $opval=$row.children(".opval");$opval.html("").append($data);$opval.children(":not(.input-or)").fadeIn("fast");InputfieldSelector.changeAny($select);var $ac=$opval.find(".input-value-autocomplete");if($ac.length>0)InputfieldSelector.setupAutocomplete($ac,field,name)}function actionSubfield($data){$data.hide();var $subfield=$row.children(".subfield");$subfield.html("").append($data);$data.fadeIn("fast",function(){})}if(action=="subfield-opval"){data=data.split("");actionSubfield($(data[0]));actionOpval($(data[1]))}else if(action=="opval"){actionOpval($(data))}else{actionSubfield($(data))}InputfieldSelector.normalizeHeightRow($row);$row.closest(".InputfieldContent").find(".hasDatepicker").datepicker("destroy").removeAttr("id").removeClass("hasDatepicker")})},normalizeHeightRow:function($row){InputfieldSelector.normalizeHeight($row.find(":input, i.fa"))},normalizeHeightRows:function($parent){$parent.find(".selector-row").each(function(){InputfieldSelector.normalizeHeightRow($(this))})},normalizeHeight:function($items){var maxHeight=0;$items.each(function(){$(this).css("margin-top",0);var h=$(this).outerHeight();if(h>maxHeight)maxHeight=h});$items.each(function(){var h=$(this).outerHeight();if(h0)templateIDs.push(templateID)}if($row.hasClass("has-subfield")){var $selectSubfield=$row.find(".select-subfield");var $selectOption=$selectSubfield.children("option:selected");var subfield=$selectSubfield.val();if(subfield.length>0){if(subfield.indexOf(".")>0){if(fieldName.indexOf("@")>-1)fieldName="@"+subfield;else fieldName=subfield}else if($selectOption.hasClass("select-subfield-default")){fieldName=subfield}else{fieldName+=subfield}if(fieldName.indexOf(".data")>0)fieldName=fieldName.replace(/\.data$/,"")}}var $op=$select.siblings(".opval").children(".select-operator");var op=$op.val();var $value=$op.next(".input-value");var value=$value.val();var fieldPrefix="";if(op&&op.indexOf('"')>-1){value=" ";$value.prop("disabled",true)}else if($value.is(":disabled")){$value.prop("disabled",false)}if(op&&op.indexOf("!")===0&&op!=="!="){fieldPrefix="!";op=op.substring(1)}if(typeof value!="undefined")if(value.length){if($value.hasClass("input-value-subselect")&&InputfieldSelector.valueHasOperator(value)){value="["+value+"]"}else if(fieldName!="_custom"&&op.indexOf('"')<0){if(value.indexOf('"')>-1){if(value.indexOf("'")===-1){value="'"+value+"'"}else{value='"'+value.replace(/"/g,"")+'"'}}else if(!value.match(/^[-_a-zA-Z0-9]*$/)){value='"'+value+'"'}}}var testField=","+fieldPrefix+fieldName+"~"+op+"~";var testValue="~"+op+"~"+value+",";var mayOrValue=value&&value.length>0&&test.indexOf(testField)>-1;var mayOrField=value&&value.length>0&&test.indexOf(testValue)>-1;var $orCheckbox=$row.find(".input-or");var useOrValue=mayOrValue&&$orCheckbox.is(":checked");var useOrField=mayOrField&&$orCheckbox.is(":checked");var isOrGroup=(useOrField||useOrValue)&&fieldName=="_custom";if(useOrValue){$row.addClass("has-or-value");$row.find(".select-field, .select-operator, .select-subfield").prop("disabled",true)}else if($row.is(".has-or-value")){$row.removeClass("has-or-value");$row.find(".select-field, .select-operator, .select-subfield").prop("disabled",false)}if(useOrField){$row.addClass("has-or-field");$row.find(".input-value, .select-operator").prop("disabled",true)}else if($row.is(".has-or-field")){$row.removeClass("has-or-field");$row.find(".input-value, .select-operator").prop("disabled",false)}selectors[n++]={not:fieldPrefix==="!",field:fieldName,operator:op,value:value,mayOrValue:mayOrValue,mayOrField:mayOrField,useOrValue:useOrValue,useOrField:useOrField,isOrGroup:isOrGroup,checkbox:$orCheckbox};if(mayOrField||mayOrValue)showOrNotes=true;test+=","+fieldPrefix+fieldName+"~"+op+"~"+value+",";selector+=","+fieldPrefix+fieldName+op+value});if(templateIDs.length>0){var $masterSelect=null;$selectFields.each(function(){var $select=$(this);var numDisabledOptions=0;$select.find("option").each(function(){var $option=$(this);var templates=$option.attr("data-templates");if(typeof templates!="undefined"&&templates!="*"){InputfieldSelector.enableOption($option);var numFound=0;for(i=0;i-1)numFound++}if(numFound){InputfieldSelector.enableOption($option)}else{if(!$option.is(":selected"))InputfieldSelector.disableOption($option);numDisabledOptions++}}});if(numDisabledOptions>0&&!$select.parent().is(".selector-template-row")){$select.find("option:disabled").prop("hidden",true)}})}selector="";for(n=0;n0)selector+=", ";for(var i=0;i0&&selector!=InputfieldSelector.selector){if(!$preview.is(".selector-preview-disabled")){$preview.html(""+initValue+selector+"");$preview.fadeIn()}var $counter=$preview.siblings(".selector-counter");if($counter.length>0&&!$counter.is(".selector-counter-disabled")){$counter.html(InputfieldSelector.spinner).fadeIn("fast");InputfieldSelector.selector=selector;$.post("./?InputfieldSelector=test&name="+$hiddenInput.attr("name"),{selector:selector},function(data){$counter.hide();$counter.html(data);$counter.show()})}}if($hiddenInput.val()!=selector){$hiddenInput.val(selector);if(selector.length==0){$preview.hide();$preview.siblings(".selector-counter").html("")}$hiddenInput.trigger("change")}InputfieldSelector.selector=selector;var $orNotes=$inputfield.find(".or-notes");if(showOrNotes)$orNotes.fadeIn();else $orNotes.hide()}};$(document).ready(function(){InputfieldSelector.init()});
\ No newline at end of file
diff --git a/wire/modules/Jquery/JqueryUI/panel.js b/wire/modules/Jquery/JqueryUI/panel.js
index 3121ed84..6bcba4f8 100644
--- a/wire/modules/Jquery/JqueryUI/panel.js
+++ b/wire/modules/Jquery/JqueryUI/panel.js
@@ -345,7 +345,7 @@ var pwPanels = {
if($('.pw-panel-container-init').length == 0) {
// attach window resize event only if no panels have been opened before
// so that we attach it only if needed, and not more than once
- $(window).resize(pwPanels.windowResizeEvent);
+ $(window).on('resize', pwPanels.windowResizeEvent);
}
if(isOpen) {
diff --git a/wire/modules/Jquery/JqueryUI/panel.min.js b/wire/modules/Jquery/JqueryUI/panel.min.js
index 316687c9..71c6b385 100644
--- a/wire/modules/Jquery/JqueryUI/panel.min.js
+++ b/wire/modules/Jquery/JqueryUI/panel.min.js
@@ -1 +1 @@
-var pwPanels={qty:0,init:function(){var url=window.location.href;if(url.indexOf("pw_panel=1")>-1){$(document).on("mouseover","a",function(){var $a=$(this);var target=$a.attr("target");if(typeof target=="undefined"||target.length==0){$a.attr("target","_parent")}})}else if(url.indexOf("pw_panel=2")>-1){}else{$(".pw-panel").each(function(){var $toggler=$(this);pwPanels.addPanel($toggler)})}},addPanel:function($toggler){var panelURL=$toggler.attr("data-href");var panelID=$toggler.attr("data-panel-id");var panelContainerID="pw-panel-container-"+ ++pwPanels.qty;if(typeof panelURL=="undefined"||!panelURL.length)panelURL=$toggler.attr("href");if(typeof panelURL!="undefined"&&panelURL.length){var hash="";if(panelURL.indexOf("#")>-1){var parts=panelURL.split("#");panelURL=parts[0];hash="#"+parts[1]}panelURL+=(panelURL.indexOf("?")>-1?"&":"?")+"modal=panel&pw_panel=";if($toggler!==null&&$toggler.hasClass("pw-panel-links")){panelURL+="2"}else{panelURL+="1"}panelURL+=hash}var $icon=$("").attr("class","pw-panel-icon fa fa-angle-double-left");var $span=$("").attr("class","ui-button-text").append($icon);var $btn=$("").attr("class","pw-panel-button pw-panel-button-closed ui-button ui-state-default").attr("href",panelURL).on("click",pwPanels.buttonClickEvent).on("mouseover",pwPanels.buttonMouseoverEvent).on("mouseout",pwPanels.buttonMouseoutEvent).append($span);var $panel=$("").attr("id",panelContainerID).attr("class","pw-panel-container pw-panel-container-closed").append($btn);$("body").append($panel);if(typeof panelID!="undefined"&&panelID.length){$("#"+panelID).hide().addClass("pw-panel-element");$panel.addClass("pw-panel-container-element").attr("data-panel-id",panelID)}if($toggler!==null){pwPanels.initToggler($toggler,$btn,$panel)}else{$panel.addClass("pw-panel-left")}},initToggler:function($toggler,$btn,$panel){var panelSide=$toggler.hasClass("pw-panel-right")?"right":"left";var text=$toggler.attr("data-tab-text");var icon=$toggler.attr("data-tab-icon");var offset=$toggler.attr("data-tab-offset");var panelWidth=$toggler.attr("data-panel-width");var btnPos=panelSide=="right"?"left":"right";var btnExtraPx=1;$panel.addClass("pw-panel-tab pw-panel-"+panelSide);$panel.attr("data-href",$btn.attr("href"));if($toggler.hasClass("pw-panel-reload"))$panel.addClass("pw-panel-reload");if(typeof offset!="undefined"){offset=parseInt(offset);if(offset>-1){$btn.css("top",offset+"px")}else{$btn.css("top","auto");$btn.css("bottom",Math.abs(offset)+"px")}}if(typeof text!="undefined"&&text.length){var $btnText=$btn.children(".ui-button-text");var $text=$("").text(text);$btnText.html(""+$text.text()+"");$btn.addClass("pw-panel-button-text");btnExtraPx=7}if(typeof icon!="undefined"&&icon.length){var $icon=$("").addClass("fa fa-fw fa-"+icon);var $text=$btn.children(".ui-button-text");if($btn.hasClass("pw-panel-button-text")){$text.prepend($icon)}else{$text.empty().append($icon);$btn.css(btnPos,-1*$btn.outerWidth()+"px")}}if(typeof panelWidth!="undefined"&&panelWidth.length){$panel.css("width",panelWidth);$panel.css(panelSide,"-"+panelWidth)}if(panelSide=="right"){}else{$btn.css("right",-1*(btnExtraPx+$btn.height())+"px")}if(!$toggler.hasClass("pw-panel-tab")){$btn.addClass("pw-panel-button-hidden")}$toggler.on("click",function(){$btn.trigger("click");return false}).on("mouseover",function(){$btn.trigger("mouseover")}).on("mouseout",function(){$btn.trigger("mouseout")})},initPanelContent:function($panel){var $content=$panel.find(".pw-panel-content");var panelID=$panel.attr("data-panel-id");if($content.length){return $content}else if(typeof panelID!="undefined"){var $panelTarget=$("#"+panelID);if($panelTarget.length){$content=$("").addClass("pw-panel-content").css("overflow","auto");$panel.append($content);$content.append($panelTarget);$panelTarget.show();$panelTarget.trigger("pw-panel-init")}}else{$content=$("").addClass("pw-panel-content").attr("src",$panel.attr("data-href"));$panel.append($content)}return $content},windowResizeEvent:function(){$(".pw-panel-container-init").each(function(){var $panel=$(this);if($panel.hasClass("pw-panel-container-open"))return;var panelWidth=$panel.width();var px=-1*panelWidth+"px";if($panel.hasClass("pw-panel-right")){$panel.css("right",px)}else{$panel.css("left",px)}})},buttonClickEvent:function(){var $btn=$(this);var $panel=$btn.closest(".pw-panel-container");var $panelContent=$panel.find(".pw-panel-content");var isOpen=$panel.hasClass("pw-panel-container-open");var isLoaded=$panel.hasClass("pw-panel-container-loaded");var panelWidth=$panel.width();var panelSide=$panel.hasClass("pw-panel-right")?"right":"left";var hasJQUI=typeof jQuery.ui!="undefined";function animateFinished(){$panel.toggleClass("pw-panel-container-open pw-panel-container-closed");$btn.toggleClass("pw-panel-button-open pw-panel-button-closed")}if($(".pw-panel-container-init").length==0){$(window).resize(pwPanels.windowResizeEvent)}if(isOpen){var px=-1*panelWidth+"px";if(hasJQUI){if(panelSide=="left"){$panel.animate({left:px},150,animateFinished)}else{$panel.animate({right:px},150,animateFinished)}}else{$panel.css(panelSide,px);animateFinished()}$("body").css("overflow","");$("#pw-panel-shade").fadeOut("fast",function(){$(this).remove()});$btn.fadeOut("fast",function(){$btn.removeClass("ui-state-active");$btn.fadeIn("fast")});if(hasJQUI&&panelSide=="left")$panel.resizable("destroy");if($panel.hasClass("pw-panel-reload")){$panel.find("iframe.pw-panel-content").remove()}$(document).trigger("pw-panel-closed",$panel)}else{if($panel.hasClass("pw-panel-reload")||!isLoaded){pwPanels.initPanelContent($panel)}if(hasJQUI){if(panelSide=="left"){$panel.animate({left:0},150,animateFinished)}else{$panel.animate({right:0},150,animateFinished)}}else{$panel.css(panelSide,0);animateFinished()}var $shade=$("
");$panel.before($shade).fadeIn("fast");$("body").css("overflow","hidden");$shade.on("click",function(){var $panel=$(".pw-panel-container-open");if(!$panel.length)return false;$panel.find(".pw-panel-button").trigger("click")});if(hasJQUI&&panelSide=="left")$panel.resizable({handles:"e",start:function(event,ui){var $overlay=$("").addClass("pw-panel-resizable-overlay").css({position:"absolute",top:0,left:0,width:"100%",height:"100%",zIndex:1001,display:"hidden"});$panel.append($overlay)},stop:function(event,ui){$(".pw-panel-resizable-overlay").remove()}});$panel.addClass("pw-panel-container-init");$(document).trigger("pw-panel-opened",$panel)}return false},buttonMouseoverEvent:function(){var $btn=$(this);var $panel=$btn.closest(".pw-panel-container");$btn.removeClass("ui-state-active").addClass("ui-state-hover");if($panel.hasClass("pw-panel-container-loaded"))return;$panel.addClass("pw-panel-container-loaded");if(!$panel.hasClass("pw-panel-reload")){pwPanels.initPanelContent($panel)}},buttonMouseoutEvent:function(){var $btn=$(this);var $panel=$btn.closest(".pw-panel-container");if($panel.hasClass("pw-panel-container-open"))$btn.addClass("ui-state-active")}};jQuery(document).ready(function(){pwPanels.init()});
\ No newline at end of file
+var pwPanels={qty:0,init:function(){var url=window.location.href;if(url.indexOf("pw_panel=1")>-1){$(document).on("mouseover","a",function(){var $a=$(this);var target=$a.attr("target");if(typeof target=="undefined"||target.length==0){$a.attr("target","_parent")}})}else if(url.indexOf("pw_panel=2")>-1){}else{$(".pw-panel").each(function(){var $toggler=$(this);pwPanels.addPanel($toggler)})}},addPanel:function($toggler){var panelURL=$toggler.attr("data-href");var panelID=$toggler.attr("data-panel-id");var panelContainerID="pw-panel-container-"+ ++pwPanels.qty;if(typeof panelURL=="undefined"||!panelURL.length)panelURL=$toggler.attr("href");if(typeof panelURL!="undefined"&&panelURL.length){var hash="";if(panelURL.indexOf("#")>-1){var parts=panelURL.split("#");panelURL=parts[0];hash="#"+parts[1]}panelURL+=(panelURL.indexOf("?")>-1?"&":"?")+"modal=panel&pw_panel=";if($toggler!==null&&$toggler.hasClass("pw-panel-links")){panelURL+="2"}else{panelURL+="1"}panelURL+=hash}var $icon=$("").attr("class","pw-panel-icon fa fa-angle-double-left");var $span=$("").attr("class","ui-button-text").append($icon);var $btn=$("").attr("class","pw-panel-button pw-panel-button-closed ui-button ui-state-default").attr("href",panelURL).on("click",pwPanels.buttonClickEvent).on("mouseover",pwPanels.buttonMouseoverEvent).on("mouseout",pwPanels.buttonMouseoutEvent).append($span);var $panel=$("").attr("id",panelContainerID).attr("class","pw-panel-container pw-panel-container-closed").append($btn);$("body").append($panel);if(typeof panelID!="undefined"&&panelID.length){$("#"+panelID).hide().addClass("pw-panel-element");$panel.addClass("pw-panel-container-element").attr("data-panel-id",panelID)}if($toggler!==null){pwPanels.initToggler($toggler,$btn,$panel)}else{$panel.addClass("pw-panel-left")}},initToggler:function($toggler,$btn,$panel){var panelSide=$toggler.hasClass("pw-panel-right")?"right":"left";var text=$toggler.attr("data-tab-text");var icon=$toggler.attr("data-tab-icon");var offset=$toggler.attr("data-tab-offset");var panelWidth=$toggler.attr("data-panel-width");var btnPos=panelSide=="right"?"left":"right";var btnExtraPx=1;$panel.addClass("pw-panel-tab pw-panel-"+panelSide);$panel.attr("data-href",$btn.attr("href"));if($toggler.hasClass("pw-panel-reload"))$panel.addClass("pw-panel-reload");if(typeof offset!="undefined"){offset=parseInt(offset);if(offset>-1){$btn.css("top",offset+"px")}else{$btn.css("top","auto");$btn.css("bottom",Math.abs(offset)+"px")}}if(typeof text!="undefined"&&text.length){var $btnText=$btn.children(".ui-button-text");var $text=$("").text(text);$btnText.html(""+$text.text()+"");$btn.addClass("pw-panel-button-text");btnExtraPx=7}if(typeof icon!="undefined"&&icon.length){var $icon=$("").addClass("fa fa-fw fa-"+icon);var $text=$btn.children(".ui-button-text");if($btn.hasClass("pw-panel-button-text")){$text.prepend($icon)}else{$text.empty().append($icon);$btn.css(btnPos,-1*$btn.outerWidth()+"px")}}if(typeof panelWidth!="undefined"&&panelWidth.length){$panel.css("width",panelWidth);$panel.css(panelSide,"-"+panelWidth)}if(panelSide=="right"){}else{$btn.css("right",-1*(btnExtraPx+$btn.height())+"px")}if(!$toggler.hasClass("pw-panel-tab")){$btn.addClass("pw-panel-button-hidden")}$toggler.on("click",function(){$btn.trigger("click");return false}).on("mouseover",function(){$btn.trigger("mouseover")}).on("mouseout",function(){$btn.trigger("mouseout")})},initPanelContent:function($panel){var $content=$panel.find(".pw-panel-content");var panelID=$panel.attr("data-panel-id");if($content.length){return $content}else if(typeof panelID!="undefined"){var $panelTarget=$("#"+panelID);if($panelTarget.length){$content=$("").addClass("pw-panel-content").css("overflow","auto");$panel.append($content);$content.append($panelTarget);$panelTarget.show();$panelTarget.trigger("pw-panel-init")}}else{$content=$("").addClass("pw-panel-content").attr("src",$panel.attr("data-href"));$panel.append($content)}return $content},windowResizeEvent:function(){$(".pw-panel-container-init").each(function(){var $panel=$(this);if($panel.hasClass("pw-panel-container-open"))return;var panelWidth=$panel.width();var px=-1*panelWidth+"px";if($panel.hasClass("pw-panel-right")){$panel.css("right",px)}else{$panel.css("left",px)}})},buttonClickEvent:function(){var $btn=$(this);var $panel=$btn.closest(".pw-panel-container");var $panelContent=$panel.find(".pw-panel-content");var isOpen=$panel.hasClass("pw-panel-container-open");var isLoaded=$panel.hasClass("pw-panel-container-loaded");var panelWidth=$panel.width();var panelSide=$panel.hasClass("pw-panel-right")?"right":"left";var hasJQUI=typeof jQuery.ui!="undefined";function animateFinished(){$panel.toggleClass("pw-panel-container-open pw-panel-container-closed");$btn.toggleClass("pw-panel-button-open pw-panel-button-closed")}if($(".pw-panel-container-init").length==0){$(window).on("resize",pwPanels.windowResizeEvent)}if(isOpen){var px=-1*panelWidth+"px";if(hasJQUI){if(panelSide=="left"){$panel.animate({left:px},150,animateFinished)}else{$panel.animate({right:px},150,animateFinished)}}else{$panel.css(panelSide,px);animateFinished()}$("body").css("overflow","");$("#pw-panel-shade").fadeOut("fast",function(){$(this).remove()});$btn.fadeOut("fast",function(){$btn.removeClass("ui-state-active");$btn.fadeIn("fast")});if(hasJQUI&&panelSide=="left")$panel.resizable("destroy");if($panel.hasClass("pw-panel-reload")){$panel.find("iframe.pw-panel-content").remove()}$(document).trigger("pw-panel-closed",$panel)}else{if($panel.hasClass("pw-panel-reload")||!isLoaded){pwPanels.initPanelContent($panel)}if(hasJQUI){if(panelSide=="left"){$panel.animate({left:0},150,animateFinished)}else{$panel.animate({right:0},150,animateFinished)}}else{$panel.css(panelSide,0);animateFinished()}var $shade=$("
");$panel.before($shade).fadeIn("fast");$("body").css("overflow","hidden");$shade.on("click",function(){var $panel=$(".pw-panel-container-open");if(!$panel.length)return false;$panel.find(".pw-panel-button").trigger("click")});if(hasJQUI&&panelSide=="left")$panel.resizable({handles:"e",start:function(event,ui){var $overlay=$("").addClass("pw-panel-resizable-overlay").css({position:"absolute",top:0,left:0,width:"100%",height:"100%",zIndex:1001,display:"hidden"});$panel.append($overlay)},stop:function(event,ui){$(".pw-panel-resizable-overlay").remove()}});$panel.addClass("pw-panel-container-init");$(document).trigger("pw-panel-opened",$panel)}return false},buttonMouseoverEvent:function(){var $btn=$(this);var $panel=$btn.closest(".pw-panel-container");$btn.removeClass("ui-state-active").addClass("ui-state-hover");if($panel.hasClass("pw-panel-container-loaded"))return;$panel.addClass("pw-panel-container-loaded");if(!$panel.hasClass("pw-panel-reload")){pwPanels.initPanelContent($panel)}},buttonMouseoutEvent:function(){var $btn=$(this);var $panel=$btn.closest(".pw-panel-container");if($panel.hasClass("pw-panel-container-open"))$btn.addClass("ui-state-active")}};jQuery(document).ready(function(){pwPanels.init()});
\ No newline at end of file
diff --git a/wire/modules/Process/ProcessModule/ProcessModule.js b/wire/modules/Process/ProcessModule/ProcessModule.js
index c9ce4ae8..511dfd6d 100644
--- a/wire/modules/Process/ProcessModule/ProcessModule.js
+++ b/wire/modules/Process/ProcessModule/ProcessModule.js
@@ -4,7 +4,6 @@ $(document).ready(function() {
var name = $(this).children(".not_installed").attr('data-name');
var $btn = $(".install_" + name + ":visible");
- var disabled = $btn.attr('disabled');
if($btn.length) {
$btn.effect('highlight', 1000);
diff --git a/wire/modules/Process/ProcessModule/ProcessModule.min.js b/wire/modules/Process/ProcessModule/ProcessModule.min.js
index 15f4a593..ec2862a6 100644
--- a/wire/modules/Process/ProcessModule/ProcessModule.min.js
+++ b/wire/modules/Process/ProcessModule/ProcessModule.min.js
@@ -1 +1 @@
-$(document).ready(function(){$(".not_installed").parent("a").css("opacity",.6).on("click",function(){var name=$(this).children(".not_installed").attr("data-name");var $btn=$(".install_"+name+":visible");var disabled=$btn.attr("disabled");if($btn.length){$btn.effect("highlight",1e3)}else{var color=$(this).css("color");$(this).closest("tr").find(".requires").attr("data-color",$(this).css("color")).css("color",color).effect("highlight",1e3)}return false});$("button.ProcessModuleSettings").on("click",function(){var $a=$(this).parents("tr").find(".ConfigurableModule").parent("a");window.location.href=$a.attr("href")+"&collapse_info=1"});if($("#modules_form").length>0){$("#modules_form").WireTabs({items:$(".Inputfields li.WireTab"),rememberTabs:true})}$("select.modules_section_select").on("change",function(){var section=$(this).val();var $sections=$(this).parent("p").siblings(".modules_section");if(section==""){$sections.show()}else{$sections.hide();$sections.filter(".modules_"+section).show()}document.cookie=$(this).attr("name")+"="+section;return true}).trigger("change");$(document).on("click","#head_button a",function(){document.cookie="WireTabs=tab_new_modules";return true});$("#Inputfield_new_seconds").on("change",function(){$("#submit_check").removeAttr("hidden").trigger("click");$(this).closest("form").trigger("submit")});$("#wrap_upload_module").removeClass("InputfieldItemList")});
\ No newline at end of file
+$(document).ready(function(){$(".not_installed").parent("a").css("opacity",.6).on("click",function(){var name=$(this).children(".not_installed").attr("data-name");var $btn=$(".install_"+name+":visible");if($btn.length){$btn.effect("highlight",1e3)}else{var color=$(this).css("color");$(this).closest("tr").find(".requires").attr("data-color",$(this).css("color")).css("color",color).effect("highlight",1e3)}return false});$("button.ProcessModuleSettings").on("click",function(){var $a=$(this).parents("tr").find(".ConfigurableModule").parent("a");window.location.href=$a.attr("href")+"&collapse_info=1"});if($("#modules_form").length>0){$("#modules_form").WireTabs({items:$(".Inputfields li.WireTab"),rememberTabs:true})}$("select.modules_section_select").on("change",function(){var section=$(this).val();var $sections=$(this).parent("p").siblings(".modules_section");if(section==""){$sections.show()}else{$sections.hide();$sections.filter(".modules_"+section).show()}document.cookie=$(this).attr("name")+"="+section;return true}).trigger("change");$(document).on("click","#head_button a",function(){document.cookie="WireTabs=tab_new_modules";return true});$("#Inputfield_new_seconds").on("change",function(){$("#submit_check").removeAttr("hidden").trigger("click");$(this).closest("form").trigger("submit")});$("#wrap_upload_module").removeClass("InputfieldItemList")});
\ No newline at end of file
diff --git a/wire/modules/Process/ProcessPageEditImageSelect/ProcessPageEditImageSelect.js b/wire/modules/Process/ProcessPageEditImageSelect/ProcessPageEditImageSelect.js
index 9097380a..a5003ed9 100644
--- a/wire/modules/Process/ProcessPageEditImageSelect/ProcessPageEditImageSelect.js
+++ b/wire/modules/Process/ProcessPageEditImageSelect/ProcessPageEditImageSelect.js
@@ -111,8 +111,8 @@ function setupSelectedImage() {
function populateResizeDimensions() {
- var w = $img.width();
- var h = $img.height();
+ var w = Math.round($img.width());
+ var h = Math.round($img.height());
var $link = $("#wrap_link_original");
if((h >= maxHeight || w >= maxWidth) && $form.hasClass('croppable')) {
@@ -345,8 +345,8 @@ function setupSelectedImage() {
}
if(abort) {
- $("#input_width").val(oldWidth);
- $("#input_height").val(oldHeight);
+ $("#input_width").val(Math.round(oldWidth));
+ $("#input_height").val(Math.round(oldHeight));
inputPixelsActive = false;
return false;
}
diff --git a/wire/modules/Process/ProcessPageEditImageSelect/ProcessPageEditImageSelect.min.js b/wire/modules/Process/ProcessPageEditImageSelect/ProcessPageEditImageSelect.min.js
index fc81a0a2..5f96a6ff 100644
--- a/wire/modules/Process/ProcessPageEditImageSelect/ProcessPageEditImageSelect.min.js
+++ b/wire/modules/Process/ProcessPageEditImageSelect/ProcessPageEditImageSelect.min.js
@@ -1 +1 @@
-function enablePWImageDialogButtons(){var $buttonPane=parent.jQuery(".ui-dialog-buttonpane");$buttonPane.find("button").button("enable");return}function disablePWImageDialogButtons(){var $buttonPane=parent.jQuery(".ui-dialog-buttonpane");$buttonPane.find("button").button("disable");return}function closePWImageDialog(){parent.jQuery("iframe.ui-dialog-content").dialog("close")}function setupProcessSaveReloaded(fileID,isNew){if(isNew){var offsetTop=parent.jQuery("#"+fileID).offset().top-20;parent.jQuery("html, body").animate({scrollTop:offsetTop},1e3,"swing");parent.jQuery("#"+fileID).hide();setTimeout(function(){parent.jQuery("#"+fileID).slideDown()},900)}else{parent.jQuery("#"+fileID).find("img").hide();setTimeout(function(){parent.jQuery("#"+fileID).find("img").fadeIn("normal",function(){parent.jQuery("#"+fileID).find(".gridImage__edit").trigger("click")})},500)}closePWImageDialog()}function setupProcessSave(fieldName,fileID,isNew){var finished=false;var $inputfield=parent.jQuery("#wrap_Inputfield_"+fieldName);if(!$inputfield.length){$inputfield=parent.jQuery("#"+fileID).closest(".InputfieldImage")}$inputfield.trigger("reload");parent.jQuery(".Inputfield").on("reloaded",function(){if(finished)return;finished=true;if(fileID.length>0){setTimeout(function(){setupProcessSaveReloaded(fileID,isNew)},250)}})}function refreshPageEditField(fieldName){parent.jQuery("#wrap_Inputfield_"+fieldName).trigger("reload")}function setupExecuteVariations(){$(document).on("click","input#delete_all",function(event){if($(this).is(":checked")){$("input.delete").prop("checked",true)}else{$("input.delete").prop("checked",false)}event.stopPropagation()});var magnificOptions={type:"image",closeOnContentClick:true,closeBtnInside:true};$("a.preview").magnificPopup(magnificOptions);var $varcnt=$("#varcnt_id");var varcntID=$varcnt.val();var varcnt=$varcnt.attr("data-cnt");window.parent.jQuery("#"+varcntID).text(varcnt)}function setupSelectedImage(){var croppingActive=false;var inputPixelsActive=false;var $form=$("#selected_image_settings");var $container=$("#selected_image_container");var $img=$("#selected_image");var $hidpi=$("#selected_image_hidpi");var fullWidth;var minWidth=0;var minHeight=0;function setupImage($img){var originalWidth=$img.width();var maxWidth=9999;var maxHeight=9999;function updateHidpiCheckbox(w){if(w=maxHeight||w>=maxWidth)&&$form.hasClass("croppable")){w=maxWidth;h=maxHeight;$("#selected_image_link").prop("checked",false);$link.hide()}else{if(!$link.is(":visible")){$link.fadeIn();if($link.attr("data-was-checked")==1){$link.prop("checked",true)}}}$("#input_width").val(w);$("#input_height").val(h);$img.attr("width",w);$img.attr("height",h);updateHidpiCheckbox(w);var $latin=$("#latin");if($latin.is(":visible"))$latin.height(h);if(!$form.hasClass("rte")){var $useResize=$("#selected_image_resize");if(originalWidth<=w){$useResize.hide()}else{if(!$useResize.is(":visible"))$useResize.fadeIn()}}}function setupImageResizable(){$img.resizable({aspectRatio:true,handles:"n, ne, e, se, s, sw, w",alsoResize:"#selected_image_container",maxWidth:maxWidth,maxHeight:maxHeight,minWidth:10,minHeight:10,start:function(){$form.addClass("resizing_active")},stop:function(){$img.attr("width",$img.width()).attr("height",$img.height());if(originalWidth!=$img.width()){$img.addClass("resized");if(!$form.hasClass("rte")){var $resizeYes=$("#selected_image_resize_yes");if(!$resizeYes.is(":checked")){$resizeYes.prop("checked",true);$("#selected_image_resize_no").prop("checked",false)}}}$form.removeClass("resizing_active");if($("#resize_action").hasClass("on"))$("#resize_action").trigger("click").mouseout()},resize:populateResizeDimensions});$img.addClass("resizable_setup")}var cropData=null;function setupImageCroppable(){var cropButtons=[{html:$("#button_crop").html(),click:function(){$("#button_crop").trigger("click")}},{html:$("#button_cancel_crop").html(),click:function(){$("#button_cancel_crop").trigger("click")},class:"ui-priority-secondary"}];$(".show_when_crop").hide();$("#crop_action, .crop_trigger").on("click",function(e){var recrop=$(this).attr("data-recrop");if(recrop&&recrop.length>0){window.location.assign(recrop);return true}if(!$form.hasClass("croppable"))return;if(croppingActive)return false;croppingActive=true;$("#selected_image_settings").addClass("cropping_active");$(".hide_when_crop").hide();$(".show_when_crop").show();if($img.hasClass("resizable_setup"))$img.resizable("destroy");var cropSettings={autoCrop:true,autoCropArea:.35,zoomable:false,rotatable:false,maxWidth:$img.attr("data-origwidth"),maxHeight:$img.attr("data-origheight"),minCropBoxWidth:minWidth<2?0:minWidth,minCropBoxHeight:minHeight<2?0:minHeight,minWidth:minWidth<2?0:minWidth,minHeight:minHeight<2?0:minHeight,done:function(data){$("#crop_x").val(Math.floor(data.x));$("#crop_y").val(Math.floor(data.y));$("#crop_w").val(Math.floor(data.width));$("#crop_h").val(Math.floor(data.height));cropData=data}};var crop=$img.attr("data-crop");if(crop&&crop.length>0){crop=crop.split(",");cropSettings.data={x:crop[0],y:crop[1],width:crop[2],height:crop[3]};setTimeout(function(){disablePWImageDialogButtons(cropButtons)},1e3)}else{disablePWImageDialogButtons(cropButtons)}$img.cropper(cropSettings);setTimeout(function(){$(".cropper-canvas").width($(".cropper-container").width()).height($(".cropper-container").height())},500);var cropCoordinatesChange=function(){var data={x:parseInt($("#crop_x").val()),y:parseInt($("#crop_y").val()),width:parseInt($("#crop_w").val()),height:parseInt($("#crop_h").val()),rotate:0};$img.cropper("setData",data)};$("#crop_coordinates input").on("change",cropCoordinatesChange)});function stopCrop(){$img.cropper("destroy");$(".show_when_crop").hide();$(".hide_when_crop").show();croppingActive=false;$("#selected_image_settings").removeClass("cropping_active");setupImageResizable();enablePWImageDialogButtons()}$("#button_cancel_crop").on("click",function(){stopCrop()});$("#button_crop").on("click",function(){if($form.hasClass("processing"))return false;$form.addClass("processing");return true});if($img.attr("data-crop")){$("#crop_action").trigger("click")}}function inputPixelsChange(event){if(inputPixelsActive)return;if($(this).parents("#crop_coordinates").length)return;inputPixelsActive=true;var w,h,abort=false,noChange=false,oldWidth=$img.attr("width"),oldHeight=$img.attr("height"),origWidth=parseInt($img.attr("data-origwidth")),origHeight=parseInt($img.attr("data-origheight"));oldWidth=typeof oldWidth=="undefined"?$img.width():parseInt(oldWidth);oldHeight=typeof oldHeight=="undefined"?$img.height():parseInt(oldHeight);if($(this).attr("id")=="input_width"){w=parseInt($(this).val());h=origHeight/(origWidth/w);if(w==oldWidth)noChange=true}else{h=parseInt($(this).val());w=Math.round(h/oldHeight*oldWidth);w=origWidth/(origHeight/h);if(h==oldHeight)noChange=true}if(w<1||h<1||noChange){abort=1}else if(maxWidth>0&&w>maxWidth){abort=2}else if(minWidth>1&&w1&&hmaxWidth)origWidth=maxWidth;if(origWidth>$(window).width()){$("#content").css("overflow-x","auto")}$("#input_width").val(origWidth).trigger("change")});$("#min_action").on("click",function(){var imgWidth=$img.width();var imgHeight=$img.height();var windowWidth=$(window).width()-30;var windowHeight=$(window).height()-$("#wrap_info").height()-60;var updated=false;if(imgHeight>windowHeight){$("#input_height").val(windowHeight).trigger("change");updated=true}if(imgWidth>windowWidth){$("#input_width").val(windowWidth).trigger("change");updated=true}if(!updated){$("#input_width").val(Math.ceil(imgWidth/2)).trigger("change")}});$("#align_left_action, #align_center_action, #align_right_action").on("click",function(){var $select=$("#selected_image_class");var labelKey=$(this).attr("data-label");if($(this).hasClass("on")){$select.children("option").removeAttr("selected");$(this).removeClass("on")}else{$(this).siblings(".on").removeClass("on");$select.children("option").removeAttr("selected");$select.find("option[data-label="+labelKey+"]").attr("selected","selected");$(this).addClass("on")}$select.trigger("change")});var labelKey=$("#selected_image_class").find("option[selected=selected]").attr("data-label");if(labelKey)$("#action_icons").find("span[data-label="+labelKey+"]").addClass("on");$("#resize_action").on("mouseenter",function(){if($(this).hasClass("on"))return;$("#resize_tips").show();$("#input_width, #input_height").addClass("ui-state-highlight")}).on("mouseleave",function(){if($(this).hasClass("on"))return;$("#resize_tips").hide();$("#input_width, #input_height").removeClass("ui-state-highlight")}).on("click",function(){if($(this).hasClass("on")){$(this).removeClass("on");$("#input_width, #input_height").removeClass("ui-state-highlight")}else{$(this).addClass("on");$("#input_width, #input_height").addClass("ui-state-highlight")}});$("#description_action").on("click",function(){if($(this).hasClass("on")){$(this).removeClass("on");$("#wrap_description").slideUp("fast")}else{$(this).addClass("on");$("#wrap_description").slideDown("fast")}})}function setupImageCaption(){$("#selected_image_caption").on("change",function(){if($form.hasClass("cropping_active"))return;var $caption=$("#caption_preview");if($(this).is(":checked")){$caption.fadeIn()}else if($caption.is(":visible")){$caption.fadeOut()}}).trigger("change")}function fitImageToWindow(){var winwidth=$(window).width()-30;var winheight=$(window).height()-($("#wrap_info").height()+60);if($img.width()>winwidth){$img.width(winwidth).css("height","auto").removeAttr("height");$img.removeAttr("height")}if($img.height()>winheight){$img.removeAttr("width").css("width","auto").height(winheight)}$container.width($img.width()).height($img.height())}$("#loading_button").hide();if($img.attr("data-fit")){fitImageToWindow()}else{$container.width($img.width()).height($img.height())}$("#selected_image_settings .input_pixels").on("change",inputPixelsChange);$("#selected_image_class").on("change",alignClassChange).trigger("change");fullWidth=$img.attr("data-origwidth");populateResizeDimensions();setupImageCroppable();setupImageActions();setupImageCaption();$("button.submit_save_copy, button.submit_save_replace").on("click",function(){$form.addClass("processing");disablePWImageDialogButtons()})}if($img.length>0){$img=$img.first();if($img.width()>0&&$img.height()>0){setupImage($img)}else{$img.on("load",function(){$img=$(this);setupImage($img)})}}}$(document).ready(function(){var $page_id=$("#page_id");if($page_id.length>0){var page_id=$page_id.val();$page_id.on("pageSelected",function(event,data){if(data.id==page_id)return;window.location="./?id="+data.id+"&modal=1"})}if($("#selected_image").length>0){setTimeout(function(){setupSelectedImage()},250)}else if($("#ImageVariations").length>0){setupExecuteVariations()}enablePWImageDialogButtons();$(window).on("keydown",function(event){if(event.keyCode==13){event.preventDefault();return false}})});
\ No newline at end of file
+function enablePWImageDialogButtons(){var $buttonPane=parent.jQuery(".ui-dialog-buttonpane");$buttonPane.find("button").button("enable");return}function disablePWImageDialogButtons(){var $buttonPane=parent.jQuery(".ui-dialog-buttonpane");$buttonPane.find("button").button("disable");return}function closePWImageDialog(){parent.jQuery("iframe.ui-dialog-content").dialog("close")}function setupProcessSaveReloaded(fileID,isNew){if(isNew){var offsetTop=parent.jQuery("#"+fileID).offset().top-20;parent.jQuery("html, body").animate({scrollTop:offsetTop},1e3,"swing");parent.jQuery("#"+fileID).hide();setTimeout(function(){parent.jQuery("#"+fileID).slideDown()},900)}else{parent.jQuery("#"+fileID).find("img").hide();setTimeout(function(){parent.jQuery("#"+fileID).find("img").fadeIn("normal",function(){parent.jQuery("#"+fileID).find(".gridImage__edit").trigger("click")})},500)}closePWImageDialog()}function setupProcessSave(fieldName,fileID,isNew){var finished=false;var $inputfield=parent.jQuery("#wrap_Inputfield_"+fieldName);if(!$inputfield.length){$inputfield=parent.jQuery("#"+fileID).closest(".InputfieldImage")}$inputfield.trigger("reload");parent.jQuery(".Inputfield").on("reloaded",function(){if(finished)return;finished=true;if(fileID.length>0){setTimeout(function(){setupProcessSaveReloaded(fileID,isNew)},250)}})}function refreshPageEditField(fieldName){parent.jQuery("#wrap_Inputfield_"+fieldName).trigger("reload")}function setupExecuteVariations(){$(document).on("click","input#delete_all",function(event){if($(this).is(":checked")){$("input.delete").prop("checked",true)}else{$("input.delete").prop("checked",false)}event.stopPropagation()});var magnificOptions={type:"image",closeOnContentClick:true,closeBtnInside:true};$("a.preview").magnificPopup(magnificOptions);var $varcnt=$("#varcnt_id");var varcntID=$varcnt.val();var varcnt=$varcnt.attr("data-cnt");window.parent.jQuery("#"+varcntID).text(varcnt)}function setupSelectedImage(){var croppingActive=false;var inputPixelsActive=false;var $form=$("#selected_image_settings");var $container=$("#selected_image_container");var $img=$("#selected_image");var $hidpi=$("#selected_image_hidpi");var fullWidth;var minWidth=0;var minHeight=0;function setupImage($img){var originalWidth=$img.width();var maxWidth=9999;var maxHeight=9999;function updateHidpiCheckbox(w){if(w=maxHeight||w>=maxWidth)&&$form.hasClass("croppable")){w=maxWidth;h=maxHeight;$("#selected_image_link").prop("checked",false);$link.hide()}else{if(!$link.is(":visible")){$link.fadeIn();if($link.attr("data-was-checked")==1){$link.prop("checked",true)}}}$("#input_width").val(w);$("#input_height").val(h);$img.attr("width",w);$img.attr("height",h);updateHidpiCheckbox(w);var $latin=$("#latin");if($latin.is(":visible"))$latin.height(h);if(!$form.hasClass("rte")){var $useResize=$("#selected_image_resize");if(originalWidth<=w){$useResize.hide()}else{if(!$useResize.is(":visible"))$useResize.fadeIn()}}}function setupImageResizable(){$img.resizable({aspectRatio:true,handles:"n, ne, e, se, s, sw, w",alsoResize:"#selected_image_container",maxWidth:maxWidth,maxHeight:maxHeight,minWidth:10,minHeight:10,start:function(){$form.addClass("resizing_active")},stop:function(){$img.attr("width",$img.width()).attr("height",$img.height());if(originalWidth!=$img.width()){$img.addClass("resized");if(!$form.hasClass("rte")){var $resizeYes=$("#selected_image_resize_yes");if(!$resizeYes.is(":checked")){$resizeYes.prop("checked",true);$("#selected_image_resize_no").prop("checked",false)}}}$form.removeClass("resizing_active");if($("#resize_action").hasClass("on"))$("#resize_action").trigger("click").mouseout()},resize:populateResizeDimensions});$img.addClass("resizable_setup")}var cropData=null;function setupImageCroppable(){var cropButtons=[{html:$("#button_crop").html(),click:function(){$("#button_crop").trigger("click")}},{html:$("#button_cancel_crop").html(),click:function(){$("#button_cancel_crop").trigger("click")},class:"ui-priority-secondary"}];$(".show_when_crop").hide();$("#crop_action, .crop_trigger").on("click",function(e){var recrop=$(this).attr("data-recrop");if(recrop&&recrop.length>0){window.location.assign(recrop);return true}if(!$form.hasClass("croppable"))return;if(croppingActive)return false;croppingActive=true;$("#selected_image_settings").addClass("cropping_active");$(".hide_when_crop").hide();$(".show_when_crop").show();if($img.hasClass("resizable_setup"))$img.resizable("destroy");var cropSettings={autoCrop:true,autoCropArea:.35,zoomable:false,rotatable:false,maxWidth:$img.attr("data-origwidth"),maxHeight:$img.attr("data-origheight"),minCropBoxWidth:minWidth<2?0:minWidth,minCropBoxHeight:minHeight<2?0:minHeight,minWidth:minWidth<2?0:minWidth,minHeight:minHeight<2?0:minHeight,done:function(data){$("#crop_x").val(Math.floor(data.x));$("#crop_y").val(Math.floor(data.y));$("#crop_w").val(Math.floor(data.width));$("#crop_h").val(Math.floor(data.height));cropData=data}};var crop=$img.attr("data-crop");if(crop&&crop.length>0){crop=crop.split(",");cropSettings.data={x:crop[0],y:crop[1],width:crop[2],height:crop[3]};setTimeout(function(){disablePWImageDialogButtons(cropButtons)},1e3)}else{disablePWImageDialogButtons(cropButtons)}$img.cropper(cropSettings);setTimeout(function(){$(".cropper-canvas").width($(".cropper-container").width()).height($(".cropper-container").height())},500);var cropCoordinatesChange=function(){var data={x:parseInt($("#crop_x").val()),y:parseInt($("#crop_y").val()),width:parseInt($("#crop_w").val()),height:parseInt($("#crop_h").val()),rotate:0};$img.cropper("setData",data)};$("#crop_coordinates input").on("change",cropCoordinatesChange)});function stopCrop(){$img.cropper("destroy");$(".show_when_crop").hide();$(".hide_when_crop").show();croppingActive=false;$("#selected_image_settings").removeClass("cropping_active");setupImageResizable();enablePWImageDialogButtons()}$("#button_cancel_crop").on("click",function(){stopCrop()});$("#button_crop").on("click",function(){if($form.hasClass("processing"))return false;$form.addClass("processing");return true});if($img.attr("data-crop")){$("#crop_action").trigger("click")}}function inputPixelsChange(event){if(inputPixelsActive)return;if($(this).parents("#crop_coordinates").length)return;inputPixelsActive=true;var w,h,abort=false,noChange=false,oldWidth=$img.attr("width"),oldHeight=$img.attr("height"),origWidth=parseInt($img.attr("data-origwidth")),origHeight=parseInt($img.attr("data-origheight"));oldWidth=typeof oldWidth=="undefined"?$img.width():parseInt(oldWidth);oldHeight=typeof oldHeight=="undefined"?$img.height():parseInt(oldHeight);if($(this).attr("id")=="input_width"){w=parseInt($(this).val());h=origHeight/(origWidth/w);if(w==oldWidth)noChange=true}else{h=parseInt($(this).val());w=Math.round(h/oldHeight*oldWidth);w=origWidth/(origHeight/h);if(h==oldHeight)noChange=true}if(w<1||h<1||noChange){abort=1}else if(maxWidth>0&&w>maxWidth){abort=2}else if(minWidth>1&&w1&&hmaxWidth)origWidth=maxWidth;if(origWidth>$(window).width()){$("#content").css("overflow-x","auto")}$("#input_width").val(origWidth).trigger("change")});$("#min_action").on("click",function(){var imgWidth=$img.width();var imgHeight=$img.height();var windowWidth=$(window).width()-30;var windowHeight=$(window).height()-$("#wrap_info").height()-60;var updated=false;if(imgHeight>windowHeight){$("#input_height").val(windowHeight).trigger("change");updated=true}if(imgWidth>windowWidth){$("#input_width").val(windowWidth).trigger("change");updated=true}if(!updated){$("#input_width").val(Math.ceil(imgWidth/2)).trigger("change")}});$("#align_left_action, #align_center_action, #align_right_action").on("click",function(){var $select=$("#selected_image_class");var labelKey=$(this).attr("data-label");if($(this).hasClass("on")){$select.children("option").removeAttr("selected");$(this).removeClass("on")}else{$(this).siblings(".on").removeClass("on");$select.children("option").removeAttr("selected");$select.find("option[data-label="+labelKey+"]").attr("selected","selected");$(this).addClass("on")}$select.trigger("change")});var labelKey=$("#selected_image_class").find("option[selected=selected]").attr("data-label");if(labelKey)$("#action_icons").find("span[data-label="+labelKey+"]").addClass("on");$("#resize_action").on("mouseenter",function(){if($(this).hasClass("on"))return;$("#resize_tips").show();$("#input_width, #input_height").addClass("ui-state-highlight")}).on("mouseleave",function(){if($(this).hasClass("on"))return;$("#resize_tips").hide();$("#input_width, #input_height").removeClass("ui-state-highlight")}).on("click",function(){if($(this).hasClass("on")){$(this).removeClass("on");$("#input_width, #input_height").removeClass("ui-state-highlight")}else{$(this).addClass("on");$("#input_width, #input_height").addClass("ui-state-highlight")}});$("#description_action").on("click",function(){if($(this).hasClass("on")){$(this).removeClass("on");$("#wrap_description").slideUp("fast")}else{$(this).addClass("on");$("#wrap_description").slideDown("fast")}})}function setupImageCaption(){$("#selected_image_caption").on("change",function(){if($form.hasClass("cropping_active"))return;var $caption=$("#caption_preview");if($(this).is(":checked")){$caption.fadeIn()}else if($caption.is(":visible")){$caption.fadeOut()}}).trigger("change")}function fitImageToWindow(){var winwidth=$(window).width()-30;var winheight=$(window).height()-($("#wrap_info").height()+60);if($img.width()>winwidth){$img.width(winwidth).css("height","auto").removeAttr("height");$img.removeAttr("height")}if($img.height()>winheight){$img.removeAttr("width").css("width","auto").height(winheight)}$container.width($img.width()).height($img.height())}$("#loading_button").hide();if($img.attr("data-fit")){fitImageToWindow()}else{$container.width($img.width()).height($img.height())}$("#selected_image_settings .input_pixels").on("change",inputPixelsChange);$("#selected_image_class").on("change",alignClassChange).trigger("change");fullWidth=$img.attr("data-origwidth");populateResizeDimensions();setupImageCroppable();setupImageActions();setupImageCaption();$("button.submit_save_copy, button.submit_save_replace").on("click",function(){$form.addClass("processing");disablePWImageDialogButtons()})}if($img.length>0){$img=$img.first();if($img.width()>0&&$img.height()>0){setupImage($img)}else{$img.on("load",function(){$img=$(this);setupImage($img)})}}}$(document).ready(function(){var $page_id=$("#page_id");if($page_id.length>0){var page_id=$page_id.val();$page_id.on("pageSelected",function(event,data){if(data.id==page_id)return;window.location="./?id="+data.id+"&modal=1"})}if($("#selected_image").length>0){setTimeout(function(){setupSelectedImage()},250)}else if($("#ImageVariations").length>0){setupExecuteVariations()}enablePWImageDialogButtons();$(window).on("keydown",function(event){if(event.keyCode==13){event.preventDefault();return false}})});
\ No newline at end of file
diff --git a/wire/modules/Process/ProcessPageEditImageSelect/cropper/cropper.js b/wire/modules/Process/ProcessPageEditImageSelect/cropper/cropper.js
index eeef673b..2e972e67 100755
--- a/wire/modules/Process/ProcessPageEditImageSelect/cropper/cropper.js
+++ b/wire/modules/Process/ProcessPageEditImageSelect/cropper/cropper.js
@@ -65,7 +65,11 @@
isNumber = function (n) {
return typeof n === "number";
},
-
+
+ isFunction = function (obj) { // RJC
+ return typeof obj === "function" && typeof obj.nodeType !== "number" && typeof obj.item !== "function";
+ },
+
toArray = function (obj, offset) {
var args = [];
@@ -119,7 +123,7 @@
constructor: Cropper,
support: {
- canvas: $.isFunction($("