Changeset 2956716

Timestamp:

08/22/2023 10:51:33 AM (2 years ago)

Author:

valiano

Message:

updated to 1.5.83 version.

Location:

unlimited-elements-for-elementor/trunk

Files:

• assets_libraries/filters/ue_filters.js (modified) (2 diffs)
• assets_libraries/form/uc_form.js (modified) (23 diffs)
• assets_libraries/remote/ue-remote-controls.js (modified) (1 diff)
• inc_php/unitecreator_filters_process.class.php (modified) (11 diffs)
• inc_php/unitecreator_globals.class.php (modified) (1 diff)
• inc_php/unitecreator_settings.class.php (modified) (1 diff)
• inc_php/unitecreator_template_engine.class.php (modified) (1 diff)
• includes.php (modified) (1 diff)
• provider/core/plugins/unlimited_elements/helper_provider_core.class.php (modified) (1 diff)
• provider/woocommerce_integrate.class.php (modified) (1 diff)
• readme.txt (modified) (1 diff)
• release_log.txt (modified) (1 diff)

unlimited-elements-for-elementor/trunk/assets_libraries/filters/ue_filters.js

@@ -3206 +3206 @@
         bindFilterToGrid(objGrid, objFilter);
         
+        //set data var
+        if(g_showDebug == true)
+            objFilter.attr("data-showdebug", true);
+        
+        
         switch(type){
             case g_types.TERMS_LIST:
@@ -3759 +3764 @@
           if(!queryData)
             return(null);
-      
+         
          var objData = jQuery.parseJSON(queryData);
         
+         if(g_showDebug == true){
+             console.log("getQueryData (filter, grid, querydata): ",objFilter, objGrid, queryData);
+         }
+         
         return(objData);
     }

unlimited-elements-for-elementor/trunk/assets_libraries/form/uc_form.js

@@ -1 +1 @@
 "use strict";
 
-//version: 1.3
+//version: 1.4
 
 function UnlimitedElementsForm(){
@@ -31 +31 @@
     
     objError.show();
-
+    
     var objErrorParent = objError.parents(".debug-wrapper");
     
     if(!objErrorParent.length)
     throw new Error(consoleErrorText);    
-
+    
     objErrorParent.addClass("ue_error_true");
-
+    
     throw new Error(consoleErrorText); 
     
@@ -46 +46 @@
   * get formula names
   */
-  function getFormulaNames(expr, objError){
+  function getFormulaNames(expr, objError){ 
     
     var regex = /\[(.*?)\]/g;
@@ -56 +56 @@
     names = matches.map(match => match.substring(1, match.length - 1));     
     
+    if(names == undefined)
+    return(false);
+    
+    //check for space inside name
+    names.forEach(function(name, index){
+      
+      for (var i = 0; i < name.length; i++) {
+        
+        var currentChar = name[i];
+        
+        if(currentChar === " "){
+          
+          var errorText = 'Unlimited Elements Form Error: Name option must not contain spaces inside. Found in name: '+name;
+          var consoleErrorText = "Space character in name found";
+          
+          showCustomError(objError, errorText, consoleErrorText);
+          
+        }
+        
+      }
+      
+    });
+    
+    //remove spacing in case they were not removed before
+    expr = expr.replace(/\s+/g, "");
+    
     var unmatches = expr.replace(regex, "").split(/[\[\]]/);
     
@@ -81 +107 @@
     var names = getFormulaNames(expr, objError);
     
+    if(names == undefined || names == false)
+    return(expr);
+    
     names.forEach(function(name, index){
       
@@ -103 +132 @@
       }
       
+      //check if uppercase characters are in name
+      for (var i = 0; i < name.length; i++) {
+        
+        var currentChar = name[i];
+        
+        if (currentChar === currentChar.toUpperCase() && currentChar !== currentChar.toLowerCase()){
+          
+          var errorText = 'Unlimited Elements Form Error: Name option must not contain Uppercase characters. Found in name: '+name;
+          var consoleErrorText = "Uppercase in name found";
+          
+          showCustomError(objError, errorText, consoleErrorText);
+          
+        }
+        
+        if(currentChar === " "){
+          
+          var errorText = 'Unlimited Elements Form Error: Name option must not contain spaces inside. Found in name: '+name;
+          var consoleErrorText = "Space character in name found";
+          
+          showCustomError(objError, errorText, consoleErrorText);
+          
+        }
+        
+      }
+      
       var inputValue = objInpput.val();
       
       //add parentheses if valus is less then 0
       if(inputValue < 0)
-      inputValue = "("+inputValue+")"
+      inputValue = "("+inputValue+")";
+      
+      //if input is empty then count it as 0
+      if(inputValue.length == 0)
+      inputValue = 0;
       
       expr = expr.replace(name, inputValue);
@@ -122 +180 @@
   * validate the expression
   */
-  function validateExpression(expr){      
+  function validateExpression(expr){  
     
     //allow Math.something (math js operation), numbers, float numbers, math operators, dots, comas    
@@ -143 +201 @@
   function getResult(expr, objError) {
     
-    //if space just erase it
+    //if space just erase it    
     expr = expr.replace(/\s+/g, "");
     
@@ -214 +272 @@
     if(dataFormula == "" || dataFormula == undefined)
     return(false);
-
+    
     //get result with numbers instead of fields name
     var result = getResult(dataFormula, objError);
-
+    
     //format result
     result = formatResultNumber(result, objCalcInput);
@@ -224 +282 @@
     objCalcInput.val(result);
     
-    //set readonly attr
+    //set readonly attr if needed
+    var dataRemoveReadonlyCalcMode = objCalcInput.data("remove-readonly-for-calc-mode");
+
+    if(dataRemoveReadonlyCalcMode == false)
     objCalcInput.attr('readonly', '');
     
@@ -249 +310 @@
     var names = getFormulaNames(expr, objError);
     
+    if(names == undefined || names == false)
+    return(false);
+    
     names.forEach(function(name, index){
       
       var objInpput = jQuery(ueInputFieldSelector+'[name="'+name+'"]');
-      
-      objInpput.attr("data-parent-formula-input", parentIdAttribute);      
+      var dataParentFormulaInputArray = objInpput.data("parent-formula-input");
+      
+      //if attr not exist create it
+      if(dataParentFormulaInputArray === undefined)      
+      objInpput.attr("data-parent-formula-input", parentIdAttribute);   
+      
+      //if attr exist, add new parent id to it
+      if(dataParentFormulaInputArray !== undefined){
+        
+        dataParentFormulaInputArray = dataParentFormulaInputArray.split(",");
+        
+        dataParentFormulaInputArray.push(parentIdAttribute);
+        
+        objInpput.attr("data-parent-formula-input", dataParentFormulaInputArray); 
+        
+      }
       
     });
@@ -264 +342 @@
   function getParentCalcInput(objInput){
     
-    var parentAttr = objInput.data("parent-formula-input");
-    
-    if(!parentAttr)
-    return(null); 
-    
-    var objParentCalkInput = jQuery("#"+parentAttr).find("[data-calc-mode='true']");
-    
-    return(objParentCalkInput);
+    var parentsArray = objInput.attr("data-parent-formula-input");
+    
+    var objParentsArray = [];
+        
+    //make sure attr is an array
+    if(parentsArray != undefined){
+      
+      parentsArray = parentsArray.split(",");
+      
+      parentsArray.forEach(function(id, index){
+        
+        var parentId = id;
+        var objParentCalcInput = jQuery("#"+parentId).find("[data-calc-mode='true']");
+        
+        objParentsArray.push(objParentCalcInput);
+        
+      });
+      
+      return(objParentsArray);
+      
+    }
     
   }
@@ -279 +370 @@
   */
   function showField(objFieldWidget, classHidden){
-   
+    
     objFieldWidget.removeClass(classHidden);
     
@@ -288 +379 @@
   */
   function hideField(objFieldWidget, classHidden){
-  
+    
     objFieldWidget.addClass(classHidden);
     
@@ -297 +388 @@
   */
   function getConditions(visibilityCondition, condition, objFieldValue, fieldValue){
-     
+    
     switch (condition) {
       case "=":
@@ -307 +398 @@
       
       visibilityCondition = objFieldValue > fieldValue;
-            
+      
       break;
       case ">=":
@@ -381 +472 @@
     
     var isNamesEqual = arrNames.indexOf(inputName) != -1;
-   
+    
     if(isNamesEqual == true){
       
@@ -427 +518 @@
       var names = getFormulaNames(formula, objError);
       
+      if(names == undefined || names == false)
+      return(false);
+      
       names.forEach(function(name, index){
         
@@ -455 +549 @@
     var classHidden = "ucform-has-conditions";
     var classError = "ue-error";
-     
+    
     var conditions = conditionArray.visibility_conditions;
     var conditionsNum = conditions.length;
@@ -478 +572 @@
       var objField = jQuery(ueInputFieldSelector+'[name="'+fieldName+'"]');
       var objFieldValue = parseInt(objField.val());
-    
+      
       //sets the condition: "==", ">", "<" ...
       var visibilityCondition = getConditions(visibilityCondition, condition, objFieldValue, fieldValue);
@@ -495 +589 @@
       arrNames = getNames(arrNames, fieldName);
       
-      var objInputField = objFieldWidget.find(ueInputFieldSelector);
-        
+      var objInputField = objFieldWidget.find(ueInputFieldSelector);
+      
       equalConditionInputNameError(objInputField, arrNames, classError);
       
@@ -544 +638 @@
       setResult(objCalcInput, objError);    
       
-      //init events
-      var objAllInputFields = jQuery(ueInputFieldSelector);
-      
-      //on input change trigger only parent calc number field, not all of them
-      objAllInputFields.on('input', function(){
-        
-        var objInput = jQuery(this); //triggered input
-        var objParentCalkInput = getParentCalcInput(objInput); //parent calc input with formula attr
-        
-        if(objParentCalkInput == null)
-        return(false);
-        
-        onInputChange(objParentCalkInput);
-        
-      });
-      
       //set result on custom shange event
       objCalcInput.on('input_calc', function(){
         
         var objInput = jQuery(this); //triggered input
-  
+        
         setResult(objInput, objError);
         
@@ -571 +649 @@
     });
     
-    
-    
+    //init events
+    var objAllInputFields = jQuery(ueInputFieldSelector);
+    
+    //on input change trigger only parent calc number field, not all of them
+    objAllInputFields.on('input', function(){
+      
+      var objInput = jQuery(this); //triggered input
+      var objParentCalkInputs = getParentCalcInput(objInput); //parent calc input with formula attr
+      
+      if(objParentCalkInputs == undefined)
+      return(true);
+          
+      objParentCalkInputs.forEach(function(parent, index){
+        
+        onInputChange(parent);          
+        
+      });
+      
+    });
     
   }

unlimited-elements-for-elementor/trunk/assets_libraries/remote/ue-remote-controls.js

@@ -155 +155 @@
         
         if(num < 0)
+            num = 0;
+        
+        if(!num)
+            num = 0;
+        
+        if(typeof num == "undefined")
             num = 0;
         

unlimited-elements-for-elementor/trunk/inc_php/unitecreator_filters_process.class.php

@@ -1948 +1948 @@
     private function modifyOutputTerms_addFirstItem($arrTerms, $data, $filterType){
         
+        //don't add first item if no terms, if no terms, no "all" as well
+        
         if(empty($arrTerms))
-            $arrTerms = array();
+            return(array());
         
         $addFirst = UniteFunctionsUC::getVal($data, "add_first");
@@ -1957 +1959 @@
             return($arrTerms);
         
+            
         $text = UniteFunctionsUC::getVal($data, "first_item_text", __("All","unlimited-elements-for-elementor"));
                     
@@ -2063 +2066 @@
     
     /**
-     * modify the terms for init after
+     * modify the terms for init after 
      */
     private function modifyOutputTerms_setNumPosts($arrTerms){
@@ -2073 +2076 @@
         
         $arrPostNums = GlobalsProviderUC::$arrTestTermIDs;
-            
+        
         foreach($arrTerms as $key => $term){
             
@@ -2104 +2107 @@
             if($isHidden == true){
                 $htmlAttributes = "hidden='hidden' style='display:none'";
+                $htmlAttributesNew = "hidden='hidden' ";    //no style
                 
                 $addClass = UniteFunctionsUC::getVal($term, "addclass");
@@ -2113 +2117 @@
             $term["hidden"] = $isHidden;
             $term["html_attributes"] = $htmlAttributes;
+            $term["html_attributes2"] = $htmlAttributesNew;
             
             $arrTerms[$key] = $term;            
@@ -2341 +2346 @@
         $isFirstLoad = true;        //not in ajax, or with init after (also first load)
         
+        
         $isInsideEditor = GlobalsProviderUC::$isInsideEditor;
         
@@ -2384 +2390 @@
         
         $arrTerms = UniteFunctionsUC::getVal($data, "taxonomy");
+                
+        //modify the hidden as well
         
         $arrTerms = $this->modifyOutputTerms_setNumPosts($arrTerms, $isInitAfter, $isFirstLoad);
@@ -2394 +2402 @@
         
         $arrTerms = $this->modifyOutputTerms_modifySelectedByRequest($arrTerms);
+        
         
         $isFilterHidden = false;
@@ -2403 +2412 @@
                 if($isInitAfter == true && !empty($limitGrayedItems) && $isUnderAjax == false)
                     $arrTerms = $this->modifyOutputTerms_tabs_modifyLimitGrayed($arrTerms, $limitGrayedItems);
-                    
+                
                 $isFilterHidden = $this->modifyOutputTerms_isFilterHidden($data, $arrTerms, $isUnderAjax);
-                                
                 
             break;
@@ -2418 +2426 @@
         
         $arrTerms = $this->modifyOutputTerms_setSelectedClass($arrTerms, $filterType);
-
+        
         $arrTerms = $this->modifyOutputTerms_getDataAttributes($arrTerms, $filterType);
         

unlimited-elements-for-elementor/trunk/inc_php/unitecreator_globals.class.php

@@ -172 +172 @@
         
         public static $enableAPIIntegration = false;
+        
         public static $enableNewDashboard = false;
         

unlimited-elements-for-elementor/trunk/inc_php/unitecreator_settings.class.php

@@ -724 +724 @@
             break;
             default:
-                UniteFunctionsUC::throwError("Add special param error: wrong attribute type: $attributeType");
+                UniteFunctionsUC::throwError("Add special param error: wrong attribute type: $attributeType, please check that the plugin version is up to date");
             break;
         }

unlimited-elements-for-elementor/trunk/inc_php/unitecreator_template_engine.class.php

@@ -1451 +1451 @@
                 
             break;
+            case "get_breakpoints":
+                
+                $arrBreakpoints = HelperProviderCoreUC_EL::getBreakpoints();
+                
+                dmp("breakpoints");
+                dmp($arrBreakpoints);
+                
+            break;
             default:
                 

unlimited-elements-for-elementor/trunk/includes.php

@@ -13 +13 @@
 
 if(!defined("UNLIMITED_ELEMENTS_VERSION"))
-    define("UNLIMITED_ELEMENTS_VERSION", "1.5.82");
+    define("UNLIMITED_ELEMENTS_VERSION", "1.5.83");
 
 $currentFile = __FILE__;

unlimited-elements-for-elementor/trunk/provider/core/plugins/unlimited_elements/helper_provider_core.class.php

@@ -653 +653 @@
         
         return($condition);
+    }
+    
+    /*
+     * get elementor breakpoints
+     */
+    public static function getBreakPoints($onlyCustom = true){
+        
+        $arrBreakpoints = Elementor\Plugin::$instance->breakpoints->get_breakpoints();
+        
+        if(empty($arrBreakpoints))
+            return(array());
+        
+        $output = array();
+            
+        foreach($arrBreakpoints as $objBreakpoint){
+            
+            //$arrBreakpoint = (array)$objBreakpoint;
+                        
+            $name = $objBreakpoint->get_name();
+            
+            $isEnabled = $objBreakpoint->is_enabled();
+                        
+            if($isEnabled == false)
+                continue;
+            
+            switch($name){
+                case "mobile":
+                case "tablet":
+                    continue(2);
+                break;
+            }
+            
+            $value = $objBreakpoint->get_value();
+            
+            $output = array();
+            $output[$name] = $value;
+        }
+        
+        
+        return($output);
     }
     

unlimited-elements-for-elementor/trunk/provider/woocommerce_integrate.class.php

@@ -1202 +1202 @@
             if(!empty($urlImage))
                 $imageHTML = "<img class=\"ue-mini-cart-item-image\" src=\"{$urlImage}\" >";
-            
-            
-$htmlItem = "<div class=\"ue-mini-cart-item\" data-key=\"{$cart_item_key}\">
-
-  <div class=\"ue-mini-cart-item-content\">
-    
-    <div class=\"ue-mini-cart-content-wrapper\">
-      <div class=\"ue-mini-cart-item-title-text\">{$item_name}</div>
-         
-        {$imageHTML}
-         
-        <div>
-        <span class=\"ue_mini_qty\">
-            {$quantity}
-        </span>
-        <span class=\"ue_mini_price\">
-            {$priceHtml}
-        </span>
+        
+$htmlItem = "
+<div class=\"ue-mini-cart-item\" data-key=\"{$cart_item_key}\">
+  {$imageHTML}
+   <div class=\"ue-mini-cart-item-content\">
+      <div class=\"ue-mini-cart-content-wrapper\">
+         <div class=\"ue-mini-cart-item-title-text\">{$item_name}</div>
+         <div>
+            <span class=\"ue_mini_qty\">{$quantity} x</span>
+            <span class=\"ue_mini_price\">{$priceHtml}</span>
+         </div>
+         <div class=\"ue_mini_quantity_input\">
+            <span class=\"ue_mini_minus\">-</span>
+            <input class=\"ue_mini_input\" type=\"number\" value=\"{$quantity}\"/>
+            <span class=\"ue_mini_plus\">+</span>
+         </div>
       </div>
-      
-        <div class=\"ue_mini_quantity_input\">
-          <span class=\"ue_mini_minus\">-</span>
-          <input class=\"ue_mini_input\" type=\"number\" value=\"{$quantity}\"/>
-          <span class=\"ue_mini_plus\">+</span>
-        </div>
-      
-    </div>
-    
-    <div class=\"ue-mini-cart-item-delete\">X</div>
-    
-  </div>
+      <div class=\"ue-mini-cart-item-delete\"><i class=\"far fa-trash-alt\"></i></div>
+   </div>
+</div>
+
+";
+
   
-</div>";
-
             $html .= $htmlItem;
         }

unlimited-elements-for-elementor/trunk/readme.txt

@@ -1241 +1241 @@
 
 
-version 1.5.82:
+version 1.5.83: 2023-08-22
+
+* Fix: don't show first item in filter when no terms available
+* Change: updated calculators javascript code base
+
+
+version 1.5.82: 2023-08-16
 
 * Feature: added option for group filtering widgets

unlimited-elements-for-elementor/trunk/release_log.txt

@@ -1 +1 @@
 
+version 1.5.83:
+
+-bug fix: don't show first item in filter when no terms available
+-change: updated calculators javascript code base