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 2015/02/03 14:23:58 UTC
svn commit: r1656722 - in /myfaces/tobago/branches/tobago-3.0.x:
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/
tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/stan...
Author: lofwyr
Date: Tue Feb 3 13:23:58 2015
New Revision: 1656722
URL: http://svn.apache.org/r1656722
Log:
TOBAGO-1358: Using CSS box-sizing: border-box instead of content-box
- fix modal popup
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-popup.js
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java?rev=1656722&r1=1656721&r2=1656722&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java Tue Feb 3 13:23:58 2015
@@ -79,6 +79,8 @@ public interface PopupTagDeclaration
void setTop(String top);
/**
+ * TBD: Remove this attribute?
+ *
* Represents the visibility order of the popup. The renderer may implemented this visibility by the CSS z-index.
*
* @param zIndex The visibility order.
Modified: myfaces/tobago/branches/tobago-3.0.x/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/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-popup.js?rev=1656722&r1=1656721&r2=1656722&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-popup.js (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-popup.js Tue Feb 3 13:23:58 2015
@@ -40,7 +40,13 @@ Tobago.Popup.init = function (elements)
var maxZIndex = -Infinity;
var maxModalPopup = null;
jQuery('.tobago-popup-markup-modal').each(function () {
- var zIndex = parseInt(jQuery(this).css('z-index'));
+ var zIndexString = jQuery(this).css('z-index');
+ var zIndex;
+ if (zIndexString == "auto") {
+ zIndex = -Infinity;
+ } else {
+ zIndex = parseInt(zIndexString);
+ }
if (zIndex >= maxZIndex) {
maxZIndex = zIndex;
maxModalPopup = jQuery(this);
Modified: myfaces/tobago/branches/tobago-3.0.x/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/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js?rev=1656722&r1=1656721&r2=1656722&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js Tue Feb 3 13:23:58 2015
@@ -928,10 +928,14 @@ var Tobago = {
console.time("[tobago] initCss"); // @DEV_ONLY
Tobago.Utils.selectWidthJQuery(elements, ".tobago-popup[data-tobago-style]").each(function () {
var element = jQuery(this);
- element.css("left", element.data("tobago-style").left);
- element.css("top", element.data("tobago-style").top);
- element.css("width", element.data("tobago-style").width);
- element.css("height", element.data("tobago-style").height);
+ var data = element.data("tobago-style");
+ element.css({
+ left: data.left,
+ top: data.top,
+ width: data.width,
+ height: data.height,
+ zIndex: data.zIndex
+ });
});
/* XXX this is the old Tobago 2.0 behaviour, should be deleded und removing these information from the tags
Tobago.Utils.selectWidthJQuery(elements, "[data-tobago-style]").each(function () {