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 2013/05/31 13:12:47 UTC
svn commit: r1488157 - in
/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard:
msie_6_0/script/ standard/script/
Author: lofwyr
Date: Fri May 31 11:12:46 2013
New Revision: 1488157
URL: http://svn.apache.org/r1488157
Log:
TOBAGO-1177: update jQuery
better readable
Modified:
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/msie_6_0/script/tobago.js
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-in.js
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.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-sheet.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/msie_6_0/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/msie_6_0/script/tobago.js?rev=1488157&r1=1488156&r2=1488157&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/msie_6_0/script/tobago.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/msie_6_0/script/tobago.js Fri May 31 11:12:46 2013
@@ -21,7 +21,7 @@
*/
Tobago.fixPngAlphaAll = function(elements) {
- if (Tobago.browser.isIe6OrLess) {
+ if (Tobago.browser.isMsie6) {
// fix png images
var images = Tobago.Utils.selectWidthJQuery(elements, "img[src$='.png']");
images.each(function() {
@@ -38,7 +38,7 @@ Tobago.fixPngAlphaAll = function(element
};
Tobago.fixPngAlpha = function(element) {
- if (Tobago.browser.isIe6OrLess
+ if (Tobago.browser.isMsie6
&& element.src.toLowerCase().match(/.*png/)
&& Tobago.isActiveXEnabled()) {
Tobago.fixPngAlphaInternal(element);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-in.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-in.js?rev=1488157&r1=1488156&r2=1488157&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-in.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-in.js Fri May 31 11:12:46 2013
@@ -63,7 +63,7 @@ Tobago.In.prototype.setup = function() {
ctrl = Tobago.element(this.id);
Tobago.addBindEventListener(ctrl, 'change', this, 'checkMaxLength');
Tobago.addBindEventListener(ctrl, 'keypress', this, 'checkMaxLength');
- if (Tobago.browser.isIe) {
+ if (Tobago.browser.isMsie) {
Tobago.addBindEventListener(ctrl, 'paste', this, 'checkMaxLengthOnPaste');
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.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-menu.js?rev=1488157&r1=1488156&r2=1488157&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.js Fri May 31 11:12:46 2013
@@ -196,7 +196,7 @@ Tobago.Menu.open = function(event) {
sub.css('visibility', 'visible');
// IE6 select-tag fix
- if (Tobago.browser.isIe6OrLess) {
+ if (Tobago.browser.isMsie6) {
// sub.css('width', sub.width());
// sub.css('height', sub.height());
// sub.css('display', 'none');
@@ -227,7 +227,7 @@ Tobago.Menu.closeAll = function() {
* returns the browser specific event which should be used.
*/
function compatibleKeyEvent() {
- return Tobago.browser.isIe || Tobago.browser.isWebkit ? 'keydown' : 'keypress';
+ return Tobago.browser.isMsie || Tobago.browser.isWebkit ? 'keydown' : 'keypress';
}
Tobago.Menu.mouseOver = function(event) {
@@ -307,7 +307,7 @@ Tobago.Menu.init = function(elements) {
// IE6 select-tag fix
// put a iframe inside the div, so that a <select> tag doesn't shine through.
// the iframe must be resized (see above)
- if (Tobago.browser.isIe6OrLess) {
+ if (Tobago.browser.isMsie6) {
menus.children("ol").prepend(
"<iframe class='tobago-menu-ie6bugfix' src='" + Tobago.blankPage + "'></iframe>");
}
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=1488157&r1=1488156&r2=1488157&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 Fri May 31 11:12:46 2013
@@ -55,7 +55,7 @@ Tobago.Popup.init = function (elements)
shield.attr('id', maxModalPopup.attr('id') + '::shield');
// IE6 doesn't support position:fixed
- if (Tobago.browser.isIe6OrLess) {
+ if (Tobago.browser.isMsie6) {
var image = jQuery(".tobago-page-overlayBackgroundImage").attr("src");
shield.css({
position:'absolute',
@@ -84,7 +84,7 @@ Tobago.Popup.init = function (elements)
Tobago.Popup.lockBehind(maxModalPopup.get(0));
}
- if (Tobago.browser.isIe7OrLess) {
+ if (Tobago.browser.isMsie67) {
// not activated for IE 6 and 7, because the handling isn't smooth.
} else {
// enable drag-and-drop for popups
@@ -154,7 +154,7 @@ Tobago.Popup.lockBehind = function (popu
// find the first element in the popup for the focus
if (firstPopupElement != null) {
try {
- if (Tobago.browser.isIe8OrLess) {
+ if (Tobago.browser.isMsie678) {
// call the focus asynchronous, because of a bug in IE 6, 7, 8 (IE 9 works fine)
var focusId = firstPopupElement.attr("id");
var selector = Tobago.Utils.escapeClientId(focusId).replace(/\\/g, '\\\\');
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.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-sheet.js?rev=1488157&r1=1488156&r2=1488157&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js Fri May 31 11:12:46 2013
@@ -446,7 +446,7 @@ Tobago.Sheet.prototype.setup = function(
this.setupStart = new Date(); // @DEV_ONLY
// IE 6+7
- if (Tobago.browser.isIe7OrLess) {
+ if (Tobago.browser.isMsie67) {
jQuery(Tobago.Utils.escapeClientId(this.id) + ">div>table>colgroup>col").each(function() {
Tobago.Sheet.fixIE67ColWidth(jQuery(this));
});
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=1488157&r1=1488156&r2=1488157&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 Fri May 31 11:12:46 2013
@@ -141,10 +141,10 @@ var Tobago = {
* Please try to use jQuery.support instead of this object!
*/
browser: {
- isIe: false,
- isIe6OrLess: false,
- isIe7OrLess: false,
- isIe8OrLess: false,
+ isMsie: false,
+ isMsie6: false,
+ isMsie67: false,
+ isMsie678: false,
isGecko: false,
isWebkit: false
},
@@ -465,7 +465,7 @@ var Tobago = {
image.appendTo(wait).removeClass("tobago-page-overlayWaitPreloadedImage tobago-page-overlayErrorPreloadedImage");
wait.show();
- if (Tobago.browser.isIe6OrLess) {
+ if (Tobago.browser.isMsie6) {
element.children(".tobago-page-overlay")
.css({
width:element.css("width"),
@@ -482,7 +482,7 @@ var Tobago = {
.animate({opacity:'0.8'}, error ? 0 : 250, "linear", function () {
// fix for IE6: reset the src attribute to enable animation
- if (Tobago.browser.isIe6OrLess) {
+ if (Tobago.browser.isMsie6) {
image.attr("src", image.attr("src"));
}
});
@@ -511,7 +511,7 @@ var Tobago = {
},
ie6bugfix: function(element) {
- if (Tobago.browser.isIe6OrLess) {
+ if (Tobago.browser.isMsie6) {
if (jQuery(element).children(".tobago-page-overlay-ie6bugfix").size() > 0) {
return; // ignore
@@ -671,7 +671,7 @@ var Tobago = {
try {
// LOG.debug("submit form with action: " + Tobago.action.value);
Tobago.form.submit();
- if (Tobago.browser.isIe) {
+ if (Tobago.browser.isMsie) {
// without this "redundant" code the animation will not be animated in IE
var image = jQuery(".tobago-page-overlayCenter img");
image.appendTo(image.parent());
@@ -1718,17 +1718,16 @@ var Tobago = {
initBrowser: function() {
var ua = navigator.userAgent;
if (ua.indexOf("MSIE") > -1) {
- Tobago.browser.isIe = true;
+ Tobago.browser.isMsie = true;
if (ua.indexOf("MSIE 6") > -1) {
- Tobago.browser.isIe = true;
- Tobago.browser.isIe6OrLess = true;
- Tobago.browser.isIe7OrLess = true;
- Tobago.browser.isIe8OrLess = true;
+ Tobago.browser.isMsie6 = true;
+ Tobago.browser.isMsie67 = true;
+ Tobago.browser.isMsie678 = true;
} else if (ua.indexOf("MSIE 7") > -1) {
- Tobago.browser.isIe7OrLess = true;
- Tobago.browser.isIe8OrLess = true;
+ Tobago.browser.isMsie67 = true;
+ Tobago.browser.isMsie678 = true;
} else if (ua.indexOf("MSIE 8") > -1) {
- Tobago.browser.isIe8OrLess = true;
+ Tobago.browser.isMsie678 = true;
}
} else if (ua.indexOf("AppleWebKit") > -1) {
Tobago.browser.isWebkit = true;
@@ -2387,7 +2386,7 @@ Tobago.Updater = {
}
/* TOBAGO-1087: Wait Cursor after AJAX in IE with Websphere 6.1 */
- if (Tobago.browser.isIe) {
+ if (Tobago.browser.isMsie) {
var body = jQuery("body");
var originalCursor = body.css("cursor");
body.css("cursor", "default");