You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2016/08/18 13:45:18 UTC
svn commit: r1756784 - in
/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script:
tobago-jsf.js tobago-popup.js tobago.js
Author: lofwyr
Date: Thu Aug 18 13:45:18 2016
New Revision: 1756784
URL: http://svn.apache.org/viewvc?rev=1756784&view=rev
Log:
TOBAGO-1482: Using modal feature from Bootstrap for Popups
* fix little problem with double backdrops
Modified:
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-jsf.js
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-popup.js
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-jsf.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-jsf.js?rev=1756784&r1=1756783&r2=1756784&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-jsf.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-jsf.js Thu Aug 18 13:45:18 2016
@@ -15,8 +15,8 @@
*/
/*
- * This is a modified copy of MyFaces 2.2.10 jsf-uncompressed-full.js
- * Modifications are marked with TOBAGO-MOD
+ * XXX This is a modified copy of MyFaces 2.2.10 jsf-uncompressed-full.js
+ * XXX Modifications are marked with TOBAGO-JSF-JS
*/
/**
@@ -6405,7 +6405,7 @@ _MF_CLS(_PFX_XHR + "engine.IFrame", myfa
*
* @param args
*/
- /* TOBAGO-MOD: rename "arguments" with "args", because the compressor would fail */
+ /* TOBAGO-JSF-JS: rename "arguments" with "args", because the compressor would fail */
constructor_: function (args) {
//we fetch in the standard arguments
@@ -7064,7 +7064,7 @@ _MF_CLS(_PFX_XHR + "_MultipartAjaxReques
_sourceForm:null,
- /* TOBAGO-MOD: rename "arguments" with "args", because the compressor would fail */
+ /* TOBAGO-JSF-JS: rename "arguments" with "args", because the compressor would fail */
constructor_:function (args) {
this._callSuper("constructor_", args);
//TODO xhr level2 can deal with real props
@@ -7114,7 +7114,7 @@ _MF_CLS(_PFX_XHR + "_AjaxRequestLevel2",
_sourceForm:null,
- /* TOBAGO-MOD: rename "arguments" with "args", because the compressor would fail */
+ /* TOBAGO-JSF-JS: rename "arguments" with "args", because the compressor would fail */
constructor_:function (args) {
this._callSuper("constructor_", args);
//TODO xhr level2 can deal with real props
@@ -7173,7 +7173,7 @@ _MF_CLS(_PFX_XHR+"_IFrameRequest", myfac
MF_PART_FACES_REQUEST: "javax.faces.request",
- /* TOBAGO-MOD: rename "arguments" with "args", because the compressor would fail */
+ /* TOBAGO-JSF-JS: rename "arguments" with "args", because the compressor would fail */
constructor_: function(args) {
this._callSuper("constructor_", args);
},
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-popup.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-popup.js?rev=1756784&r1=1756783&r2=1756784&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-popup.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-popup.js Thu Aug 18 13:45:18 2016
@@ -27,7 +27,11 @@ Tobago.Popup.init = function (elements)
var $popup = jQuery(this);
var $hidden = Tobago.Collapse.findHidden($popup);
if ($hidden.val() == "false") {
- jQuery(this).modal(); // inits and opens the popup
+ // XXX hack: this is needed for popups open by AJAX.
+ // XXX currently the DOM replacement done by Tobago doesn't remove the modal-backdrop
+ jQuery(".modal-backdrop").remove();
+
+ jQuery(this).modal("show"); // inits and opens the popup
} else {
jQuery(this).modal("hide"); // inits and hides the popup
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js?rev=1756784&r1=1756783&r2=1756784&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js Thu Aug 18 13:45:18 2016
@@ -2029,8 +2029,10 @@ Tobago.File.init = function(elements) {
if (myfaces) {
// XXX This hack is currently needed for MyFaces 2.0 and 2.1 for File Upload with AJAX
// XXX to enable multipart-formdata
- myfaces.config = myfaces.config || {};
- myfaces.config["transportAutoSelection"] = true;
+
+ // XXX TOBAGO-JSF-JS this hack is not needed with tobago-jsf.js
+ // myfaces.config = myfaces.config || {};
+ // myfaces.config["transportAutoSelection"] = true;
}
}
};