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 2012/06/22 15:39:31 UTC
svn commit: r1352886 -
/myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
Author: lofwyr
Date: Fri Jun 22 13:39:30 2012
New Revision: 1352886
URL: http://svn.apache.org/viewvc?rev=1352886&view=rev
Log:
TOBAGO-1160: AJAX reload blocks reloaded area
- fix: using iframe only in ie6 (not ie7, ie8, ...)
- fix: removing iframe
- fix: do not create 2nd iframe
Merged from trunk [from revision 1352820]
Modified:
myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js (contents, props changed)
Modified: myfaces/tobago/branches/tobago-1.5.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-1.5.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js?rev=1352886&r1=1352885&r2=1352886&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.5.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-1.5.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js Fri Jun 22 13:39:30 2012
@@ -448,15 +448,22 @@ var Tobago = {
}
element.children(".tobago-page-overlay").remove();
+
+ element.children(".tobago-page-overlay-ie6bugfix").remove();
},
ie6bugfix: function(element) {
- if (this.getBrowser().type == 'msie' && this.getBrowser().version <= 6) {
+ if (jQuery.browser.msie && parseInt(jQuery.browser.version) <= 6) {
+
+ if (jQuery(element).children(".tobago-page-overlay-ie6bugfix").size() > 0) {
+ return; // ignore
+ }
+
var iframe = document.createElement('IFRAME');
iframe.id = element.id + '-iframe-overlay';
+ iframe.className = 'tobago-page-overlay-ie6bugfix';
iframe.style.backgroundColor = 'red';
iframe.style.filter = 'progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0)';
- // TODO: better z-index strategy
iframe.style.zIndex = 9999;
iframe.frameBorder = '0';
iframe.style.position = 'absolute';
@@ -1431,25 +1438,6 @@ var Tobago = {
// we need only an implementation in the IE6 file.
},
- /**
- * @deprecated Since 1.5.1, please use the jQuery.browser
- */
- getBrowser: function() {
- if (!this.browser) {
- var agent = navigator.userAgent.toLowerCase();
- if (agent.indexOf('msie 7') != -1) {
- this.browser = {'type': 'msie', 'version': 7};
- } else if (agent.indexOf('msie') != -1) {
- this.browser = {'type': 'msie', 'version': -1};
- } else if (agent.indexOf('gecko') != -1) {
- this.browser = {'type': 'mozilla', 'version': -1};
- } else {
- this.browser = {'type': 'unknown', 'version': -1};
- }
- }
- return this.browser;
- },
-
replaceElement: function(item, newTag) {
if (typeof window.Range != 'undefined' && typeof Range.prototype.createContextualFragment == 'function') {
var range = document.createRange();
Propchange: myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 22 13:39:30 2012
@@ -0,0 +1 @@
+/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js:1341831,1341901,1343719,1349356,1352820