You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2019/01/13 20:44:45 UTC

[myfaces] branch master updated: removed unused code

This is an automated email from the ASF dual-hosted git repository.

tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/master by this push:
     new fae0b9b  removed unused code
fae0b9b is described below

commit fae0b9be1a09bed9fa196ebf37071a4f5951c9ef
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Sun Jan 13 21:45:07 2019 +0100

    removed unused code
---
 .../myfaces/_impl/xhrCore/_FormDataRequest.js      | 16 -----------
 .../context/servlet/PartialViewContextImpl.java    | 32 ----------------------
 2 files changed, 48 deletions(-)

diff --git a/api/src/main/javascript/META-INF/resources/myfaces/_impl/xhrCore/_FormDataRequest.js b/api/src/main/javascript/META-INF/resources/myfaces/_impl/xhrCore/_FormDataRequest.js
index 8a5f0e8..7978a54 100644
--- a/api/src/main/javascript/META-INF/resources/myfaces/_impl/xhrCore/_FormDataRequest.js
+++ b/api/src/main/javascript/META-INF/resources/myfaces/_impl/xhrCore/_FormDataRequest.js
@@ -24,18 +24,6 @@
 _MF_CLS(_PFX_XHR+"_FormDataRequest", myfaces._impl.xhrCore._AjaxRequest, {
     _AJAXUTIL: myfaces._impl.xhrCore._AjaxUtils,
 
-
-    /**
-     * @constant
-     * @description request marker that the request is an iframe based request
-     */
-    JX_PART_IFRAME: "javax.faces.partial.iframe",
-    /**
-     * @constant
-     * @description request marker that the request is an apache myfaces iframe request based request
-     */
-    MF_PART_IFRAME: "org.apache.myfaces.partial.iframe",
-
     constructor_: function(arguments) {
         this._callSuper("constructor_", arguments);
 
@@ -72,10 +60,6 @@ _MF_CLS(_PFX_XHR+"_FormDataRequest", myfaces._impl.xhrCore._AjaxRequest, {
 
         }
 
-        ret.append(this.JX_PART_IFRAME, "true");
-        ret.append(this.MF_PART_IFRAME, "true");
-
-
         return ret;
     },
 
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java b/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
index 20e8d24..4ceb563 100644
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
@@ -67,13 +67,6 @@ public class PartialViewContextImpl extends PartialViewContext
     private static final String PARTIAL_AJAX = "partial/ajax";
     private static final String PARTIAL_AJAX_REQ = "javax.faces.partial.ajax";
     private static final String PARTIAL_PROCESS = "partial/process";
-
-    /**
-     * Internal extension for
-     * https://issues.apache.org/jira/browse/MYFACES-2841
-     * will be changed for 2.1 to the official marker
-     */
-    private static final String PARTIAL_IFRAME = "org.apache.myfaces.partial.iframe";
     
     private static final  Set<VisitHint> PARTIAL_EXECUTE_HINTS = Collections.unmodifiableSet( 
             EnumSet.of(VisitHint.EXECUTE_LIFECYCLE, VisitHint.SKIP_UNRENDERED));
@@ -85,13 +78,6 @@ public class PartialViewContextImpl extends PartialViewContext
     // of this object.
     private Boolean _ajaxRequest = null;
 
-    /**
-     * Internal extension for
-     * https://issues.apache.org/jira/browse/MYFACES-2841
-     * will be changed for 2.1 to the official marker
-     */
-    private Boolean _iframeRequest = null;
-
     private Collection<String> _executeClientIds = null;
     private Collection<String> _renderClientIds = null;
     // Values that need to be saved because exists a setXX method 
@@ -184,30 +170,12 @@ public class PartialViewContextImpl extends PartialViewContext
         return _renderAll;
     }
 
-    /**
-     * Extension for
-     * https://issues.apache.org/jira/browse/MYFACES-2841
-     * internal extension which detects that the submit is an iframe request
-     * will be changed for the official version which will come in 2.1
-     *
-     * @return true if the current request is an iframe based ajax request
-     */
-    public boolean isIFrameRequest()
-    {
-        if (_iframeRequest == null)
-        {
-            _iframeRequest = _facesContext.getExternalContext().getRequestParameterMap().containsKey(PARTIAL_IFRAME);
-        }
-        return _iframeRequest;
-    }
-
     @Override
     public void setPartialRequest(boolean isPartialRequest)
     {
         assertNotReleased();
 
         _partialRequest = isPartialRequest;
-
     }
 
     @Override