PF14

primefaces-extensions · Feb 5, 2024 · 0460b87 · 0460b87
1 parent d07c23f
commit 0460b87
Show file tree

Hide file tree

Showing 22 changed files with 52 additions and 59 deletions.
diff --git a/core/src/main/java/org/primefaces/extensions/component/blockui/BlockUIRenderer.java b/core/src/main/java/org/primefaces/extensions/component/blockui/BlockUIRenderer.java
@@ -29,7 +29,7 @@
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 
-import org.primefaces.expression.SearchExpressionFacade;
+import org.primefaces.expression.SearchExpressionUtils;
 import org.primefaces.extensions.util.Attrs;
 import org.primefaces.renderkit.CoreRenderer;
 import org.primefaces.util.Constants;
@@ -73,7 +73,7 @@ protected void encodeScript(final FacesContext fc, final UIComponent component)
             source = blockUI.getParent().getClientId(fc);
         }
         else {
-            source = SearchExpressionFacade.resolveClientIds(fc, blockUI, source);
+            source = SearchExpressionUtils.resolveClientIdForClientSide(fc, blockUI, source);
         }
 
         if (source == null) {
@@ -83,7 +83,7 @@ protected void encodeScript(final FacesContext fc, final UIComponent component)
         // get target
         String target = blockUI.getTarget();
         if (target != null) {
-            target = SearchExpressionFacade.resolveClientIds(fc, blockUI, target);
+            target = SearchExpressionUtils.resolveClientIdForClientSide(fc, blockUI, target);
         }
 
         // get content
@@ -168,4 +168,4 @@ public boolean getRendersChildren() {
     public void encodeChildren(final FacesContext fc, final UIComponent component) {
         // nothing to do
     }
-}
+}
diff --git a/core/src/main/java/org/primefaces/extensions/component/calculator/CalculatorRenderer.java b/core/src/main/java/org/primefaces/extensions/component/calculator/CalculatorRenderer.java
@@ -28,7 +28,7 @@
 import javax.faces.component.UIInput;
 import javax.faces.context.FacesContext;
 
-import org.primefaces.expression.SearchExpressionFacade;
+import org.primefaces.expression.SearchExpressionUtils;
 import org.primefaces.extensions.util.ExtLangUtils;
 import org.primefaces.renderkit.CoreRenderer;
 import org.primefaces.util.ComponentUtils;
@@ -54,12 +54,12 @@ public void encodeEnd(final FacesContext context, final UIComponent component) t
     }
 
     private void encodeScript(final FacesContext context, final Calculator calculator) throws IOException {
-        String target = SearchExpressionFacade.resolveClientIds(context, calculator, calculator.getFor());
+        String target = SearchExpressionUtils.resolveClientIdsForClientSide(context, calculator, calculator.getFor());
         if (isValueBlank(target)) {
             target = calculator.getParent().getClientId(context);
         }
 
-        final UIComponent targetComponent = SearchExpressionFacade.resolveComponent(context, calculator, target);
+        final UIComponent targetComponent = SearchExpressionUtils.resolveComponent(target, calculator);
         if (!(targetComponent instanceof UIInput)) {
             throw new FacesException("Calculator must use for=\"target\" or be nested inside an input!");
         }
@@ -92,4 +92,4 @@ private void encodeScript(final FacesContext context, final Calculator calculato
         wb.finish();
     }
 
-}
+}
diff --git a/core/src/main/java/org/primefaces/extensions/component/clipboard/ClipboardRenderer.java b/core/src/main/java/org/primefaces/extensions/component/clipboard/ClipboardRenderer.java
@@ -26,7 +26,7 @@
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 
-import org.primefaces.expression.SearchExpressionFacade;
+import org.primefaces.expression.SearchExpressionUtils;
 import org.primefaces.extensions.util.ExtLangUtils;
 import org.primefaces.renderkit.CoreRenderer;
 import org.primefaces.util.WidgetBuilder;
@@ -51,12 +51,12 @@ public void encodeEnd(final FacesContext context, final UIComponent component) t
     }
 
     private void encodeScript(final FacesContext context, final Clipboard clipboard) throws IOException {
-        String trigger = SearchExpressionFacade.resolveClientIds(context, clipboard, clipboard.getTrigger());
+        String trigger = SearchExpressionUtils.resolveClientIdsForClientSide(context, clipboard, clipboard.getTrigger());
         if (isValueBlank(trigger)) {
             trigger = clipboard.getParent().getClientId(context);
         }
 
-        final String target = SearchExpressionFacade.resolveClientIds(context, clipboard, clipboard.getTarget());
+        final String target = SearchExpressionUtils.resolveClientIdsForClientSide(context, clipboard, clipboard.getTarget());
 
         final WidgetBuilder wb = getWidgetBuilder(context);
         wb.init("ExtClipboard", clipboard);
@@ -79,4 +79,4 @@ private void encodeScript(final FacesContext context, final Clipboard clipboard)
         wb.finish();
     }
 
-}
+}
diff --git a/core/src/main/java/org/primefaces/extensions/component/codemirror/CodeMirrorRenderer.java b/core/src/main/java/org/primefaces/extensions/component/codemirror/CodeMirrorRenderer.java
@@ -31,7 +31,7 @@
 import javax.faces.convert.Converter;
 import javax.faces.event.PhaseId;
 
-import org.primefaces.expression.SearchExpressionFacade;
+import org.primefaces.expression.SearchExpressionUtils;
 import org.primefaces.extensions.event.CompleteEvent;
 import org.primefaces.extensions.util.Attrs;
 import org.primefaces.renderkit.InputRenderer;
@@ -156,7 +156,7 @@ protected void encodeScript(final FacesContext context, final CodeMirror codeMir
             wb.attr("async", true);
         }
         if (codeMirror.getProcess() != null) {
-            wb.attr("process", SearchExpressionFacade.resolveClientIds(context, codeMirror, codeMirror.getProcess()));
+            wb.attr("process", SearchExpressionUtils.resolveClientIdsForClientSide(context, codeMirror, codeMirror.getProcess()));
         }
         if (codeMirror.getOnstart() != null) {
             wb.callback("onstart", "function(request)", codeMirror.getOnstart());
@@ -209,4 +209,4 @@ protected void encodeSuggestions(final FacesContext context, final CodeMirror co
 
         writer.endElement("ul");
     }
-}
+}
diff --git a/core/src/main/java/org/primefaces/extensions/component/codescanner/CodeScannerRenderer.java b/core/src/main/java/org/primefaces/extensions/component/codescanner/CodeScannerRenderer.java
@@ -28,7 +28,7 @@
 import javax.faces.context.ResponseWriter;
 
 import org.primefaces.component.api.InputHolder;
-import org.primefaces.expression.SearchExpressionFacade;
+import org.primefaces.expression.SearchExpressionUtils;
 import org.primefaces.extensions.util.Attrs;
 import org.primefaces.renderkit.CoreRenderer;
 import org.primefaces.util.WidgetBuilder;
@@ -114,7 +114,7 @@ protected void encodeScript(final FacesContext context, final CodeScanner codeSc
     }
 
     protected String getForInputClientId(final FacesContext context, final CodeScanner codeScanner) {
-        UIComponent forComponent = SearchExpressionFacade.resolveComponent(context, codeScanner, codeScanner.getFor());
+        UIComponent forComponent = SearchExpressionUtils.resolveComponent(codeScanner.getFor(), codeScanner);
         if (forComponent == null) {
             return null;
         }
@@ -124,4 +124,4 @@ protected String getForInputClientId(final FacesContext context, final CodeScann
         return forComponent.getClientId(context);
     }
 
-}
+}
diff --git a/core/src/main/java/org/primefaces/extensions/component/fluidgrid/FluidGridRenderer.java b/core/src/main/java/org/primefaces/extensions/component/fluidgrid/FluidGridRenderer.java
@@ -29,7 +29,7 @@
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 
-import org.primefaces.expression.SearchExpressionFacade;
+import org.primefaces.expression.SearchExpressionUtils;
 import org.primefaces.extensions.model.fluidgrid.FluidGridItem;
 import org.primefaces.extensions.util.Attrs;
 import org.primefaces.renderkit.CoreRenderer;
@@ -142,7 +142,7 @@ protected void encodeScript(final FacesContext fc, final FluidGrid fluidGrid) th
             wb.append(",gutter:" + fluidGrid.gethGutter());
         }
 
-        final String stamp = SearchExpressionFacade.resolveClientIds(fc, fluidGrid, fluidGrid.getStamp());
+        final String stamp = SearchExpressionUtils.resolveClientIdsForClientSide(fc, fluidGrid, fluidGrid.getStamp());
         if (stamp != null) {
             wb.append(",stamp:'" + stamp + "'");
         }
@@ -193,4 +193,4 @@ public void encodeChildren(final FacesContext context, final UIComponent compone
     public boolean getRendersChildren() {
         return true;
     }
-}
+}
diff --git a/...ain/java/org/primefaces/extensions/component/imageareaselect/ImageAreaSelectRenderer.java b/...ain/java/org/primefaces/extensions/component/imageareaselect/ImageAreaSelectRenderer.java
@@ -26,7 +26,7 @@
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 
-import org.primefaces.expression.SearchExpressionFacade;
+import org.primefaces.expression.SearchExpressionUtils;
 import org.primefaces.renderkit.CoreRenderer;
 import org.primefaces.util.WidgetBuilder;
 
@@ -50,7 +50,7 @@ public void encodeEnd(final FacesContext context, final UIComponent component) t
 
         final WidgetBuilder wb = getWidgetBuilder(context);
         wb.init("ExtImageAreaSelect", imageAreaSelect);
-        wb.attr("target", SearchExpressionFacade.resolveClientId(context, imageAreaSelect, imageAreaSelect.getFor()))
+        wb.attr("target", SearchExpressionUtils.resolveClientIdsForClientSide(context, imageAreaSelect, imageAreaSelect.getFor()))
                     .attr("aspectRatio", imageAreaSelect.getAspectRatio())
                     .attr("autoHide", imageAreaSelect.isAutoHide())
                     .attr("fadeSpeed", imageAreaSelect.getFadeSpeed())
@@ -73,4 +73,4 @@ public void encodeEnd(final FacesContext context, final UIComponent component) t
         encodeClientBehaviors(context, imageAreaSelect);
         wb.finish();
     }
-}
+}
diff --git a/...rg/primefaces/extensions/component/imagerotateandresize/ImageRotateAndResizeRenderer.java b/...rg/primefaces/extensions/component/imagerotateandresize/ImageRotateAndResizeRenderer.java
@@ -26,7 +26,7 @@
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 
-import org.primefaces.expression.SearchExpressionFacade;
+import org.primefaces.expression.SearchExpressionUtils;
 import org.primefaces.renderkit.CoreRenderer;
 import org.primefaces.util.WidgetBuilder;
 
@@ -50,9 +50,9 @@ public void encodeEnd(final FacesContext context, final UIComponent component) t
 
         final WidgetBuilder wb = getWidgetBuilder(context);
         wb.init("ExtImageRotateAndResize", imageRotateAndResize);
-        wb.attr("target", SearchExpressionFacade.resolveClientId(context, imageRotateAndResize, imageRotateAndResize.getFor()));
+        wb.attr("target", SearchExpressionUtils.resolveClientIdsForClientSide(context, imageRotateAndResize, imageRotateAndResize.getFor()));
 
         encodeClientBehaviors(context, imageRotateAndResize);
         wb.finish();
     }
-}
+}
diff --git a/core/src/main/java/org/primefaces/extensions/component/imagezoom/ImageZoomRenderer.java b/core/src/main/java/org/primefaces/extensions/component/imagezoom/ImageZoomRenderer.java
@@ -26,7 +26,7 @@
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 
-import org.primefaces.expression.SearchExpressionFacade;
+import org.primefaces.expression.SearchExpressionUtils;
 import org.primefaces.renderkit.CoreRenderer;
 import org.primefaces.util.WidgetBuilder;
 
@@ -43,12 +43,12 @@ public void encodeEnd(final FacesContext context, final UIComponent component) t
         final ImageZoom imageZoom = (ImageZoom) component;
         final WidgetBuilder wb = getWidgetBuilder(context);
         wb.init("ImageZoom", imageZoom);
-        wb.attr("target", SearchExpressionFacade.resolveClientId(context, imageZoom, imageZoom.getFor()))
+        wb.attr("target", SearchExpressionUtils.resolveClientIdsForClientSide(context, imageZoom, imageZoom.getFor()))
                     .attr("margin", imageZoom.getMargin(), 0)
                     .attr("scrollOffset", imageZoom.getScrollOffset(), 40)
                     .attr("background", imageZoom.getBackground(), "#fff")
                     .attr("container", imageZoom.getContainer(), "#fff")
                     .attr("template", imageZoom.getTemplate(), "#fff");
         wb.finish();
     }
-}
+}
diff --git a/...java/org/primefaces/extensions/component/monacoeditor/MonacoDiffEditorInlineRenderer.java b/...java/org/primefaces/extensions/component/monacoeditor/MonacoDiffEditorInlineRenderer.java
@@ -26,7 +26,6 @@
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 
-import org.primefaces.expression.SearchExpressionFacade;
 import org.primefaces.expression.SearchExpressionUtils;
 import org.primefaces.util.WidgetBuilder;
 
@@ -46,12 +45,10 @@ public MonacoDiffEditorInlineRenderer() {
 
     @Override
     protected void addWidgetProperties(FacesContext context, WidgetBuilder wb, MonacoDiffEditorInline monacoEditor) throws IOException {
-        final String overflowWidgetsDomNode = SearchExpressionFacade.resolveClientId( //
+        final String overflowWidgetsDomNode = SearchExpressionUtils.resolveClientIdForClientSide( //
                     context, //
                     monacoEditor, //
-                    monacoEditor.getOverflowWidgetsDomNode(), //
-                    SearchExpressionUtils.SET_RESOLVE_CLIENT_SIDE //
-        );
+                    monacoEditor.getOverflowWidgetsDomNode());
         wb.attr("overflowWidgetsDomNode", overflowWidgetsDomNode, null);
         wb.returnCallback("extender", "function()", monacoEditor.getExtender());
     }
@@ -77,4 +74,4 @@ protected String getMainStyleClass() {
     protected String getWidgetName() {
         return MonacoDiffEditorInline.WIDGET_NAME;
     }
-}
+}
diff --git a/...ain/java/org/primefaces/extensions/component/monacoeditor/MonacoEditorInlineRenderer.java b/...ain/java/org/primefaces/extensions/component/monacoeditor/MonacoEditorInlineRenderer.java
@@ -26,7 +26,6 @@
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 
-import org.primefaces.expression.SearchExpressionFacade;
 import org.primefaces.expression.SearchExpressionUtils;
 import org.primefaces.util.WidgetBuilder;
 
@@ -46,12 +45,10 @@ public MonacoEditorInlineRenderer() {
 
     @Override
     protected void addWidgetProperties(FacesContext context, WidgetBuilder wb, MonacoEditorInline monacoEditor) throws IOException {
-        final String overflowWidgetsDomNode = SearchExpressionFacade.resolveClientId( //
+        final String overflowWidgetsDomNode = SearchExpressionUtils.resolveClientIdForClientSide( //
                     context, //
                     monacoEditor, //
-                    monacoEditor.getOverflowWidgetsDomNode(), //
-                    SearchExpressionUtils.SET_RESOLVE_CLIENT_SIDE //
-        );
+                    monacoEditor.getOverflowWidgetsDomNode());
         wb.attr("overflowWidgetsDomNode", overflowWidgetsDomNode, null);
         wb.returnCallback("extender", "function()", monacoEditor.getExtender());
     }
@@ -77,4 +74,4 @@ protected String getMainStyleClass() {
     protected String getWidgetName() {
         return MonacoEditorInline.WIDGET_NAME;
     }
-}
+}
diff --git a/core/src/main/java/org/primefaces/extensions/component/tooltip/TooltipRenderer.java b/core/src/main/java/org/primefaces/extensions/component/tooltip/TooltipRenderer.java
@@ -27,7 +27,7 @@
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 
-import org.primefaces.expression.SearchExpressionFacade;
+import org.primefaces.expression.SearchExpressionUtils;
 import org.primefaces.renderkit.CoreRenderer;
 import org.primefaces.util.ComponentUtils;
 import org.primefaces.util.Constants;
@@ -56,7 +56,7 @@ public void encodeEnd(final FacesContext context, final UIComponent component) t
         String target = null;
 
         if (!global || tooltip.getFor() != null) {
-            target = SearchExpressionFacade.resolveClientIds(context, tooltip, tooltip.getFor());
+            target = SearchExpressionUtils.resolveClientIdsForClientSide(context, component, tooltip.getFor());
         }
 
         final ResponseWriter writer = context.getResponseWriter();
@@ -169,4 +169,4 @@ public void encodeChildren(final FacesContext context, final UIComponent compone
     public boolean getRendersChildren() {
         return true;
     }
-}
+}
diff --git a/core/src/main/java/org/primefaces/extensions/component/waypoint/WaypointRenderer.java b/core/src/main/java/org/primefaces/extensions/component/waypoint/WaypointRenderer.java
@@ -26,7 +26,6 @@
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 
-import org.primefaces.expression.SearchExpressionFacade;
 import org.primefaces.expression.SearchExpressionUtils;
 import org.primefaces.renderkit.CoreRenderer;
 import org.primefaces.util.WidgetBuilder;
@@ -51,9 +50,8 @@ public void encodeEnd(final FacesContext fc, final UIComponent component) throws
     }
 
     private void encodeScript(final FacesContext fc, final Waypoint waypoint) throws IOException {
-        final String context = SearchExpressionFacade.resolveClientIds(fc, waypoint, waypoint.getForContext());
-        final String target = SearchExpressionFacade.resolveClientIds(fc, waypoint, waypoint.getFor(),
-                    SearchExpressionUtils.SET_PARENT_FALLBACK);
+        final String context = SearchExpressionUtils.resolveClientIdsForClientSide(fc, waypoint, waypoint.getForContext());
+        final String target = SearchExpressionUtils.resolveClientIdsForClientSide(fc, waypoint, waypoint.getFor());
 
         final WidgetBuilder wb = getWidgetBuilder(fc);
         wb.init("ExtWaypoint", waypoint);
@@ -75,4 +73,4 @@ private void encodeScript(final FacesContext fc, final Waypoint waypoint) throws
 
         wb.finish();
     }
-}
+}
diff --git a/core/src/main/resources/META-INF/resources/primefaces-extensions/blockui/1-blockUI.js b/core/src/main/resources/META-INF/resources/primefaces-extensions/blockui/1-blockUI.js
@@ -74,7 +74,7 @@ PrimeFaces.widget.ExtBlockUI = PrimeFaces.widget.BaseWidget.extend({
         var opt;
 
         if (this.target) {
-            var targetEl = PrimeFaces.expressions.SearchExpressionFacade.resolveComponentsAsSelector(this.target);
+            var targetEl = PrimeFaces.expressions.SearchExpressionFacade.resolveComponentsAsSelector(this.jq, this.target);
 
             // second, check if the target element has been found
             if (targetEl.length > 0) {

diff --git a/core/src/main/resources/META-INF/resources/primefaces-extensions/calculator/3-calculator.js b/core/src/main/resources/META-INF/resources/primefaces-extensions/calculator/3-calculator.js
@@ -16,7 +16,7 @@ PrimeFaces.widget.ExtCalculator = PrimeFaces.widget.BaseWidget.extend({
         this._super(cfg);
         this.id = cfg.id;
         this.cfg = cfg;
-        this.target = PrimeFaces.expressions.SearchExpressionFacade.resolveComponentsAsSelector(this.cfg.target);
+        this.target = PrimeFaces.expressions.SearchExpressionFacade.resolveComponentsAsSelector(this.jq, this.cfg.target);
 
         var input = this.target;
         if (this.target.is(':input')) {

diff --git a/...c/main/resources/META-INF/resources/primefaces-extensions/clipboard/1-clipboard-widget.js b/...c/main/resources/META-INF/resources/primefaces-extensions/clipboard/1-clipboard-widget.js
@@ -16,7 +16,7 @@ PrimeFaces.widget.ExtClipboard = PrimeFaces.widget.BaseWidget.extend({
         this._super(cfg);
         this.id = cfg.id;
         this.cfg = cfg;
-        this.trigger = PrimeFaces.expressions.SearchExpressionFacade.resolveComponentsAsSelector(this.cfg.trigger);
+        this.trigger = PrimeFaces.expressions.SearchExpressionFacade.resolveComponentsAsSelector(this.jq, this.cfg.trigger);
 
         this._applyClipboard(this.trigger, cfg);
     },

diff --git a/core/src/main/resources/META-INF/resources/primefaces-extensions/fluidgrid/fluidgrid.js b/core/src/main/resources/META-INF/resources/primefaces-extensions/fluidgrid/fluidgrid.js
@@ -21,7 +21,7 @@ PrimeFaces.widget.ExtFluidGrid = PrimeFaces.widget.DeferredWidget.extend({
 
         if (this.cfg.opts.stamp) {
             this.cfg.opts.stamp = PrimeFaces.expressions.SearchExpressionFacade.resolveComponentsAsSelector(
-                    this.cfg.opts.stamp).get();
+                    this.jq, this.cfg.opts.stamp).get();
         }
 
         this.renderDeferred();

diff --git a/...n/resources/META-INF/resources/primefaces-extensions/imageareaselect/1-imageareaselect.js b/...n/resources/META-INF/resources/primefaces-extensions/imageareaselect/1-imageareaselect.js
@@ -68,7 +68,7 @@ PrimeFaces.widget.ExtImageAreaSelect = PrimeFaces.widget.BaseWidget.extend({
         this.bindSelectChangeCallback();
         this.bindSelectEndCallback();
 
-        this.instance = PrimeFaces.expressions.SearchExpressionFacade.resolveComponentsAsSelector(this.cfg.target).imgAreaSelect(this.options);
+        this.instance = PrimeFaces.expressions.SearchExpressionFacade.resolveComponentsAsSelector(this.jq, this.cfg.target).imgAreaSelect(this.options);
 
         this.removeScriptElement(this.id);
     },